473 files changed, 60115 insertions, 56227 deletions

diff --git a/packages.txt b/packages.txt
index 1a108ae9e..334920565 100644
--- a/packages.txt
+++ b/packages.txt
@@ -72,7 +72,7 @@ xextproto-7.1.1
 xineramaproto-1.2

 xkbcomp-1.1.1

 xkeyboard-config-1.7

-xorg-server-1.7.0.902

+xorg-server-1.7.99.1

 xproto-7.0.16

 xtrans-1.2.5

 zlib-1.2.3

diff --git a/xorg-server/COPYING b/xorg-server/COPYING
index 5dc8c1dfb..0878c7a76 100644
--- a/xorg-server/COPYING
+++ b/xorg-server/COPYING
@@ -1256,27 +1256,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 
-Copyright © 2004 PillowElephantBadgerBankPond
-
-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, and that the name of PillowElephantBadgerBankPond not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  PillowElephantBadgerBankPond makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PillowElephantBadgerBankPond BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 
 Permission to use, copy, modify, and distribute this software for any
diff --git a/xorg-server/ChangeLog b/xorg-server/ChangeLog
index d3b898140..f768aed11 100644
--- a/xorg-server/ChangeLog
+++ b/xorg-server/ChangeLog
@@ -1,25 +1,191 @@
-commit 37b5f41ccea3473b830cc0c4afb5d609e47004cb
+commit 26f4d8a2c12ff06c4beb06842cd8d9c0d9ddd4aa
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Oct 22 01:04:42 2009 +0900
+
+    Make sure dmx docs are built for distribution.
+    
+    Ok, dmx docs are driving me slightly nuts. We probably shouldn't
+    include the built versions in the tarball, but we do, so this is an
+    attempt to make that work by having both the 'all' and 'dist' targets
+    depends on the doxygen output.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4114854893ff57a1be525ec099a4b33e5f9963b1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Oct 22 00:17:37 2009 +0900
+
+    Don't attempt to build hw/kdrive/sdl/Makefile anymore
+    
+    With sdl removed, there's no way to build the sdl Makefile.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4d333c5121818754356853724333eadec2dcd18c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Oct 22 00:16:12 2009 +0900
+
+    Always check for doxygen so that distcheck gets dmx docs
+    
+    make distcheck wants the built dmx documentation so that users don't
+    have to install doxygen. This means that even if dmx isn't built, the
+    docs need to be so that the tarball can include them.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7e92bac5f769aca99bd20e21fe2811f0480b647b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Oct 22 00:00:35 2009 +0900
+
+    Make sure HAVE_DOXYGEN is defined when not building dmx
+    
+    The DMX docs are build using doxygen if present, so configure.ac
+    checks to see if that is available. However, when not building dmx
+    (the default), this conditional must still be defined to make automake
+    happy.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1228e2d052f0bb98175c55c194340773b5fedb40
+Merge: 08e7f62 52bc6d9
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Oct 21 22:46:53 2009 +0900
+
+    Merge remote branch 'whot/master'
+
+commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Oct 21 16:46:55 2009 +0900
+
+    Fix 'distcheck' to use host xkb files but install to build dir
+    
+    'make distcheck' needs to read xkb files and write out compiled
+    versions as a part of the 'make check' phase. This patch passes
+    suitable options to the configure stage of the distcheck process to
+    read xkb files from the system location and write them to the
+    distcheck _inst directory.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 52bc6d944946e66ea2cc685feaeea40bb496ea83
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Oct 16 11:03:09 2009 +1000
+
+    kdrive: Purge Xsdl
+    
+    From the original Xsdl commit:
+    "sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
+    anyone uses this in production, a big scary monster will eat them.
+    hrm, perhaps i should make it have a --i-know-what-i'm-doing
+    param that it doens't start without, heh"
+    
+    That should be reason enough to not spend time maintaing it. Also, no more
+    elephants.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f713f447a2110718dfc091380699362d76f0cd6c
+Author: Lee Leahu <freedesktop-bugs@dyweni.com>
+Date:   Mon Oct 19 15:43:59 2009 -0500
+
+    dmxDestroyWindow() - must call the X's native DetroyWindow()
+    
+    Don't really know why this section was disabled, but without it,
+    certain pPicture resources do not get free'd until later in the
+    FreeClientResources() process after the screen has been free'd -
+    resulting in seg fault.
+    
+    With this patch, all resources normally free'd using vanilla X are
+    now also being freed correctly by Xdmx.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=24576
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 664a8e37fd83141974b772980f680b94e48b4f87
+Author: Lee Leahu <freedesktop-bugs@dyweni.com>
+Date:   Sat Oct 17 00:45:44 2009 -0500
+
+    dmx: when setting up device axis, use the correct counter number
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 010d5e28655d619693632938e9e4325eef938295
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Oct 16 10:01:13 2009 +1000
+
+    dmx: remove doxygen-generated files.
+    
+    These can be recreated by simply running 'doxygen doxygen.conf' in
+    hw/dmx/doc. Some of the files do not exist anymore, these have been removed.
+    Some other files have a different naming scheme.
+    Doxygen warnings about missing links fixed, two warnings remain:
+    
+    /home/whot/xorg/xserver/hw/dmx/dmxwindow.c:142: Warning: explicit link
+    request to 'dmxConfigureRootWindow' could not be resolved
+    /home/whot/xorg/xserver/hw/dmx/dmxwindow.c:119: Warning: explicit link
+    request to 'dmxConfigureScreenWindow()' could not be resolved
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ff3e171568c8b604fc5eacd5f7e9b7ee9417f172
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Oct 19 11:48:05 2009 +1000
+Date:   Fri Oct 16 10:26:21 2009 +1000
 
-    xserver 1.7.0.902
+    xkb: don't conditionally include xkb-config.h.
+    
+    If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Oct 16 08:24:37 2009 +1000
+
+    Use the default XKB settings for dmx and kdrive.
+    
+    Drop the dmx-specific defines, there's no reason to have separate ones
+    considering they're about as hardcoded as the default rules anyway.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit 37f857eb4cd30c6499a2735f59ddec87d1b7de57
+commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Oct 19 11:50:56 2009 +1000
+Date:   Thu Sep 24 11:25:28 2009 +1000
+
+    kdrive: silence tslib compiler warnings
+    
+    tslib.c: In function 'TslibInit':
+    tslib.c:157: warning: unused variable 'tsDev'
+    tslib.c:156: warning: unused variable 'inputent'
+    tslib.c:155: warning: unused variable 'inputdir'
+    tslib.c:154: warning: unused variable 'i'
+    tslib.c:154: warning: unused variable 'fd'
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 522ca8179ad2b2b935993f08c9382cd5ad1d8b2f
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date:   Tue Oct 20 04:18:01 2009 +0700
 
-    Revert "Xming: Remove unused X-boxed icon resource"
+    Remove unused LinuxFindPci and LinuxGetPciCfg
     
-    Breaks make dist.
-    make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'.  Stop.
+    These two functions are not referenced from inside xserver.
+    Remove now-empty klinux.h too.
     
-    This reverts commit 2969eaa88c4422fedf1b069e6fe055904b233db2.
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Mon Oct 19 13:07:26 2009 +1000
+
+    Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
     
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 650ac84a0cf62c139fa6254fb7a44157d551e8e3
+commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Oct 16 22:29:26 2009 -0700
 
@@ -32,9 +198,8 @@ Date:   Fri Oct 16 22:29:26 2009 -0700
     
     Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1)
 
-commit a8bfbd81b8aaac31b87d15257273d82174912b37
+commit a32b2420d85f076282721afe005e85fff7d9837e
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Oct 15 13:50:36 2009 +1000
 
@@ -43,9 +208,38 @@ Date:   Thu Oct 15 13:50:36 2009 +1000
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit a32b2420d85f076282721afe005e85fff7d9837e)
 
-commit 64faf44f36b09780737c06781dadcf8fcbcaf836
+commit 7c31dd5db8b43c7796bf97a07e08213af5afd2ae
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Thu Oct 15 04:24:25 2009 -0500
+
+    Remove CopyISOLatin1Lowered
+    
+    This function was moved verbatim into libXfont-1.4, and it is not used
+    by the server or any drivers.  Exporting it in both places leads to
+    multiple definition linking errors on Cygwin, where we need to use a
+    static libXfont due to poor weak-symbol handling.
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9bc4e88d84daf0f4faf0599b575675e74c75f4b8
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Thu Oct 15 01:53:43 2009 -0500
+
+    Define ddxBeforeReset stubs in platform-neutral DDXs
+    
+    XWin uses ddxBeforeReset, which is called in DIX.  Other DDXs need to
+    define these in order to avoid an undefined symbol error at link time
+    when building alongside XWin.  Xnest and Xvfb already provide empty stubs;
+    this does the same for Xdmx and the platform-neutral KDrive servers.
+    
+    Also add a prototype to avoid a warning in all DDXs.
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac
 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 Date:   Thu Oct 15 01:53:42 2009 -0500
 
@@ -56,9 +250,8 @@ Date:   Thu Oct 15 01:53:42 2009 -0500
     
     Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac)
 
-commit 4b419c1651bbe7fbd3e87c3d71ba9fe642672ca2
+commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb
 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 Date:   Thu Oct 15 01:53:41 2009 -0500
 
@@ -72,9 +265,8 @@ Date:   Thu Oct 15 01:53:41 2009 -0500
     
     Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb)
 
-commit 7d5282dd597eb9353ca7a7697604d81228254d4a
+commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e
 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 Date:   Thu Oct 15 01:53:40 2009 -0500
 
@@ -82,9 +274,124 @@ Date:   Thu Oct 15 01:53:40 2009 -0500
     
     Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e)
 
-commit 1b88e4eb2e605fd1d3adffaf38dc40be6a28970d
+commit 264ce9e8360374b3a43442c8bdea08abde705446
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Wed Oct 14 20:33:53 2009 -0400
+
+    xselinux: Use the now-exported IsPointerDevice() instead of a copy.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 0ae1632be045bfbb288bb57190c830f94247460f
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Wed Oct 14 20:32:28 2009 -0400
+
+    dix: Export IsPointerDevice() and IsKeyboardDevice().
+    
+    Makes the functions available to extmod for extensions to call.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Sep 22 13:31:49 2009 -0700
+
+    xselinux: switch from x_device to separate x_pointer and x_keyboard classes.
+    
+    This will allow separate controls over pointer and keyboard without having
+    to relabel the devices to separate types.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 4be354c4c2da5168b302601b91bd80cfaca7e193
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Sep 22 13:18:44 2009 -0700
+
+    Remove some debug messages that trigger on XACE event delivery failure.
+    
+    It is normal for XACE to deny an event delivery, so these log messages
+    shouldn't trigger when that happens.  Just drop them for now.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Sep 22 13:13:03 2009 -0700
+
+    xace: Relax permissions on XkbGetState from Read to Getattr.
+    
+    This request is used to get the current keyboard group and is called from
+    GTK.  It does not return an actual keymap (aside from modifiers) so it
+    should be safe to relax the permission on it.  However it does return
+    button state information which should be controlled through a separate
+    pointer Read check.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 0ff28319906eeb3f236acd72201c416ce01f2c6e
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Sep 15 19:41:04 2009 -0400
+
+    xselinux: Stop special-casing QueryPointer access checks.
+    
+    XACE has been changed to not return BadAccess on device read failures.
+    Thus, no need for this workaround code.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Tue Sep 15 19:29:34 2009 -0400
+
+    xace: Fake return values on denials in input polling requests.
+    
+    Instead of returning BadAccess when "read" permission is denied
+    on a device, falsify the device state (buttons down, keys pressed).
+    This is nicer to applications, but may still have undesired side
+    effects.  The long-term solution is not to use these requests in
+    event-driven code!
+    
+    Requests affected: QueryPointer, QueryKeymap, XiQueryDevice.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 0493935691e925ae137af7636fa15befa76c8b45
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Mon Aug 31 21:20:53 2009 -0400
+
+    xselinux: Factor out some dynamic array code into common helpers.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit ae8891ba0b63bfe6941a324e201d9ab7c645c0f3
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Mon Aug 31 18:46:23 2009 -0400
+
+    xselinux: refactor extension code into smaller files.
+    
+    New files:
+    xselinux_ext.c: Extension init and request handlers.
+    xselinux_hooks.c: XACE hook functions and other callbacks.
+    xselinux_label.c: Object security-labeling code.
+    xselinuxint.h: Shared internal functions.
+    
+    Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 22b38f513c93c2f2aea5909878c3c9acae7d35c1
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Sat Oct 3 12:44:50 2009 +0100
+
+    Cygwin/X: Avoid a potential null pointer dereference before input initialization
+    
+    Avoid a null pointer dereference if WM_MOUSEMOVE occurred before
+    the input device had been initialized (a timing sensitive bug
+    occassionally seen during initialization)
+    
+    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+    Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a
 Author: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date:   Tue Jul 21 02:23:21 2009 +0100
 
@@ -95,18 +402,24 @@ Date:   Tue Jul 21 02:23:21 2009 +0100
     
     Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
     Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-    (cherry picked from commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a)
 
-commit 2969eaa88c4422fedf1b069e6fe055904b233db2
+commit 83d120b90482d356be730f63aead0f8e44a4e846
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date:   Thu Oct 1 14:47:22 2009 +0100
+
+    Xming: Fix various 'ISO C90 forbids mixed declarations and code' warnings
+    
+    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 78c87bdad1feab91c2a39e01513b4b0826665f06
 Author: Colin Harrison <colin.harrison@virgin.net>
 Date:   Fri Sep 25 17:49:59 2009 +0100
 
     Xming: Remove unused X-boxed icon resource
     
     Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-    (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
 
-commit 92253b0f2028c6c243be5f444b59568b0c15ae1f
+commit fdf7f7e95c852734c620f58df408a324902172cf
 Author: Colin Harrison <colin.harrison@virgin.net>
 Date:   Fri Sep 25 17:46:40 2009 +0100
 
@@ -116,9 +429,8 @@ Date:   Fri Sep 25 17:46:40 2009 +0100
     Replace the obsolete DIALOG resource with DIALOGEX in the .rc file
     
     Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-    (cherry picked from commit fdf7f7e95c852734c620f58df408a324902172cf)
 
-commit 237bc0c2558bdda5c7ec44cbc86a65af21344ba2
+commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37
 Author: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date:   Sat Oct 3 13:07:23 2009 +0100
 
@@ -127,9 +439,8 @@ Date:   Sat Oct 3 13:07:23 2009 +0100
     Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled)
     
     Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-    (cherry picked from commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37)
 
-commit c163126f06720a4bca1d073a2fb6d138ca6f0f00
+commit 25344ba7f7845654364d62bf15322b3b79465bd9
 Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 Date:   Tue Oct 13 20:14:58 2009 -0500
 
@@ -137,9 +448,22 @@ Date:   Tue Oct 13 20:14:58 2009 -0500
     
     Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 25344ba7f7845654364d62bf15322b3b79465bd9)
 
-commit 07229cd6da6a9b7acedb994275fed5b512fe48b1
+commit 6e158003e80534ce007290f75c89d698aec1d00b
+Merge: 2b14e14 5e762f0
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Oct 13 18:40:42 2009 -0700
+
+    Merge remote branch 'mattst88/master'
+    
+    * mattst88/master:
+      [alpha] assume we have __NR_pciconfig_iobase
+      [alpha] don't return from void functions
+      Fix undefined symbols on alpha
+      Fix breakage on alpha caused by c7680befe5ae
+      Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
+
+commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Tue Oct 13 20:42:14 2009 -0400
 
@@ -151,57 +475,16 @@ Date:   Tue Oct 13 20:42:14 2009 -0400
     The pciconfig_iobase syscall has been supported since 2000.
     
     Signed-off-by: Matt Turner <mattst88@gmail.com>
-    (cherry picked from commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f)
 
-commit 13c5e2fe9c7ce82dfdc026a392327b115d8c6a15
+commit 46785c04bca16f495af3ed8d685aee939a1a8f39
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Tue Oct 13 20:40:59 2009 -0400
 
     [alpha] don't return from void functions
     
     Signed-off-by: Matt Turner <mattst88@gmail.com>
-    (cherry picked from commit 46785c04bca16f495af3ed8d685aee939a1a8f39)
-
-commit fff0b2013ad40c6116e92a9c5e233da4a34e6943
-Author: Michael Cree <mcree@orcon.net.nz>
-Date:   Wed Oct 7 18:33:29 2009 -0400
-
-    Fix undefined symbols on alpha
-    
-    Signed-off-by: Matt Turner <mattst88@gmail.com>
-    (cherry picked from commit 34eddbbb73bb16395dba0818247909c1b4bee4c2)
-
-commit a08186fe59f003fc9e1edceb1d95d2e316766e2a
-Author: Matt Turner <mattst88@gmail.com>
-Date:   Tue Oct 6 20:58:30 2009 -0400
-
-    Fix breakage on alpha caused by c7680befe5ae
-    
-    Pinpointed by by Michael Cree.
-    
-    Commit c7680befe5ae removed Jensen support, but at the same time broke
-    support for dense memory systems.
-    
-    Signed-off-by: Matt Turner <mattst88@gmail.com>
-    (cherry picked from commit 9625f6d328d6f516520930227b218979309938bc)
-
-commit e116bebb1324c5cdb806a70683ca747321c536b0
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Tue Oct 13 13:15:05 2009 +1000
-
-    dix: extend IsPointerDevice check to valuator-only devices.
-    
-    A device with valuators but no keys is definitely a pointer device and needs
-    to be attached to the VCP. Otherwise, the class copying happens on the VCK
-    and the VCP isn't updated with the events that are to be sent through it.
-    This addresses the trigger for #24441, not the actual issue.
-    Jury is still out on valuator+key devices.
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 72f5874434c0c015b671c492c1318f35f1793668)
 
-commit f6cb78e476132b201334655f0015a2c727434fbf
+commit 2b14e142039193ea854a02706662204f4f5f6db8
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Tue Oct 13 12:54:56 2009 -0700
 
@@ -211,9 +494,9 @@ Date:   Tue Oct 13 12:54:56 2009 -0700
     
     Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
     Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
-    (cherry picked from commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 496350bd6832e595e42620da76d2f1e2e4c9e91d
+commit 5b91dfac6fbdf35288a4558638d4923e230ab8d3
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Tue Oct 13 12:54:11 2009 -0700
 
@@ -235,17 +518,24 @@ Date:   Tue Oct 13 12:54:11 2009 -0700
     
     Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
     Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
-    (cherry picked from commit 6980f77892e0409b44bd8f33ba82e7273c6462a4)
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 5411e78bd51df86f6cdf925f65fd3725f943b6bb
+commit 72f5874434c0c015b671c492c1318f35f1793668
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Oct 12 14:12:45 2009 +1000
+Date:   Tue Oct 13 13:15:05 2009 +1000
 
-    xserver 1.7.0.901
+    dix: extend IsPointerDevice check to valuator-only devices.
+    
+    A device with valuators but no keys is definitely a pointer device and needs
+    to be attached to the VCP. Otherwise, the class copying happens on the VCK
+    and the VCP isn't updated with the events that are to be sent through it.
+    This addresses the trigger for #24441, not the actual issue.
+    Jury is still out on valuator+key devices.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit b6e723eaebe79116dfa15162851b02bbdc29be2a
+commit 1088073b11ed488c0df45af3867b900ef93c6fe1
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Fri Oct 9 11:31:44 2009 +0200
 
@@ -256,9 +546,8 @@ Date:   Fri Oct 9 11:31:44 2009 +0200
     
     Signed-off-by: Michel Dänzer <daenzer@vmware.com>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 1088073b11ed488c0df45af3867b900ef93c6fe1)
 
-commit 2e37bda8d6b0203973893d8440d9917975f53d97
+commit 55305cf8db7787883bc80b7348eb626e609626f8
 Author: Ben Skeggs <bskeggs@redhat.com>
 Date:   Fri Oct 9 16:08:15 2009 -0700
 
@@ -273,9 +562,8 @@ Date:   Fri Oct 9 16:08:15 2009 -0700
     Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
     Signed-off-by: Michel Dänzer <daenzer@vmware
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 55305cf8db7787883bc80b7348eb626e609626f8)
 
-commit 6d99a7de3f2c60bf90faf604b1a39d4aa5bdfd09
+commit b375be9285c40467578fac2f1360c29a75306ab4
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Fri Oct 9 11:31:46 2009 +0200
 
@@ -288,9 +576,8 @@ Date:   Fri Oct 9 11:31:46 2009 +0200
     Signed-off-by: Michel Dänzer <daenzer@vmware.com>
     Tested-by: Aaron Plattner <aplattner@nvidia.com>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit b375be9285c40467578fac2f1360c29a75306ab4)
 
-commit 398b5e01a7976ee8940105cf2be7c28ce57c3858
+commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Oct 7 22:10:55 2009 -0700
 
@@ -303,19 +590,142 @@ Date:   Wed Oct 7 22:10:55 2009 -0700
     Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
     Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
     Signed-off-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44)
 
-commit b916ac74e27ce8998ac0866bb2b39dcd378e0182
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Fri Oct 2 18:58:35 2009 -0700
+commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Thu Oct 8 13:38:44 2009 +1100
 
-    XQuartz: Send mouse location with scroll events.
+    Cast small-int values through intptr_t when passed as pointers
     
-    This fixes the problem where (0, 0) was sent as the mouse location with scroll
-    button events causing the event to not reach the client.
-    (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)
+    On 64-bit systems, int and pointers don't have the same size, so GCC gives
+    warnings about casts between int and pointer types. However, in the cases
+    covered by this patch, it's always a value that fits in int being stored
+    temporarily as a pointer and then converted back later, which is safe.
+    Casting through the pointer-sized integer type intptr_t convinces the
+    compiler that this is OK.
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit b680a89262efcfef4644adb4a61ae42ea0db0c93
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Thu Oct 8 13:38:01 2009 +1100
+
+    Fix GCC warnings in xorg_backtrace
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 9bf2ff4faf730913de3073f346646a8727be41d4
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Thu Oct 8 13:36:44 2009 +1100
+
+    Fix "possibly uninitialized" warnings in glx
+    
+    In both functions, "answer" was uninitialized if "compsize" was 0, but in
+    that case __GLX_SEND_VOID_ARRAY(compsize) results in a call to
+    WriteToClient for 0 bytes, which returns immediately without examining the
+    "answer" argument. So initializing to a null pointer is as good as
+    anything else.
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit b422b532f3dcab54c53f61a66f2ad76059d1874a
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Thu Oct 8 13:29:27 2009 +1100
+
+    Remove static MAXSCREENS limit from Xext/shm.c
+    
+    Dynamically allocate per-screen data in the SHM extension, instead of
+    having a single static-sized array.
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 4df3e8c8053d9d4b3043f339a73d0de97020d884
+Author: Martin Ettl <ettl.martin@gmx.de>
+Date:   Thu Oct 8 13:27:30 2009 +1100
+
+    Resource leakage: 0 is a valid file descriptor
+    
+    When testing if an fd is valid, the required construct is >= 0, not > 0.
+    
+    [Daniel: Fixed up the Linux MTRR case as well.]
+    
+    Signed-off-by: Martin Ettl <ettl.martin@gmx.de>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 4151a13c80f3afa43f88afcf19a7aeb16dace93a
+Author: Francisco Jerez <currojerez@riseup.net>
+Date:   Mon Oct 5 02:39:03 2009 +0200
+
+    dix: Fix a double free in dixFreePrivates.
+    
+    It can be reproduced when the server is regenerated and for some
+    reason the private keys are reassigned in a different order: a
+    manually allocated private may get an index formerly used by a
+    preallocated private. In that case it will first be manually freed and
+    then again by dixFreePrivates, as items[i].size was never zeroed
+    out. Do it in dixResetPrivates.
+    
+    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
+    Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 34eddbbb73bb16395dba0818247909c1b4bee4c2
+Author: Michael Cree <mcree@orcon.net.nz>
+Date:   Wed Oct 7 18:33:29 2009 -0400
+
+    Fix undefined symbols on alpha
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 44efcdde501d54ca9c3e33ab5b1f699956fc3f9f
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Wed Oct 7 09:07:03 2009 -0700
+
+    Fix overlay detection when matching Xv adaptors across screens.
+    
+    Signed-off-by: Jamey Sharp <jamey@minilop.net>
+    Acked-by: Adam Jackson <ajax@redhat.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 68304215e25876ee639015969b4f07e1c9c515e0
+Merge: 6676f49 315aaef
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Oct 6 22:41:42 2009 -0700
+
+    Merge remote branch 'alanc/master'
+    
+    Conflicts:
+    	configure.ac
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 315aaef55750a863c08a16ad9120ffb76f9b48e0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 2 21:54:53 2009 -0700
+
+    Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Reviewed-by: Eric Anholt <eric@anholt.net>
+    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit a4ce2aa6348ecca3a5b1ac8d87caf974bdad3455
+commit 2e294380b64b6362173d0590c4292f290e50af50
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 2 16:51:24 2009 -0700
+
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Reviewed-by: Eric Anholt <eric@anholt.net>
+    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4b0911565d18b1aefca564315d0f1b9b4a17aa65
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Oct 5 16:52:19 2009 -0700
 
@@ -327,29 +737,38 @@ Date:   Mon Oct 5 16:52:19 2009 -0700
     Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
     Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
 
-commit 22fd21a71d3dc98a94cc5f6592832e1d19bb479a
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Tue Sep 15 19:17:48 2009 -0700
+commit 8c51b886400c5962b31ff565771be1b01a3ca8fb
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Oct 6 16:08:42 2009 +0200
 
-    Fix build of unit tests when dtrace probes are enabled
+    configure: quote argument to m4_pattern_forbid
     
-    ar loses the dtrace probe magic when building static libraries, so we
-    have to link with the .O files in order to resolve the dtrace probe symbols.
+    Without this, configure spits out
+    ../configure: line 15460: ac_fn_c_check_member: command not found
     
-    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Also anchor the pattern to make it stricter.
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 8e3299eee8c2d909f34ec070f6f606a278c46330
+commit 6ee61578ddb9f880ef12bbe9c3671d7dd53f2809
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Fri Oct 2 20:44:19 2009 -0700
+Date:   Mon Oct 5 17:27:27 2009 -0700
 
-    Set XQUARTZ to no on non-Darwin OS'es
+    Remove shave now that automake-1.11 has AM_SILENT_RULES
     
-    Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
+    Revert "Add shave so that we can see the steaming piles of warnings generated."
+    This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
+    
+    shave was left in the xserver 1.7 release/branch to allow developers &
+    distros time to transition to automake-1.11.   xserver 1.8 series will
+    require automake-1.11 for silencing build noise.
     
     Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit f496e0042b1174d8831f061cd156ac7bbbb76a7c
+commit d5d960f57834f16164457dab2e80290717dbf2cd
 Author: Kim Woelders <kim@woelders.dk>
 Date:   Fri Oct 2 19:31:15 2009 +0200
 
@@ -358,9 +777,8 @@ Date:   Fri Oct 2 19:31:15 2009 +0200
     Signed-off-by: Kim Woelders <kim@woelders.dk>
     Reviewed-by:  Soren Sandmann Pedersen <sandmann@redhat.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f)
 
-commit 5bc90ffdee0e95727767ce3df9154ea3ff3d6f95
+commit d2118c8ca94fc7bcb8e0de547e63cf022f53a8a9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Mon Oct 5 15:31:54 2009 +1000
 
@@ -372,9 +790,8 @@ Date:   Mon Oct 5 15:31:54 2009 +1000
     Reported-by: Felix Wenk
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit bd7430a32e63df8cd60352764744076448ee623f)
 
-commit 5c35d07c3b0fc8cc60fc622d6eb444bea2be0acc
+commit bf116057c7efd43c247c93f2f5d733a5db857cc9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Mon Oct 5 10:44:43 2009 +1000
 
@@ -389,74 +806,138 @@ Date:   Mon Oct 5 10:44:43 2009 +1000
     
     Reported-by: Mark Rosenstand
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit c629e0fc50dfaffaa40a56709da7f035c289fed2)
 
-commit b6016134b53587b8f942243d95729bb902c58db4
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Mon Sep 28 17:05:29 2009 -0700
+commit 9625f6d328d6f516520930227b218979309938bc
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Tue Oct 6 20:58:30 2009 -0400
 
-    XQuartz: Set the proper bitmap for key repeats...
+    Fix breakage on alpha caused by c7680befe5ae
     
-    XkbSetRepeatKeys lies and doesn't do what it says it will...
+    Pinpointed by by Michael Cree.
+    
+    Commit c7680befe5ae removed Jensen support, but at the same time broke
+    support for dense memory systems.
     
-    (cherry picked from commits b9dfed9e88389cbd29406a20d38ee4297638649b and
-                                873467adad479be02cd9cc6b43685919f5612d91)
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
 
-commit 3808ecc99a8d64cdbe3fb4a3b57c59e7545e362c
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Mon Sep 28 17:47:31 2009 -0700
+commit aa07957373fd7cbe67458a001e4afd6a7f1ea37f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Sep 28 12:20:03 2009 +1000
 
-    XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
+    Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
     
-    This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
-    (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
+    The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.
+    
+    This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit 80735dbf560ba156e53cd2a46190b334de281dd6
-Author: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date:   Tue Sep 29 22:35:06 2009 +0530
+commit 6676f49e34f8db7ef5767a6dbf6c2a4d2087f79c
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Oct 6 16:08:42 2009 +0200
 
-    xkb: check permissions on XKM_OUTPUT_DIR
+    configure: quote argument to m4_pattern_forbid
     
-    Checking just for root is insufficient since that does not guarantee write/read
-    permissions in XKM_OUTPUT_DIR (for example with sandbox).
+    Without this, configure spits out
+    ../configure: line 15460: ac_fn_c_check_member: command not found
     
-    Check if we can write a file, as well as read it later. Otherwise, invoke the
-    fallback to /tmp
+    Also anchor the pattern to make it stricter.
     
-    Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
-    Signed-off-by: Rémi Cardona <remi@gentoo.org>
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 9bc7cbf9c02656982c2525836b5498993f708e02)
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 616c7a009d9c4e84a8882ac797092d61619c1339
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Thu Oct 1 11:58:18 2009 -0700
+commit a0363bf7b135d816e73849c91fa53d98fd6072d1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 5 17:27:27 2009 -0700
 
-    XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
+    Remove shave now that automake-1.11 has AM_SILENT_RULES
     
-    Is fink really _still_ relying on this X11R7.x version string?
-    (cherry picked from commit 3d7cf468df96c0130a862f0d93fec990b9110c2f)
+    Revert "Add shave so that we can see the steaming piles of warnings generated."
+    This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
+    
+    shave was left in the xserver 1.7 release/branch to allow developers &
+    distros time to transition to automake-1.11.   xserver 1.8 series will
+    require automake-1.11 for silencing build noise.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Signed-off-by: Keith Packard <keithp@keithp.com>
 
-commit 19592ee7748a32388d90d802bb4f5e2bff15863e
+commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f
 Author: Kim Woelders <kim@woelders.dk>
-Date:   Tue Sep 29 20:31:45 2009 +0200
+Date:   Fri Oct 2 19:31:15 2009 +0200
 
-    dix: Fix potential memory corruption in doListFontsWithInfo.
+    render: Fix clip region translation in miClipPictureSrc().
     
     Signed-off-by: Kim Woelders <kim@woelders.dk>
-    Reviewed-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by:  Soren Sandmann Pedersen <sandmann@redhat.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 4970666827e65424ee17ccf6341ff84aac974383)
 
-commit 4257023c1e40387aff096d5f00d746d3f7a521b4
+commit bd7430a32e63df8cd60352764744076448ee623f
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Fri Oct 2 14:05:43 2009 +1000
+Date:   Mon Oct 5 15:31:54 2009 +1000
 
-    xserver 1.7.0
+    xfree86: remove log-spamming DebugF
+    
+    All input drivers use xf86PostKeyEventP indirectly now and have been since
+    it exists. I guess that qualifies it as tested - no need to spam the logs.
     
+    Reported-by: Felix Wenk
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 1a2dde3335864abfbbc133dbc709f564272dd540
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 2 20:44:19 2009 -0700
+
+    Set XQUARTZ to no on non-Darwin OS'es
+    
+    Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c629e0fc50dfaffaa40a56709da7f035c289fed2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Oct 5 10:44:43 2009 +1000
+
+    Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
+    
+    libXtst requirement is already implicit since we require xextproto 7.1 and
+    that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
+    list it explicitly.
+    
+    Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
+    Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
+    
+    Reported-by: Mark Rosenstand
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 2 19:20:24 2009 -0700
+
+    XQuartz: Fix a possible minor memory leak
+
+commit c4886fbabc1d8b4054654b227fcad83f58e8e798
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Oct 2 18:58:35 2009 -0700
+
+    XQuartz: Send mouse location with scroll events.
+    
+    This fixes the problem where (0, 0) was sent as the mouse location with scroll
+    button events causing the event to not reach the client.
+
+commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Thu Oct 1 10:39:19 2009 -0700
+
+    GLX: More clearly document the GLX protocol version handling
+    
+    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit 15b4faff281ad8abce6b32fe2fc855eb6da42476
+commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Oct 1 21:19:11 2009 +1000
 
@@ -472,9 +953,8 @@ Date:   Thu Oct 1 21:19:11 2009 +1000
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Acked-by: Simon Thum <simon.thum@gmx.de>
-    (cherry picked from commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b)
 
-commit 3788113618977bdc83e3ec1e7ca3160bad9a0d13
+commit 64fe5784b49347e1fd27b0c463be5c16557594c9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Oct 2 09:34:24 2009 +1000
 
@@ -483,9 +963,8 @@ Date:   Fri Oct 2 09:34:24 2009 +1000
     Tested-by: Xavier Chantry <shiningxc@gmail.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Acked-by: Julien Cristau <jcristau@debian.org>
-    (cherry picked from commit 64fe5784b49347e1fd27b0c463be5c16557594c9)
 
-commit c3034dc3af450802dda156136d9fabbc1cc58836
+commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Thu Oct 1 15:25:55 2009 +1000
 
@@ -499,9 +978,49 @@ Date:   Thu Oct 1 15:25:55 2009 +1000
     Signed-off-by: Dave Airlie <airlied@redhat.com>
     Declared-as-sane-by: Keith Packard <keithp@keithp.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80)
 
-commit 47c0b80915d67346ec63b36b659a96b77e777a71
+commit cb54cf1b3e8c4109541cfb698542c00f2473e731
+Author: Dave Airlie <airlied@linux.ie>
+Date:   Wed Sep 30 11:33:16 2009 +1000
+
+    glx: fixup deref of null pointer when glx screen init fails.
+    
+    I think this is what the original author wanted.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+    Acked-by: Ian Romanick <ian.d.romanick@intel.com>
+
+commit 3d7cf468df96c0130a862f0d93fec990b9110c2f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Oct 1 11:58:18 2009 -0700
+
+    XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
+    
+    Is fink really _still_ relying on this X11R7.x version string?
+
+commit 85b831f701d085e514afcf8a5ce9b11f8a57984e
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Oct 1 17:27:11 2009 +0200
+
+    xfree86: fix xorg.conf manpage formatting error
+
+commit 9bc7cbf9c02656982c2525836b5498993f708e02
+Author: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date:   Tue Sep 29 22:35:06 2009 +0530
+
+    xkb: check permissions on XKM_OUTPUT_DIR
+    
+    Checking just for root is insufficient since that does not guarantee write/read
+    permissions in XKM_OUTPUT_DIR (for example with sandbox).
+    
+    Check if we can write a file, as well as read it later. Otherwise, invoke the
+    fallback to /tmp
+    
+    Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
+    Signed-off-by: Rémi Cardona <remi@gentoo.org>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Oct 1 10:03:42 2009 +1000
 
@@ -524,9 +1043,8 @@ Date:   Thu Oct 1 10:03:42 2009 +1000
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Reviewed-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5)
 
-commit 30ebee3bfcadf915be98d407610c615e3e00f9c1
+commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Oct 1 15:22:19 2009 +1000
 
@@ -539,9 +1057,8 @@ Date:   Thu Oct 1 15:22:19 2009 +1000
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Reviewed-by: Keith Packard <keithp@keithp.com>
-    (cherry picked from commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7)
 
-commit 8026c5a08584419be3adecd5965dd03e793ddf81
+commit b5fcc5553eb784c9f4826936e839079c0cdee55a
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Thu Oct 1 15:17:11 2009 +1000
 
@@ -554,9 +1071,8 @@ Date:   Thu Oct 1 15:17:11 2009 +1000
     
     Signed-off-by: Dave Airlie <airlied@redhat.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit b5fcc5553eb784c9f4826936e839079c0cdee55a)
 
-commit e182c1b4368c6958579732dd4ddc59de2b46359b
+commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc
 Author: Keith Packard <keithp@keithp.com>
 Date:   Wed Sep 30 11:40:19 2009 -0700
 
@@ -572,9 +1088,32 @@ Date:   Wed Sep 30 11:40:19 2009 -0700
     
     Signed-off-by: Keith Packard <keithp@keithp.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc)
 
-commit 369b5d526b699cd1c5cd38bb5a823ec66c5286ef
+commit 873467adad479be02cd9cc6b43685919f5612d91
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 30 00:22:02 2009 -0700
+
+    XQuartz: Set the proper bitmap for key repeats...
+    
+    XkbSetRepeatKeys lies and doesn't do what it says it will...
+
+commit 7bef78e199a4e4f7916be506807513efcd8fd4cb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Sep 29 23:40:47 2009 -0700
+
+    xkb: Use XkbPerKeyBitArraySize instead of hardcoded value of 32
+
+commit 4970666827e65424ee17ccf6341ff84aac974383
+Author: Kim Woelders <kim@woelders.dk>
+Date:   Tue Sep 29 20:31:45 2009 +0200
+
+    dix: Fix potential memory corruption in doListFontsWithInfo.
+    
+    Signed-off-by: Kim Woelders <kim@woelders.dk>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6ffda5aae75272fabdc27d6f693ae827be119e95
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Sep 29 11:49:09 2009 +1000
 
@@ -595,18 +1134,53 @@ Date:   Tue Sep 29 11:49:09 2009 +1000
     Signed-off-by: Dave Airlie <airlied@redhat.com>
     Reviewed-by: Keith Packard <keithp@keithp.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 6ffda5aae75272fabdc27d6f693ae827be119e95)
 
-commit d3ba814884154150ed3e6a71254dec7312593488
+commit ad5c0d9efa47476ed5cf75c82265c73919e468b4
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Tue Sep 29 16:43:43 2009 -0700
+
+    GLX: Enable GLX 1.4 on DRI2
+    
+    Return the minimum GLX version supported by all screens.  Assume that
+    DRI2 screens have all the required features for GLX 1.4.  Assume that
+    everyone else can only support GLX 1.2.
+    
+    Reviewed-by: Kristian Høgsberg <krh@redhat.com>
+    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit f11a356bcef1bc0a6440325019d5967b745a42dd
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 28 17:05:29 2009 -0700
+
+    XQuartz: Cleaned up keymap setting for easier maintenance
+    (cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
+
+commit f3223c71cfc638e695981e527517d48ea00d124d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 28 23:01:59 2009 -0700
+
+    XQuartz: Remove the redundant xquartz_resetenv_display
+      unsetenv(DISPLAY) takes care of this for us anyway
+    (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
+
+commit 9b98b883227ed23d5470e8de689afeec4a0fd742
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Sep 28 17:47:31 2009 -0700
+
+    XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
+    
+    This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
+    (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
+
+commit 11817a881cb93a89788105d1e575a468f2a8d27c
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Tue Sep 29 08:56:59 2009 +0200
 
     Fix ShmPutImage non-ZPixmap case.
     
     Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 .
-    (cherry picked from commit 11817a881cb93a89788105d1e575a468f2a8d27c)
 
-commit 8fc0d54cbaf791d947c7bab23f2e982cabd7c958
+commit 19be992d9dc542b61fa3f4fd32a09071c9e64880
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Mon Sep 28 14:18:45 2009 +1000
 
@@ -631,148 +1205,127 @@ Date:   Mon Sep 28 14:18:45 2009 +1000
     
     Tested-by: Vic Lee
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880)
-
-commit 857ec3e6fff571398dfcd9b4728b5c38cbcd3fcb
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Sep 28 13:59:25 2009 +1000
-
-    xfree86: use the DDC size if either width or height of DisplaySize is bogus.
-    
-    If either width or height of DisplaySize is invalid, assume that the
-    configuration is invalid and use the DDC-reported values instead.
-    
-    See Comment 9, Bug 9758.
-    http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    Acked-by: Dave Airlie <airlied@redhat.com>
-    (cherry picked from commit 83023ffd09a84ff48e6b99f57ebad101a00478db)
-
-commit 2d4bab18c0d894619f044f29769c67c2f63b540a
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Sep 23 10:53:51 2009 +1000
-
-    render: Plug a memory leak in AddGlyph. (#23286)
-    
-    AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting
-    in a memory leak when more than one Glyph was added in a RenderAddGlyphs
-    request.
-    
-    Since the code in AddGlyph and DeleteGlyph is identical, move into a static
-    function to avoid such mistakes in the future.
-    
-    X.Org Bug 23286 <http://bugs.freedesktop.org/show_bug.cgi?id=23286>
-    (cherry picked from commit f772014c435f56db56520ca13ffa39431684f122)
-
-commit 290a9639db3e420ec4caf0e6aee9f7386724c765
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Sep 28 21:05:11 2009 +1000
-
-    xserver 1.6.99.903 (xserver 1.7 RC3)
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 8c83457c60a4e02ca61086c7218dcd0e054926ba
-Merge: 6af44db b49dba3
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Sep 28 16:48:46 2009 +1000
-
-    Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch
-
-commit 6af44db315121ea24cec390d144514bf56908b2c
-Author: Tilman Sauerbeck <tilman@code-monkey.de>
-Date:   Thu Sep 24 12:57:02 2009 +0200
 
-    configure: make XNEST default to auto.
-    
-    When we're checking whether to build Xnest, we're comparing the
-    variable to auto but before it never was assigned that.
-    
-    Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
-    
-    [Xnest was enabled to yes to increase build exposure and catch compiler
-    errors early. The requirements to Xnest are quite low and I expect most
-    developers have them, so Xnext will be enabled on most boxes. Anyone
-    missing those requires probably doesn't want to build Xnest anyway.]
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 3db28f92b0c810b452506abbed299a204c90ba0b)
-
-commit b49dba33f94b51ba9a14803f0d81ccde2cb778f8
+commit efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
 Author: Ben Byer <bbyer@freedesktop.org>
 Date:   Sun Sep 27 10:35:53 2009 -0700
 
     Add (ok, fix) support for DTrace under OS X
     (cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
 
-commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e
+commit b3415187e92960cbff784108b5a3a8d130dc34c5
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 23:09:51 2009 -0700
 
     Rootless: Correct border rendering on parent-relative windows
     
     Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
+    (cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e)
 
-commit dadab5a2279a19dcf709402d7f22f0cd48670db0
+commit 6df00917cab5c1096070625385fd76ee6c52e0f1
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 23:00:59 2009 -0700
 
     XQuartz: Fix QuartzSetCursor to match the expected prototype.
+    (cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0)
 
-commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8
+commit 67a51cd9ef60b4c9f25fdde84f9eb352936c8c67
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 22:57:25 2009 -0700
 
     XQuartz: Fix a bunch of compilation warnings about style
+    (cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
 
-commit 29cb904e4de2411a9b6dbe68694954788f0525f7
+commit 96780eaf32636c94a9cf33f22eb9f01d984ff754
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 22:29:49 2009 -0700
 
     XQuartz: Nuke TSM
     
     It's deprecated in SnowLeopard.  Ben and I both have no idea what it is for.  It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
+    (cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
 
-commit de6cee11e1c335a0e5f708e7641e81d3cfe52529
+commit 15e15816a2f011d0aeeaff9e394d30a147c973ce
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 22:26:22 2009 -0700
 
     XQuartz: Fix inverse map from mode_switch to alt
+    (cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
 
-commit 7e6640b55503b6ee797ab2589f7debcbfa531958
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Sep 28 12:20:03 2009 +1000
-
-    Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
-    
-    The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.
-    
-    This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8.
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit ceaa5c779ceed3de5ea53727649613be3133b24e
+commit 558d803b2966c2e44345a80e635e091dc3e49f02
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 18:25:57 2009 -0700
 
     XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
     
     We need to find a better way to work with XKB on this.
+    (cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
 
-commit a3dbde2de87ee4f577748a8c447501a3ea462559
+commit 226b1033b48807fd6871ba626e20ef1411904939
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sun Sep 27 17:08:12 2009 -0700
 
     XQuartz: Transition from xEvent based mieq to InternalEvent
+    (cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
 
-commit 4aeac52c495c4cf691de7ef7d9e4030e90b3c8b8
-Merge: 498135f 77099b9
+commit 0c2731596f27f2cdf5000ba41de37e7eb86ad6f9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Mon Sep 28 09:54:53 2009 +1000
+Date:   Mon Sep 28 15:07:48 2009 +1000
+
+    Put tests for zero-sized strings in quotes (#24060)
+    
+    X.Org Bug 24060 <http://bugs.freedesktop.org/show_bug.cgi?id=24060>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 83023ffd09a84ff48e6b99f57ebad101a00478db
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Sep 28 13:59:25 2009 +1000
+
+    xfree86: use the DDC size if either width or height of DisplaySize is bogus.
+    
+    If either width or height of DisplaySize is invalid, assume that the
+    configuration is invalid and use the DDC-reported values instead.
+    
+    See Comment 9, Bug 9758.
+    http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Acked-by: Dave Airlie <airlied@redhat.com>
+
+commit f772014c435f56db56520ca13ffa39431684f122
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Sep 23 10:53:51 2009 +1000
+
+    render: Plug a memory leak in AddGlyph. (#23286)
+    
+    AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting
+    in a memory leak when more than one Glyph was added in a RenderAddGlyphs
+    request.
+    
+    Since the code in AddGlyph and DeleteGlyph is identical, move into a static
+    function to avoid such mistakes in the future.
+    
+    X.Org Bug 23286 <http://bugs.freedesktop.org/show_bug.cgi?id=23286>
+
+commit 3db28f92b0c810b452506abbed299a204c90ba0b
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Thu Sep 24 12:57:02 2009 +0200
 
-    Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch
+    configure: make XNEST default to auto.
+    
+    When we're checking whether to build Xnest, we're comparing the
+    variable to auto but before it never was assigned that.
+    
+    Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
+    
+    [Xnest was enabled to yes to increase build exposure and catch compiler
+    errors early. The requirements to Xnest are quite low and I expect most
+    developers have them, so Xnext will be enabled on most boxes. Anyone
+    missing those requires probably doesn't want to build Xnest anyway.]
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-commit 498135f26e8504e103ffe4512acf6fddca8e92e8
+commit 78ad6ca9a97440b74019c00a28144ea7d1e03431
 Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Date:   Sun Sep 27 17:30:23 2009 +0200
 
@@ -782,42 +1335,52 @@ Date:   Sun Sep 27 17:30:23 2009 +0200
     trivial patch, please apply.
     
     Signed-off-by: Julien Cristau <jcristau@debian.org>
-    (cherry picked from commit 78ad6ca9a97440b74019c00a28144ea7d1e03431)
 
-commit 77099b933a0362d40a28f9afea46c5cc97c29e13
+commit fb7938315bed9d4cb5641ee9acebf78a13bc109e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Sep 27 09:48:43 2009 -0700
+
+    Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu
+    (cherry picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f)
+
+commit a2cd21177859eb45320a94c96dde7d9058ab7650
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sat Sep 26 23:41:45 2009 -0700
 
     XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
     (cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
 
-commit 7958f6b75b3c6b8a827188af2e684f181bdd7688
+commit fbfbf93405222322571e15e78dea57c8f2755eae
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sat Sep 26 22:52:39 2009 -0700
 
     XQuartz: Add pressure/tilt property labels
+    (cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
 
-commit 29b2d9cdf5095399b79d9ff2a2f12f5a9c49cf1f
+commit 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sat Sep 26 22:48:49 2009 -0700
 
     XQuartz: Fix a brain-o array indexing problem
     
     /bop Peter
+    (cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
 
-commit fd1adc21a931e2dd1ff2e52b60a77c2153a30fe0
+commit 7159381881e5da33a49e8735811b93cbfe4f681e
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sat Sep 26 22:17:09 2009 -0700
 
     XQuartz: Nuke duplicate locks that make painful headaches
+    (cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
 
-commit 6e4fc5d066d9c1ea4fca444cfee1e73147c5fefb
+commit fba8c702ba6aa8fac27682e0838fd744e197d54f
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Sat Sep 26 22:13:49 2009 -0700
 
     Xi: CopyKeyClass is not static for XQuartz
+    (cherry picked from commit 85d6402354cdf143c6490f2725744c2f08b5605b)
 
-commit e0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7
+commit dc1e1bebff8b9d1eb6196dfd4b2f52f1e4200efa
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Fri Aug 7 00:02:21 2009 -0700
 
@@ -825,16 +1388,7 @@ Date:   Fri Aug 7 00:02:21 2009 -0700
     (cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
     (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
 
-commit 1a0dfde2d102d845f1ceda66ad7a078aa1b42ef9
-Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
-Date:   Wed Sep 23 17:41:28 2009 -0700
-
-    XQuartz: GLX capabilities: Allow 16bit accumulation buffers
-    
-    http://xquartz.macosforge.org/trac/ticket/308
-    (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
-
-commit 0c6423b3d52af85cd990811f7be982c0b6ed7c32
+commit 73ae547d5e687ef10dea45801fc627e10ac4b659
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Sun Sep 27 02:08:10 2009 +0200
 
@@ -850,9 +1404,8 @@ Date:   Sun Sep 27 02:08:10 2009 +0200
     but use pPixmap->devPrivate.ptr after PrepareAccess instead.
     
     Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24167 .
-    (cherry picked from commit 73ae547d5e687ef10dea45801fc627e10ac4b659)
 
-commit bb7c26e38c262614c5d1c21fc7a04c71a9028e51
+commit c9ec2bab2f258798fd6e6676698c732f09571a60
 Author: Kevin E Martin <kem@redhat.com>
 Date:   Sat Sep 26 13:10:54 2009 +1000
 
@@ -863,18 +1416,16 @@ Date:   Sat Sep 26 13:10:54 2009 +1000
     miinitext.c, where they belong.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit c9ec2bab2f258798fd6e6676698c732f09571a60)
 
-commit 72f0194be1558f244bad85197ccc50e17561df50
+commit fc9d733bab3ff0e4e51b19c73b66196dca563a70
 Author: Kevin E Martin <kem@redhat.com>
 Date:   Sat Sep 26 13:09:52 2009 +1000
 
     dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit fc9d733bab3ff0e4e51b19c73b66196dca563a70)
 
-commit e4edb4f2e6ca960b68629783459920faa86d8671
+commit e7c2598f565e8252dd66ee3e6212b310856476cb
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Sep 25 14:53:33 2009 +1000
 
@@ -888,9 +1439,20 @@ Date:   Fri Sep 25 14:53:33 2009 +1000
     
     Tested-by: Kevin Martin
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit e7c2598f565e8252dd66ee3e6212b310856476cb)
 
-commit 7c9e0b07780b664ebbcee2d6be4bce645cb8c5b2
+commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Sep 23 21:49:11 2009 +1000
+
+    configure: Unify all library defines that require a specific version.
+    
+    This patch moves all libraries that require a specific version into a single
+    location instead or duplicating them across the configure.ac file.
+    Libraries that do not require specific versions are left where they are.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9bd08c690fc687c4d69bb70536f3079a9184476d
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Sep 24 14:07:26 2009 +1000
 
@@ -902,22 +1464,30 @@ Date:   Thu Sep 24 14:07:26 2009 +1000
     Reported-by: Thomas Jaeger
     Tested-by: Thomas Jaeger
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 9bd08c690fc687c4d69bb70536f3079a9184476d)
 
-commit 1745808c2939d7dc08d3d8acae425e5eeb6a16ca
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Sep 23 21:49:11 2009 +1000
+commit abb8108fb44cc9b08fe4ae7d805a0a22564ca6bb
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Sat Sep 26 02:05:24 2009 +0200
 
-    configure: Unify all library defines that require a specific version.
-    
-    This patch moves all libraries that require a specific version into a single
-    location instead or duplicating them across the configure.ac file.
-    Libraries that do not require specific versions are left where they are.
+    EXA: Only calculate cache position once for each glyph.
+
+commit c11678cc189551f2a01eaa7a63969c16950739b4
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Sat Sep 26 02:05:06 2009 +0200
+
+    EXA: Accumulate arbitrary number of glyphs without flushing.
+
+commit 0369eeeb6bf8a808fa2df503fc8b8df81e6e07b8
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Sat Sep 26 02:04:48 2009 +0200
+
+    EXA: Try to minimize UploadToScreen calls for mixed pixmaps.
     
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3)
+    If there are several software fallbacks affecting the system memory copy of the
+    same pixmap, only copy the results back to the driver pixmap when it's used for
+    acceleration again, or in the BlockHandler, whichever happens first.
 
-commit e5371c7fc895c51092bd5b2d303e4835c123bd5c
+commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Sat Sep 26 01:59:39 2009 +0200
 
@@ -942,9 +1512,19 @@ Date:   Sat Sep 26 01:59:39 2009 +0200
     
     Drivers which can handle all pixmaps in the PrepareAccess hook should notice
     little if any difference.
-    (cherry picked from commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef)
 
-commit cecd484fbb3db273472d0bf0ec45d8604ff0cde2
+commit e23bffc41b007f1bc2b8f5cd4ac54213062c95cc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Sep 15 19:17:48 2009 -0700
+
+    Fix build of unit tests when dtrace probes are enabled
+    
+    ar loses the dtrace probe magic when building static libraries, so we
+    have to link with the .O files in order to resolve the dtrace probe symbols.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 9fa73be9fa543a686ea35c861084f5af37d44caa
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Tue Sep 22 20:34:54 2009 +1000
 
@@ -952,9 +1532,8 @@ Date:   Tue Sep 22 20:34:54 2009 +1000
     
     Reported-by: Tilman Sauerbeck
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 9fa73be9fa543a686ea35c861084f5af37d44caa)
 
-commit f188fabfe264dfec1950c168e2d9c22f13797b93
+commit a9c274df5c37cb4ece6449e934342d8ff8e61705
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Wed Sep 23 11:43:27 2009 +1000
 
@@ -967,9 +1546,8 @@ Date:   Wed Sep 23 11:43:27 2009 +1000
     kdrive-assigned name. Memory must be freed beforehand.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit a9c274df5c37cb4ece6449e934342d8ff8e61705)
 
-commit 48ab48a6ce12605c7353b45dff4e3a4338b9132e
+commit fd913136732ff14a0484ca28f60ac1fbf49be81d
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Wed Sep 23 11:44:12 2009 +1000
 
@@ -978,9 +1556,8 @@ Date:   Wed Sep 23 11:44:12 2009 +1000
     'event' must be freed before exiting.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit fd913136732ff14a0484ca28f60ac1fbf49be81d)
 
-commit 9e39491166eb4540bbc72e963e673c976301e936
+commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Sep 24 14:05:52 2009 +1000
 
@@ -994,9 +1571,8 @@ Date:   Thu Sep 24 14:05:52 2009 +1000
     
     Tested-by: Thomas Jaeger
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139)
 
-commit a9e2f7ac15f426560ac01689ec66f2db32424884
+commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Wed Sep 23 12:32:44 2009 +1000
 
@@ -1014,9 +1590,8 @@ Date:   Wed Sep 23 12:32:44 2009 +1000
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
     Acked--by: Daniel Stone <daniel@fooishbar.org>
-    (cherry picked from commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3)
 
-commit 1f74cfdeacb88b466d8f2005af191db30dde2a86
+commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551
 Author: Thomas Jaeger <thjaeger@gmail.com>
 Date:   Tue Sep 22 20:16:21 2009 -0400
 
@@ -1024,9 +1599,17 @@ Date:   Tue Sep 22 20:16:21 2009 -0400
     
     Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551)
 
-commit 8867c60782909816826054ed0587094e58eb39e6
+commit 33bf9cb69dccbb6889b2f83e6db61f40dc644e17
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 23 17:41:28 2009 -0700
+
+    XQuartz: GLX capabilities: Allow 16bit accumulation buffers
+    
+    http://xquartz.macosforge.org/trac/ticket/308
+    (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
+
+commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Wed Sep 23 13:10:05 2009 +0200
 
@@ -1036,31 +1619,30 @@ Date:   Wed Sep 23 13:10:05 2009 +0200
     format can't fit in depth 24.
     
     Also fix up a comment for the addition of BGRA formats.
-    (cherry picked from commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec)
 
-commit ac1490b651a251407e1bbc98e3ccd265a9e491b5
+commit 096f21bb7a1217443d8a03529b1a2938518eb24f
 Author: Michel Dänzer <daenzer@vmware.com>
 Date:   Wed Sep 23 08:24:06 2009 +0200
 
     EXA: Fix some issues pointed out by clang.
     
     Remove dead variables, fix use of uninitialized values, that kind of thing.
-    (cherry picked from commit 096f21bb7a1217443d8a03529b1a2938518eb24f)
 
-commit 6b656c3498fa1bdbf93b2951b27cc8ff00e65990
+commit 824a09d856a5f750694e11d2fd2faaa3de705eaa
 Author: Simon Thum <simon.thum@gmx.de>
 Date:   Mon Sep 21 15:23:27 2009 +0200
 
     dix: move bounds check before access
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-    (cherry picked from commit 824a09d856a5f750694e11d2fd2faaa3de705eaa)
 
-commit 9c1a18377afdb919a648a96c4195113121902cfe
+commit 9edb9e9b4dde6f73dc5241d078425a7a70699ec9
 Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Tue Sep 22 12:44:19 2009 +1000
+Date:   Tue Sep 22 12:56:17 2009 +1000
 
-    xserver 1.6.99.902 (xserver 1.7 RC2)
+    Bump to 1.7.99.1
+    
+    X Server 1.7 has branched off.
     
     Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am
index cb98d2c31..a5e07307c 100644
--- a/xorg-server/Makefile.am
+++ b/xorg-server/Makefile.am
@@ -51,6 +51,11 @@ endif
 
 EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
 
+DISTCHECK_CONFIGURE_FLAGS=\
+	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
+	--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
+	--with-xkb-output='$${datadir}/X11/xkb/compiled'
+
 DISTCLEANFILES = doltcompile doltlibtool
 MAINTAINERCLEANFILES=ChangeLog
 
diff --git a/xorg-server/Makefile.in b/xorg-server/Makefile.in
index 41bb4296f..20ecde527 100644
--- a/xorg-server/Makefile.in
+++ b/xorg-server/Makefile.in
@@ -36,16 +36,15 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/shave-libtool.in \
-	$(srcdir)/shave.in $(srcdir)/xorg-server.pc.in \
-	$(top_srcdir)/configure COPYING ChangeLog config.guess \
+	$(srcdir)/Makefile.in $(srcdir)/xorg-server.pc.in \
+	$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
 	config.sub depcomp install-sh ltmain.sh missing ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -59,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/xwin-config.h \
 	$(top_builddir)/include/kdrive-config.h \
 	$(top_builddir)/include/version-config.h
-CONFIG_CLEAN_FILES = shave shave-libtool xorg-server.pc
+CONFIG_CLEAN_FILES = xorg-server.pc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -142,14 +141,12 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -174,7 +171,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -198,6 +194,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -215,8 +212,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -262,7 +257,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -288,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -297,7 +292,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -311,7 +305,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -353,8 +346,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -397,6 +388,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -428,7 +420,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -471,6 +462,11 @@ SUBDIRS = \
 @XORG_TRUE@pkgconfigdir = $(libdir)/pkgconfig
 @XORG_TRUE@pkgconfig_DATA = xorg-server.pc
 EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
+	--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
+	--with-xkb-output='$${datadir}/X11/xkb/compiled'
+
 DISTCLEANFILES = doltcompile doltlibtool
 MAINTAINERCLEANFILES = ChangeLog
 DIST_SUBDIRS = \
@@ -534,10 +530,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-shave: $(top_builddir)/config.status $(srcdir)/shave.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 xorg-server.pc: $(top_builddir)/config.status $(srcdir)/xorg-server.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am
index ac45f955a..7287c4a62 100644
--- a/xorg-server/Xext/Makefile.am
+++ b/xorg-server/Xext/Makefile.am
@@ -80,7 +80,7 @@ endif
 
 # SELinux extension: provides SELinux policy support for X objects
 # requires X-ACE extension
-XSELINUX_SRCS = xselinux.c xselinux.h
+XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h
 if XSELINUX
 MODULE_SRCS += $(XSELINUX_SRCS)
 endif
@@ -133,6 +133,7 @@ EXTRA_DIST = \
 	$(SCREENSAVER_SRCS) \
 	$(XACE_SRCS) \
 	$(XCSECURITY_SRCS) \
+	$(XSELINUX_SRCS) \
 	$(XCALIBRATE_SRCS) \
 	$(XINERAMA_SRCS) \
 	$(MULTIBUFFER_SRCS) \
diff --git a/xorg-server/Xext/Makefile.in b/xorg-server/Xext/Makefile.in
index e3909ff88..2fb733684 100644
--- a/xorg-server/Xext/Makefile.in
+++ b/xorg-server/Xext/Makefile.in
@@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -79,7 +79,8 @@ am__libXext_la_SOURCES_DIST = bigreq.c geext.c shape.c sleepuntil.c \
 	panoramiXprocs.c panoramiXSwap.c xace.c xace.h xacestr.h \
 	security.c securitysrv.h xcalibrate.c xf86bigfont.c xvmain.c \
 	xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h xres.c saver.c \
-	xselinux.c xselinux.h mbuf.c dpms.c dpmsproc.h
+	xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h \
+	xselinuxint.h mbuf.c dpms.c dpmsproc.h
 am__objects_1 = shm.lo
 @MITSHM_TRUE@am__objects_2 = $(am__objects_1)
 am__objects_3 = panoramiX.lo panoramiXprocs.lo panoramiXSwap.lo
@@ -102,7 +103,7 @@ am__objects_16 = xres.lo
 @RES_TRUE@am__objects_17 = $(am__objects_16)
 am__objects_18 = saver.lo
 @SCREENSAVER_TRUE@am__objects_19 = $(am__objects_18)
-am__objects_20 = xselinux.lo
+am__objects_20 = xselinux_ext.lo xselinux_hooks.lo xselinux_label.lo
 @XSELINUX_TRUE@am__objects_21 = $(am__objects_20)
 am__objects_22 = mbuf.lo
 @MULTIBUFFER_TRUE@am__objects_23 = $(am__objects_22)
@@ -128,8 +129,9 @@ libXextbuiltin_la_OBJECTS = $(am_libXextbuiltin_la_OBJECTS)
 @XORG_TRUE@am_libXextbuiltin_la_rpath =
 libXextmodule_la_LIBADD =
 am__libXextmodule_la_SOURCES_DIST = xvmain.c xvdisp.c xvmc.c xvdix.h \
-	xvmcext.h xvdisp.h xres.c saver.c xselinux.c xselinux.h mbuf.c \
-	dpms.c dpmsproc.h
+	xvmcext.h xvdisp.h xres.c saver.c xselinux_ext.c \
+	xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h \
+	mbuf.c dpms.c dpmsproc.h
 @XORG_TRUE@am_libXextmodule_la_OBJECTS = $(am__objects_26)
 libXextmodule_la_OBJECTS = $(am_libXextmodule_la_OBJECTS)
 @XORG_TRUE@am_libXextmodule_la_rpath =
@@ -194,7 +196,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -219,7 +220,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -243,6 +243,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -260,8 +261,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -307,7 +306,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -333,6 +331,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -342,7 +341,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -356,7 +354,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -398,8 +395,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -442,6 +437,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -473,7 +469,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -528,7 +523,7 @@ XACE_SRCS = xace.c xace.h xacestr.h
 
 # SELinux extension: provides SELinux policy support for X objects
 # requires X-ACE extension
-XSELINUX_SRCS = xselinux.c xselinux.h
+XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h
 
 # Security extension: multi-level security to protect clients from each other
 XCSECURITY_SRCS = security.c securitysrv.h
@@ -556,6 +551,7 @@ EXTRA_DIST = \
 	$(SCREENSAVER_SRCS) \
 	$(XACE_SRCS) \
 	$(XCSECURITY_SRCS) \
+	$(XSELINUX_SRCS) \
 	$(XCALIBRATE_SRCS) \
 	$(XINERAMA_SRCS) \
 	$(MULTIBUFFER_SRCS) \
@@ -639,7 +635,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcmisc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86bigfont.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xres.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_ext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_hooks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xselinux_label.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvdisp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvmain.Plo@am__quote@
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index a6f804cd5..8106c40b6 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -99,6 +99,12 @@ typedef struct _ShmDesc {
     unsigned long size;
 } ShmDescRec, *ShmDescPtr;
 
+typedef struct _ShmScrPrivateRec {
+    CloseScreenProcPtr CloseScreen;
+    ShmFuncsPtr shmFuncs;
+    DestroyPixmapProcPtr destroyPixmap;
+} ShmScrPrivateRec;
+
 static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
 static int ShmDetachSegment(
     pointer		/* value */,
@@ -135,13 +141,16 @@ int BadShmSegCode;
 RESTYPE ShmSegType;
 static ShmDescPtr Shmsegs;
 static Bool sharedPixmaps;
-static ShmFuncsPtr shmFuncs[MAXSCREENS];
-static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
+static DrawablePtr *drawables;
+static int shmScrPrivateKeyIndex;
+static DevPrivateKey shmScrPrivateKey = &shmScrPrivateKeyIndex;
 static int shmPixmapPrivateIndex;
 static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivateIndex;
 static ShmFuncs miFuncs = {NULL, NULL};
 static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};
 
+#define ShmGetScreenPriv(s) ((ShmScrPrivateRec *)dixLookupPrivate(&(s)->devPrivates, shmScrPrivateKey))
+
 #define VERIFY_SHMSEG(shmseg,shmdesc,client) \
 { \
     int rc; \
@@ -212,6 +221,30 @@ static Bool CheckForShmSyscall(void)
 
 #endif
 
+static Bool
+ShmCloseScreen(int i, ScreenPtr pScreen)
+{
+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
+    pScreen->CloseScreen = screen_priv->CloseScreen;
+    dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL);
+    xfree (screen_priv);
+    return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+static ShmScrPrivateRec *
+ShmInitScreenPriv(ScreenPtr pScreen)
+{
+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
+    if (!screen_priv)
+    {
+	screen_priv = xcalloc (1, sizeof (ShmScrPrivateRec));
+	screen_priv->CloseScreen = pScreen->CloseScreen;
+	dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, screen_priv);
+	pScreen->CloseScreen = ShmCloseScreen;
+    }
+    return screen_priv;
+}
+
 void
 ShmExtensionInit(INITARGS)
 {
@@ -226,20 +259,29 @@ ShmExtensionInit(INITARGS)
     }
 #endif
 
+    drawables = xcalloc(screenInfo.numScreens, sizeof(DrawablePtr));
+    if (!drawables)
+    {
+	ErrorF("MIT-SHM extension disabled: no memory for per-screen drawables\n");
+	return;
+    }
+
     sharedPixmaps = xFalse;
     {
       sharedPixmaps = xTrue;
       for (i = 0; i < screenInfo.numScreens; i++)
       {
-	if (!shmFuncs[i])
-	    shmFuncs[i] = &miFuncs;
-	if (!shmFuncs[i]->CreatePixmap)
+	ShmScrPrivateRec *screen_priv = ShmInitScreenPriv(screenInfo.screens[i]);
+	if (!screen_priv->shmFuncs)
+	    screen_priv->shmFuncs = &miFuncs;
+	if (!screen_priv->shmFuncs->CreatePixmap)
 	    sharedPixmaps = xFalse;
       }
       if (sharedPixmaps)
 	for (i = 0; i < screenInfo.numScreens; i++)
 	{
-	    destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;
+	    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(screenInfo.screens[i]);
+	    screen_priv->destroyPixmap = screenInfo.screens[i]->DestroyPixmap;
 	    screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
 	}
     }
@@ -261,23 +303,21 @@ static void
 ShmResetProc(ExtensionEntry *extEntry)
 {
     int i;
-
-    for (i = 0; i < MAXSCREENS; i++)
-    {
-	shmFuncs[i] = NULL;
-    }
+    for (i = 0; i < screenInfo.numScreens; i++)
+	ShmRegisterFuncs(screenInfo.screens[i], NULL);
 }
 
 void
 ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
 {
-    shmFuncs[pScreen->myNum] = funcs;
+    ShmInitScreenPriv(pScreen)->shmFuncs = funcs;
 }
 
 static Bool
 ShmDestroyPixmap (PixmapPtr pPixmap)
 {
     ScreenPtr	    pScreen = pPixmap->drawable.pScreen;
+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
     Bool	    ret;
     if (pPixmap->refcnt == 1)
     {
@@ -288,9 +328,9 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
 	    ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
     }
     
-    pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum];
+    pScreen->DestroyPixmap = screen_priv->destroyPixmap;
     ret = (*pScreen->DestroyPixmap) (pPixmap);
-    destroyPixmap[pScreen->myNum] = pScreen->DestroyPixmap;
+    screen_priv->destroyPixmap = pScreen->DestroyPixmap;
     pScreen->DestroyPixmap = ShmDestroyPixmap;
     return ret;
 }
@@ -298,7 +338,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
 void
 ShmRegisterFbFuncs(ScreenPtr pScreen)
 {
-    shmFuncs[pScreen->myNum] = &fbFuncs;
+    ShmRegisterFuncs(pScreen, &fbFuncs);
 }
 
 static int
@@ -578,7 +618,6 @@ static int
 ProcPanoramiXShmGetImage(ClientPtr client)
 {
     PanoramiXRes	*draw;
-    DrawablePtr 	drawables[MAXSCREENS];
     DrawablePtr 	pDraw;
     xShmGetImageReply	xgi;
     ShmDescPtr		shmdesc;
@@ -767,9 +806,11 @@ CreatePmap:
     result = (client->noClientException);
 
     FOR_NSCREENS(j) {
+	ShmScrPrivateRec *screen_priv;
 	pScreen = screenInfo.screens[j];
 
-	pMap = (*shmFuncs[j]->CreatePixmap)(pScreen, 
+	screen_priv = ShmGetScreenPriv(pScreen);
+	pMap = (*screen_priv->shmFuncs->CreatePixmap)(pScreen,
 				stuff->width, stuff->height, stuff->depth,
 				shmdesc->addr + stuff->offset);
 
@@ -1052,6 +1093,7 @@ ProcShmCreatePixmap(ClientPtr client)
     DepthPtr pDepth;
     int i, rc;
     ShmDescPtr shmdesc;
+    ShmScrPrivateRec *screen_priv;
     REQUEST(xShmCreatePixmapReq);
     unsigned int width, height, depth;
     unsigned long size;
@@ -1100,7 +1142,8 @@ CreatePmap:
 	return BadAlloc;
 
     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
-    pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
+    screen_priv = ShmGetScreenPriv(pDraw->pScreen);
+    pMap = (*screen_priv->shmFuncs->CreatePixmap)(
 			    pDraw->pScreen, stuff->width,
 			    stuff->height, stuff->depth,
 			    shmdesc->addr + stuff->offset);
diff --git a/xorg-server/Xext/xselinux.h b/xorg-server/Xext/xselinux.h
index e99f05b09..dcd250e76 100644
--- a/xorg-server/Xext/xselinux.h
+++ b/xorg-server/Xext/xselinux.h
@@ -20,8 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XSELINUX_H
 #define _XSELINUX_H
 
-#include "dixaccess.h"
-
 /* Extension info */
 #define SELINUX_EXTENSION_NAME		"SELinux"
 #define SELINUX_MAJOR_VERSION		1
@@ -138,414 +136,4 @@ typedef struct {
     CARD32  pad6;
 } SELinuxListItemsReply;
 
-
-#ifdef _XSELINUX_NEED_FLASK
-/* Private Flask definitions */
-#define SECCLASS_X_DRAWABLE		1
-#define SECCLASS_X_SCREEN		2
-#define SECCLASS_X_GC			3
-#define SECCLASS_X_FONT			4
-#define SECCLASS_X_COLORMAP		5
-#define SECCLASS_X_PROPERTY		6
-#define SECCLASS_X_SELECTION		7
-#define SECCLASS_X_CURSOR		8
-#define SECCLASS_X_CLIENT		9
-#define SECCLASS_X_DEVICE		10
-#define SECCLASS_X_SERVER		11
-#define SECCLASS_X_EXTENSION		12
-#define SECCLASS_X_EVENT		13
-#define SECCLASS_X_FAKEEVENT		14
-#define SECCLASS_X_RESOURCE		15
-
-/* Mapping from DixAccess bits to Flask permissions */
-static struct security_class_mapping map[] = {
-    { "x_drawable",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "list_property",	/* DixListPropAccess */
-          "get_property",	/* DixGetPropAccess */
-          "set_property",	/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "list_child",		/* DixListAccess */
-          "add_child",		/* DixAddAccess */
-          "remove_child",	/* DixRemoveAccess */
-          "hide",		/* DixHideAccess */
-          "show",		/* DixShowAccess */
-          "blend",		/* DixBlendAccess */
-          "override",		/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "send",		/* DixSendAccess */
-          "receive",		/* DixReceiveAccess */
-          "",			/* DixUseAccess */
-          "manage",		/* DixManageAccess */
-          NULL }},
-    { "x_screen",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "saver_getattr",	/* DixListPropAccess */
-          "saver_setattr",	/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "hide_cursor",	/* DixHideAccess */
-          "show_cursor",	/* DixShowAccess */
-          "saver_hide",		/* DixBlendAccess */
-          "saver_show",		/* DixGrabAccess */
-          NULL }},
-    { "x_gc",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          NULL }},
-    { "x_font",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "",			/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "add_glyph",		/* DixAddAccess */
-          "remove_glyph",	/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          NULL }},
-    { "x_colormap",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "",			/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "add_color",		/* DixAddAccess */
-          "remove_color",	/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "install",		/* DixInstallAccess */
-          "uninstall",		/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          NULL }},
-    { "x_property",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "write",		/* DixBlendAccess */
-          NULL }},
-    { "x_selection",
-        { "read",		/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "setattr",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          NULL }},
-    { "x_cursor",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          NULL }},
-    { "x_client",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "",			/* DixUseAccess */
-          "manage",		/* DixManageAccess */
-          NULL }},
-    { "x_device",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "destroy",		/* DixDestroyAccess */
-          "create",		/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "list_property",	/* DixListPropAccess */
-          "get_property",	/* DixGetPropAccess */
-          "set_property",	/* DixSetPropAccess */
-          "getfocus",		/* DixGetFocusAccess */
-          "setfocus",		/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "add",		/* DixAddAccess */
-          "remove",		/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "grab",		/* DixGrabAccess */
-          "freeze",		/* DixFreezeAccess */
-          "force_cursor",	/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          "manage",		/* DixManageAccess */
-          "",			/* DixDebugAccess */
-          "bell",		/* DixBellAccess */
-          NULL }},
-    { "x_server",
-        { "record",		/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "getattr",		/* DixGetAttrAccess */
-          "setattr",		/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "grab",		/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "",			/* DixUseAccess */
-          "manage",		/* DixManageAccess */
-          "debug",		/* DixDebugAccess */
-          NULL }},
-    { "x_extension",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "query",		/* DixGetAttrAccess */
-          "",			/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "",			/* DixSendAccess */
-          "",			/* DixReceiveAccess */
-          "use",		/* DixUseAccess */
-          NULL }},
-    { "x_event",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "",			/* DixGetAttrAccess */
-          "",			/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "send",		/* DixSendAccess */
-          "receive",		/* DixReceiveAccess */
-          NULL }},
-    { "x_synthetic_event",
-        { "",			/* DixReadAccess */
-          "",			/* DixWriteAccess */
-          "",			/* DixDestroyAccess */
-          "",			/* DixCreateAccess */
-          "",			/* DixGetAttrAccess */
-          "",			/* DixSetAttrAccess */
-          "",			/* DixListPropAccess */
-          "",			/* DixGetPropAccess */
-          "",			/* DixSetPropAccess */
-          "",			/* DixGetFocusAccess */
-          "",			/* DixSetFocusAccess */
-          "",			/* DixListAccess */
-          "",			/* DixAddAccess */
-          "",			/* DixRemoveAccess */
-          "",			/* DixHideAccess */
-          "",			/* DixShowAccess */
-          "",			/* DixBlendAccess */
-          "",			/* DixGrabAccess */
-          "",			/* DixFreezeAccess */
-          "",			/* DixForceAccess */
-          "",			/* DixInstallAccess */
-          "",			/* DixUninstallAccess */
-          "send",		/* DixSendAccess */
-          "receive",		/* DixReceiveAccess */
-          NULL }},
-    { "x_resource",
-        { "read",		/* DixReadAccess */
-          "write",		/* DixWriteAccess */
-          "write",		/* DixDestroyAccess */
-          "write",		/* DixCreateAccess */
-          "read",		/* DixGetAttrAccess */
-          "write",		/* DixSetAttrAccess */
-          "read",		/* DixListPropAccess */
-          "read",		/* DixGetPropAccess */
-          "write",		/* DixSetPropAccess */
-          "read",		/* DixGetFocusAccess */
-          "write",		/* DixSetFocusAccess */
-          "read",		/* DixListAccess */
-          "write",		/* DixAddAccess */
-          "write",		/* DixRemoveAccess */
-          "write",		/* DixHideAccess */
-          "read",		/* DixShowAccess */
-          "read",		/* DixBlendAccess */
-          "write",		/* DixGrabAccess */
-          "write",		/* DixFreezeAccess */
-          "write",		/* DixForceAccess */
-          "write",		/* DixInstallAccess */
-          "write",		/* DixUninstallAccess */
-          "write",		/* DixSendAccess */
-          "read",		/* DixReceiveAccess */
-          "read",		/* DixUseAccess */
-          "write",		/* DixManageAccess */
-          "read",		/* DixDebugAccess */
-          "write",		/* DixBellAccess */
-          NULL }},
-    { NULL }
-};
-
-/* x_resource "read" bits from the list above */
-#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \
-			 DixGetPropAccess|DixGetFocusAccess|DixListAccess| \
-			 DixShowAccess|DixBlendAccess|DixReceiveAccess| \
-			 DixUseAccess|DixDebugAccess)
-
-#endif /* _XSELINUX_NEED_FLASK */
 #endif /* _XSELINUX_H */
diff --git a/xorg-server/Xext/xselinux_ext.c b/xorg-server/Xext/xselinux_ext.c
new file mode 100644
index 000000000..b36fb13eb
--- /dev/null
+++ b/xorg-server/Xext/xselinux_ext.c
@@ -0,0 +1,729 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "selection.h"
+#include "inputstr.h"
+#include "windowstr.h"
+#include "propertyst.h"
+#include "extnsionst.h"
+#include "modinit.h"
+#include "xselinuxint.h"
+
+#define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)
+#define CTX_WIN offsetof(SELinuxSubjectRec, win_create_sid)
+#define CTX_PRP offsetof(SELinuxSubjectRec, prp_create_sid)
+#define CTX_SEL offsetof(SELinuxSubjectRec, sel_create_sid)
+#define USE_PRP offsetof(SELinuxSubjectRec, prp_use_sid)
+#define USE_SEL offsetof(SELinuxSubjectRec, sel_use_sid)
+
+typedef struct {
+    security_context_t octx;
+    security_context_t dctx;
+    CARD32 octx_len;
+    CARD32 dctx_len;
+    CARD32 id;
+} SELinuxListItemRec;
+
+
+/*
+ * Extension Dispatch
+ */
+
+static security_context_t
+SELinuxCopyContext(char *ptr, unsigned len)
+{
+    security_context_t copy = xalloc(len + 1);
+    if (!copy)
+	return NULL;
+    strncpy(copy, ptr, len);
+    copy[len] = '\0';
+    return copy;
+}
+
+static int
+ProcSELinuxQueryVersion(ClientPtr client)
+{
+    SELinuxQueryVersionReply rep;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.server_major = SELINUX_MAJOR_VERSION;
+    rep.server_minor = SELINUX_MINOR_VERSION;
+    if (client->swapped) {
+	int n;
+	swaps(&rep.sequenceNumber, n);
+	swapl(&rep.length, n);
+	swaps(&rep.server_major, n);
+	swaps(&rep.server_minor, n);
+    }
+    WriteToClient(client, sizeof(rep), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+SELinuxSendContextReply(ClientPtr client, security_id_t sid)
+{
+    SELinuxGetContextReply rep;
+    security_context_t ctx = NULL;
+    int len = 0;
+
+    if (sid) {
+	if (avc_sid_to_context_raw(sid, &ctx) < 0)
+	    return BadValue;
+	len = strlen(ctx) + 1;
+    }
+
+    rep.type = X_Reply;
+    rep.length = bytes_to_int32(len);
+    rep.sequenceNumber = client->sequence;
+    rep.context_len = len;
+
+    if (client->swapped) {
+	int n;
+	swapl(&rep.length, n);
+	swaps(&rep.sequenceNumber, n);
+	swapl(&rep.context_len, n);
+    }
+
+    WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
+    WriteToClient(client, len, ctx);
+    freecon(ctx);
+    return client->noClientException;
+}
+
+static int
+ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
+{
+    PrivateRec **privPtr = &client->devPrivates;
+    security_id_t *pSid;
+    security_context_t ctx = NULL;
+    char *ptr;
+    int rc;
+
+    REQUEST(SELinuxSetCreateContextReq);
+    REQUEST_FIXED_SIZE(SELinuxSetCreateContextReq, stuff->context_len);
+
+    if (stuff->context_len > 0) {
+	ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len);
+	if (!ctx)
+	    return BadAlloc;
+    }
+
+    ptr = dixLookupPrivate(privPtr, subjectKey);
+    pSid = (security_id_t *)(ptr + offset);
+    sidput(*pSid);
+    *pSid = NULL;
+
+    rc = Success;
+    if (stuff->context_len > 0) {
+	if (security_check_context_raw(ctx) < 0 ||
+	    avc_context_to_sid_raw(ctx, pSid) < 0)
+	    rc = BadValue;
+    }
+
+    xfree(ctx);
+    return rc;
+}
+
+static int
+ProcSELinuxGetCreateContext(ClientPtr client, unsigned offset)
+{
+    security_id_t *pSid;
+    char *ptr;
+
+    REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq);
+
+    if (offset == CTX_DEV)
+	ptr = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
+    else
+	ptr = dixLookupPrivate(&client->devPrivates, subjectKey);
+
+    pSid = (security_id_t *)(ptr + offset);
+    return SELinuxSendContextReply(client, *pSid);
+}
+
+static int
+ProcSELinuxSetDeviceContext(ClientPtr client)
+{
+    security_context_t ctx;
+    security_id_t sid;
+    DeviceIntPtr dev;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
+    int rc;
+
+    REQUEST(SELinuxSetContextReq);
+    REQUEST_FIXED_SIZE(SELinuxSetContextReq, stuff->context_len);
+
+    if (stuff->context_len < 1)
+	return BadLength;
+    ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len);
+    if (!ctx)
+	return BadAlloc;
+
+    rc = dixLookupDevice(&dev, stuff->id, client, DixManageAccess);
+    if (rc != Success)
+	goto out;
+
+    if (security_check_context_raw(ctx) < 0 ||
+	avc_context_to_sid_raw(ctx, &sid) < 0) {
+	rc = BadValue;
+	goto out;
+    }
+
+    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
+    sidput(subj->sid);
+    subj->sid = sid;
+    obj = dixLookupPrivate(&dev->devPrivates, objectKey);
+    sidput(obj->sid);
+    sidget(obj->sid = sid);
+
+    rc = Success;
+out:
+    xfree(ctx);
+    return rc;
+}
+
+static int
+ProcSELinuxGetDeviceContext(ClientPtr client)
+{
+    DeviceIntPtr dev;
+    SELinuxSubjectRec *subj;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupDevice(&dev, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
+    return SELinuxSendContextReply(client, subj->sid);
+}
+
+static int
+ProcSELinuxGetWindowContext(ClientPtr client)
+{
+    WindowPtr pWin;
+    SELinuxObjectRec *obj;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    obj = dixLookupPrivate(&pWin->devPrivates, objectKey);
+    return SELinuxSendContextReply(client, obj->sid);
+}
+
+static int
+ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
+{
+    WindowPtr pWin;
+    PropertyPtr pProp;
+    SELinuxObjectRec *obj;
+    int rc;
+
+    REQUEST(SELinuxGetPropertyContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
+
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetPropAccess);
+    if (rc != Success)
+	return rc;
+
+    rc = dixLookupProperty(&pProp, pWin, stuff->property, client,
+			   DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    obj = dixLookupPrivate(&pProp->devPrivates, privKey);
+    return SELinuxSendContextReply(client, obj->sid);
+}
+
+static int
+ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
+{
+    Selection *pSel;
+    SELinuxObjectRec *obj;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupSelection(&pSel, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    obj = dixLookupPrivate(&pSel->devPrivates, privKey);
+    return SELinuxSendContextReply(client, obj->sid);
+}
+
+static int
+ProcSELinuxGetClientContext(ClientPtr client)
+{
+    ClientPtr target;
+    SELinuxSubjectRec *subj;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupClient(&target, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    subj = dixLookupPrivate(&target->devPrivates, subjectKey);
+    return SELinuxSendContextReply(client, subj->sid);
+}
+
+static int
+SELinuxPopulateItem(SELinuxListItemRec *i, PrivateRec **privPtr, CARD32 id,
+		    int *size)
+{
+    SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey);
+    SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey);
+
+    if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0)
+	return BadValue;
+    if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0)
+	return BadValue;
+
+    i->id = id;
+    i->octx_len = bytes_to_int32(strlen(i->octx) + 1);
+    i->dctx_len = bytes_to_int32(strlen(i->dctx) + 1);
+
+    *size += i->octx_len + i->dctx_len + 3;
+    return Success;
+}
+
+static void
+SELinuxFreeItems(SELinuxListItemRec *items, int count)
+{
+    int k;
+    for (k = 0; k < count; k++) {
+	freecon(items[k].octx);
+	freecon(items[k].dctx);
+    }
+    xfree(items);
+}
+
+static int
+SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items,
+			 int size, int count)
+{
+    int rc, k, n, pos = 0;
+    SELinuxListItemsReply rep;
+    CARD32 *buf;
+
+    buf = xcalloc(size, sizeof(CARD32));
+    if (size && !buf) {
+	rc = BadAlloc;
+	goto out;
+    }
+
+    /* Fill in the buffer */
+    for (k = 0; k < count; k++) {
+	buf[pos] = items[k].id;
+	if (client->swapped)
+	    swapl(buf + pos, n);
+	pos++;
+
+	buf[pos] = items[k].octx_len * 4;
+	if (client->swapped)
+	    swapl(buf + pos, n);
+	pos++;
+
+	buf[pos] = items[k].dctx_len * 4;
+	if (client->swapped)
+	    swapl(buf + pos, n);
+	pos++;
+
+	memcpy((char *)(buf + pos), items[k].octx, strlen(items[k].octx) + 1);
+	pos += items[k].octx_len;
+	memcpy((char *)(buf + pos), items[k].dctx, strlen(items[k].dctx) + 1);
+	pos += items[k].dctx_len;
+    }
+
+    /* Send reply to client */
+    rep.type = X_Reply;
+    rep.length = size;
+    rep.sequenceNumber = client->sequence;
+    rep.count = count;
+
+    if (client->swapped) {
+	swapl(&rep.length, n);
+	swaps(&rep.sequenceNumber, n);
+	swapl(&rep.count, n);
+    }
+
+    WriteToClient(client, sizeof(SELinuxListItemsReply), (char *)&rep);
+    WriteToClient(client, size * 4, (char *)buf);
+
+    /* Free stuff and return */
+    rc = client->noClientException;
+    xfree(buf);
+out:
+    SELinuxFreeItems(items, count);
+    return rc;
+}
+
+static int
+ProcSELinuxListProperties(ClientPtr client)
+{
+    WindowPtr pWin;
+    PropertyPtr pProp;
+    SELinuxListItemRec *items;
+    int rc, count, size, i;
+    CARD32 id;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
+    if (rc != Success)
+	return rc;
+
+    /* Count the number of properties and allocate items */
+    count = 0;
+    for (pProp = wUserProps(pWin); pProp; pProp = pProp->next)
+	count++;
+    items = xcalloc(count, sizeof(SELinuxListItemRec));
+    if (count && !items)
+	return BadAlloc;
+
+    /* Fill in the items and calculate size */
+    i = 0;
+    size = 0;
+    for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) {
+	id = pProp->propertyName;
+	rc = SELinuxPopulateItem(items + i, &pProp->devPrivates, id, &size);
+	if (rc != Success) {
+	    SELinuxFreeItems(items, count);
+	    return rc;
+	}
+	i++;
+    }
+
+    return SELinuxSendItemsToClient(client, items, size, count);
+}
+
+static int
+ProcSELinuxListSelections(ClientPtr client)
+{
+    Selection *pSel;
+    SELinuxListItemRec *items;
+    int rc, count, size, i;
+    CARD32 id;
+
+    REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq);
+
+    /* Count the number of selections and allocate items */
+    count = 0;
+    for (pSel = CurrentSelections; pSel; pSel = pSel->next)
+	count++;
+    items = xcalloc(count, sizeof(SELinuxListItemRec));
+    if (count && !items)
+	return BadAlloc;
+
+    /* Fill in the items and calculate size */
+    i = 0;
+    size = 0;
+    for (pSel = CurrentSelections; pSel; pSel = pSel->next) {
+	id = pSel->selection;
+	rc = SELinuxPopulateItem(items + i, &pSel->devPrivates, id, &size);
+	if (rc != Success) {
+	    SELinuxFreeItems(items, count);
+	    return rc;
+	}
+	i++;
+    }
+
+    return SELinuxSendItemsToClient(client, items, size, count);
+}
+
+static int
+ProcSELinuxDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
+    switch (stuff->data) {
+    case X_SELinuxQueryVersion:
+	return ProcSELinuxQueryVersion(client);
+    case X_SELinuxSetDeviceCreateContext:
+	return ProcSELinuxSetCreateContext(client, CTX_DEV);
+    case X_SELinuxGetDeviceCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_DEV);
+    case X_SELinuxSetDeviceContext:
+	return ProcSELinuxSetDeviceContext(client);
+    case X_SELinuxGetDeviceContext:
+	return ProcSELinuxGetDeviceContext(client);
+    case X_SELinuxSetWindowCreateContext:
+	return ProcSELinuxSetCreateContext(client, CTX_WIN);
+    case X_SELinuxGetWindowCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_WIN);
+    case X_SELinuxGetWindowContext:
+	return ProcSELinuxGetWindowContext(client);
+    case X_SELinuxSetPropertyCreateContext:
+	return ProcSELinuxSetCreateContext(client, CTX_PRP);
+    case X_SELinuxGetPropertyCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_PRP);
+    case X_SELinuxSetPropertyUseContext:
+	return ProcSELinuxSetCreateContext(client, USE_PRP);
+    case X_SELinuxGetPropertyUseContext:
+	return ProcSELinuxGetCreateContext(client, USE_PRP);
+    case X_SELinuxGetPropertyContext:
+	return ProcSELinuxGetPropertyContext(client, objectKey);
+    case X_SELinuxGetPropertyDataContext:
+	return ProcSELinuxGetPropertyContext(client, dataKey);
+    case X_SELinuxListProperties:
+	return ProcSELinuxListProperties(client);
+    case X_SELinuxSetSelectionCreateContext:
+	return ProcSELinuxSetCreateContext(client, CTX_SEL);
+    case X_SELinuxGetSelectionCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_SEL);
+    case X_SELinuxSetSelectionUseContext:
+	return ProcSELinuxSetCreateContext(client, USE_SEL);
+    case X_SELinuxGetSelectionUseContext:
+	return ProcSELinuxGetCreateContext(client, USE_SEL);
+    case X_SELinuxGetSelectionContext:
+	return ProcSELinuxGetSelectionContext(client, objectKey);
+    case X_SELinuxGetSelectionDataContext:
+	return ProcSELinuxGetSelectionContext(client, dataKey);
+    case X_SELinuxListSelections:
+	return ProcSELinuxListSelections(client);
+    case X_SELinuxGetClientContext:
+	return ProcSELinuxGetClientContext(client);
+    default:
+	return BadRequest;
+    }
+}
+
+static int
+SProcSELinuxQueryVersion(ClientPtr client)
+{
+    REQUEST(SELinuxQueryVersionReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxQueryVersionReq);
+    swaps(&stuff->client_major, n);
+    swaps(&stuff->client_minor, n);
+    return ProcSELinuxQueryVersion(client);
+}
+
+static int
+SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
+{
+    REQUEST(SELinuxSetCreateContextReq);
+    int n;
+
+    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
+    swapl(&stuff->context_len, n);
+    return ProcSELinuxSetCreateContext(client, offset);
+}
+
+static int
+SProcSELinuxSetDeviceContext(ClientPtr client)
+{
+    REQUEST(SELinuxSetContextReq);
+    int n;
+
+    REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq);
+    swapl(&stuff->id, n);
+    swapl(&stuff->context_len, n);
+    return ProcSELinuxSetDeviceContext(client);
+}
+
+static int
+SProcSELinuxGetDeviceContext(ClientPtr client)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxGetDeviceContext(client);
+}
+
+static int
+SProcSELinuxGetWindowContext(ClientPtr client)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxGetWindowContext(client);
+}
+
+static int
+SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
+{
+    REQUEST(SELinuxGetPropertyContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
+    swapl(&stuff->window, n);
+    swapl(&stuff->property, n);
+    return ProcSELinuxGetPropertyContext(client, privKey);
+}
+
+static int
+SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxGetSelectionContext(client, privKey);
+}
+
+static int
+SProcSELinuxListProperties(ClientPtr client)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxListProperties(client);
+}
+
+static int
+SProcSELinuxGetClientContext(ClientPtr client)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxGetClientContext(client);
+}
+
+static int
+SProcSELinuxDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
+    int n;
+
+    swaps(&stuff->length, n);
+
+    switch (stuff->data) {
+    case X_SELinuxQueryVersion:
+	return SProcSELinuxQueryVersion(client);
+    case X_SELinuxSetDeviceCreateContext:
+	return SProcSELinuxSetCreateContext(client, CTX_DEV);
+    case X_SELinuxGetDeviceCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_DEV);
+    case X_SELinuxSetDeviceContext:
+	return SProcSELinuxSetDeviceContext(client);
+    case X_SELinuxGetDeviceContext:
+	return SProcSELinuxGetDeviceContext(client);
+    case X_SELinuxSetWindowCreateContext:
+	return SProcSELinuxSetCreateContext(client, CTX_WIN);
+    case X_SELinuxGetWindowCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_WIN);
+    case X_SELinuxGetWindowContext:
+	return SProcSELinuxGetWindowContext(client);
+    case X_SELinuxSetPropertyCreateContext:
+	return SProcSELinuxSetCreateContext(client, CTX_PRP);
+    case X_SELinuxGetPropertyCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_PRP);
+    case X_SELinuxSetPropertyUseContext:
+	return SProcSELinuxSetCreateContext(client, USE_PRP);
+    case X_SELinuxGetPropertyUseContext:
+	return ProcSELinuxGetCreateContext(client, USE_PRP);
+    case X_SELinuxGetPropertyContext:
+	return SProcSELinuxGetPropertyContext(client, objectKey);
+    case X_SELinuxGetPropertyDataContext:
+	return SProcSELinuxGetPropertyContext(client, dataKey);
+    case X_SELinuxListProperties:
+	return SProcSELinuxListProperties(client);
+    case X_SELinuxSetSelectionCreateContext:
+	return SProcSELinuxSetCreateContext(client, CTX_SEL);
+    case X_SELinuxGetSelectionCreateContext:
+	return ProcSELinuxGetCreateContext(client, CTX_SEL);
+    case X_SELinuxSetSelectionUseContext:
+	return SProcSELinuxSetCreateContext(client, USE_SEL);
+    case X_SELinuxGetSelectionUseContext:
+	return ProcSELinuxGetCreateContext(client, USE_SEL);
+    case X_SELinuxGetSelectionContext:
+	return SProcSELinuxGetSelectionContext(client, objectKey);
+    case X_SELinuxGetSelectionDataContext:
+	return SProcSELinuxGetSelectionContext(client, dataKey);
+    case X_SELinuxListSelections:
+	return ProcSELinuxListSelections(client);
+    case X_SELinuxGetClientContext:
+	return SProcSELinuxGetClientContext(client);
+    default:
+	return BadRequest;
+    }
+}
+
+
+/*
+ * Extension Setup / Teardown
+ */
+
+static void
+SELinuxResetProc(ExtensionEntry *extEntry)
+{
+    SELinuxFlaskReset();
+    SELinuxLabelReset();
+}
+
+void
+SELinuxExtensionInit(INITARGS)
+{
+    ExtensionEntry *extEntry;
+
+    /* Check SELinux mode on system, configuration file, and boolean */
+    if (!is_selinux_enabled()) {
+	LogMessage(X_INFO, "SELinux: Disabled on system\n");
+	return;
+    }
+    if (selinuxEnforcingState == SELINUX_MODE_DISABLED) {
+	LogMessage(X_INFO, "SELinux: Disabled in configuration file\n");
+	return;
+    }
+    if (!security_get_boolean_active("xserver_object_manager")) {
+	LogMessage(X_INFO, "SELinux: Disabled by boolean\n");
+        return;
+    }
+
+    /* Set up XACE hooks */
+    SELinuxLabelInit();
+    SELinuxFlaskInit();
+
+    /* Add extension to server */
+    extEntry = AddExtension(SELINUX_EXTENSION_NAME,
+			    SELinuxNumberEvents, SELinuxNumberErrors,
+			    ProcSELinuxDispatch, SProcSELinuxDispatch,
+			    SELinuxResetProc, StandardMinorOpcode);
+
+    AddExtensionAlias("Flask", extEntry);
+}
diff --git a/xorg-server/Xext/xselinux.c b/xorg-server/Xext/xselinux_hooks.c
index b9b16b6ce..43683ff24 100644
--- a/xorg-server/Xext/xselinux.c
+++ b/xorg-server/Xext/xselinux_hooks.c
@@ -30,71 +30,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <selinux/selinux.h>
-#include <selinux/label.h>
-#include <selinux/avc.h>
-
 #include <libaudit.h>
 
 #include <X11/Xatom.h>
-#include "globals.h"
-#include "resource.h"
-#include "privates.h"
-#include "registry.h"
-#include "dixstruct.h"
+#include "selection.h"
 #include "inputstr.h"
+#include "scrnintstr.h"
 #include "windowstr.h"
 #include "propertyst.h"
 #include "extnsionst.h"
-#include "scrnintstr.h"
-#include "selection.h"
 #include "xacestr.h"
-#define _XSELINUX_NEED_FLASK
-#include "xselinux.h"
 #include "../os/osdep.h"
-#include "modinit.h"
-
+#define _XSELINUX_NEED_FLASK_MAP
+#include "xselinuxint.h"
 
-/*
- * Globals
- */
-
-/* private state keys */
-static int subjectKeyIndex;
-static DevPrivateKey subjectKey = &subjectKeyIndex;
-static int objectKeyIndex;
-static DevPrivateKey objectKey = &objectKeyIndex;
-static int dataKeyIndex;
-static DevPrivateKey dataKey = &dataKeyIndex;
-
-/* subject state (clients and devices only) */
-typedef struct {
-    security_id_t sid;
-    security_id_t dev_create_sid;
-    security_id_t win_create_sid;
-    security_id_t sel_create_sid;
-    security_id_t prp_create_sid;
-    security_id_t sel_use_sid;
-    security_id_t prp_use_sid;
-    struct avc_entry_ref aeref;
-    char *command;
-    int privileged;
-} SELinuxSubjectRec;
-
-/* object state */
-typedef struct {
-    security_id_t sid;
-    int poly;
-} SELinuxObjectRec;
-
-/* selection and property atom cache */
-typedef struct {
-    SELinuxObjectRec prp;
-    SELinuxObjectRec sel;
-} SELinuxAtomRec;
-
-/* audit file descriptor */
-static int audit_fd;
 
 /* structure passed to auditing callback */
 typedef struct {
@@ -109,8 +58,16 @@ typedef struct {
     char *extension;	/* extension name, if any */
 } SELinuxAuditRec;
 
-/* labeling handle */
-static struct selabel_handle *label_hnd;
+/* private state keys */
+static int subjectKeyIndex;
+DevPrivateKey subjectKey = &subjectKeyIndex;
+static int objectKeyIndex;
+DevPrivateKey objectKey = &objectKeyIndex;
+static int dataKeyIndex;
+DevPrivateKey dataKey = &dataKeyIndex;
+
+/* audit file descriptor */
+static int audit_fd;
 
 /* whether AVC is active */
 static int avc_active;
@@ -122,18 +79,6 @@ static Atom atom_client_ctx;
 /* The unlabeled SID */
 static security_id_t unlabeled_sid;
 
-/* Array of object classes indexed by resource type */
-static security_class_t *knownTypes;
-static unsigned numKnownTypes;
-
-/* Array of event SIDs indexed by event type */
-static security_id_t *knownEvents;
-static unsigned numKnownEvents;
-
-/* Array of property and selection SID structures */
-static SELinuxAtomRec *knownAtoms;
-static unsigned numKnownAtoms;
-
 /* forward declarations */
 static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
 
@@ -142,264 +87,6 @@ static pointer truep = (pointer)1;
 
 
 /*
- * Support Routines
- */
-
-/*
- * Looks up a name in the selection or property mappings
- */
-static int
-SELinuxAtomToSIDLookup(Atom atom, SELinuxObjectRec *obj, int map, int polymap)
-{
-    const char *name = NameForAtom(atom);
-    security_context_t ctx;
-    int rc = Success;
-
-    obj->poly = 1;
-
-    /* Look in the mappings of names to contexts */
-    if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) {
-	obj->poly = 0;
-    } else if (errno != ENOENT) {
-	ErrorF("SELinux: a property label lookup failed!\n");
-	return BadValue;
-    } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) {
-	ErrorF("SELinux: a property label lookup failed!\n");
-	return BadValue;
-    }
-
-    /* Get a SID for context */
-    if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) {
-	ErrorF("SELinux: a context_to_SID_raw call failed!\n");
-	rc = BadAlloc;
-    }
-
-    freecon(ctx);
-    return rc;
-}
-
-/*
- * Looks up the SID corresponding to the given property or selection atom
- */
-static int
-SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn)
-{
-    SELinuxObjectRec *obj;
-    int rc, map, polymap;
-
-    if (atom >= numKnownAtoms) {
-	/* Need to increase size of atoms array */
-	unsigned size = sizeof(SELinuxAtomRec);
-	knownAtoms = xrealloc(knownAtoms, (atom + 1) * size);
-	if (!knownAtoms)
-	    return BadAlloc;
-	memset(knownAtoms + numKnownAtoms, 0,
-	       (atom - numKnownAtoms + 1) * size);
-	numKnownAtoms = atom + 1;
-    }
-
-    if (prop) {
-	obj = &knownAtoms[atom].prp;
-	map = SELABEL_X_PROP;
-	polymap = SELABEL_X_POLYPROP;
-    } else {
-	obj = &knownAtoms[atom].sel;
-	map = SELABEL_X_SELN;
-	polymap = SELABEL_X_POLYSELN;
-    }
-
-    if (!obj->sid) {
-	rc = SELinuxAtomToSIDLookup(atom, obj, map, polymap);
-	if (rc != Success)
-	    goto out;
-    }
-
-    *obj_rtn = obj;
-    rc = Success;
-out:
-    return rc;
-}
-
-/*
- * Looks up a SID for a selection/subject pair
- */
-static int
-SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj,
-		      security_id_t *sid_rtn, int *poly_rtn)
-{
-    int rc;
-    SELinuxObjectRec *obj;
-    security_id_t tsid;
-
-    /* Get the default context and polyinstantiation bit */
-    rc = SELinuxAtomToSID(selection, 0, &obj);
-    if (rc != Success)
-	return rc;
-
-    /* Check for an override context next */
-    if (subj->sel_use_sid) {
-	sidget(tsid = subj->sel_use_sid);
-	goto out;
-    }
-
-    sidget(tsid = obj->sid);
-
-    /* Polyinstantiate if necessary to obtain the final SID */
-    if (obj->poly) {
-	sidput(tsid);
-	if (avc_compute_member(subj->sid, obj->sid,
-			       SECCLASS_X_SELECTION, &tsid) < 0) {
-	    ErrorF("SELinux: a compute_member call failed!\n");
-	    return BadValue;
-	}
-    }
-out:
-    *sid_rtn = tsid;
-    if (poly_rtn)
-	*poly_rtn = obj->poly;
-    return Success;
-}
-
-/*
- * Looks up a SID for a property/subject pair
- */
-static int
-SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj,
-		     security_id_t *sid_rtn, int *poly_rtn)
-{
-    int rc;
-    SELinuxObjectRec *obj;
-    security_id_t tsid, tsid2;
-
-    /* Get the default context and polyinstantiation bit */
-    rc = SELinuxAtomToSID(property, 1, &obj);
-    if (rc != Success)
-	return rc;
-
-    /* Check for an override context next */
-    if (subj->prp_use_sid) {
-	sidget(tsid = subj->prp_use_sid);
-	goto out;
-    }
-
-    /* Perform a transition */
-    if (avc_compute_create(subj->sid, obj->sid,
-			   SECCLASS_X_PROPERTY, &tsid) < 0) {
-	ErrorF("SELinux: a compute_create call failed!\n");
-	return BadValue;
-    }
-
-    /* Polyinstantiate if necessary to obtain the final SID */
-    if (obj->poly) {
-	tsid2 = tsid;
-	if (avc_compute_member(subj->sid, tsid2,
-			       SECCLASS_X_PROPERTY, &tsid) < 0) {
-	    ErrorF("SELinux: a compute_member call failed!\n");
-	    sidput(tsid2);
-	    return BadValue;
-	}
-	sidput(tsid2);
-    }
-out:
-    *sid_rtn = tsid;
-    if (poly_rtn)
-	*poly_rtn = obj->poly;
-    return Success;
-}
-
-/*
- * Looks up the SID corresponding to the given event type
- */
-static int
-SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
-		  SELinuxObjectRec *sid_return)
-{
-    const char *name = LookupEventName(type);
-    security_context_t ctx;
-    type &= 127;
-
-    if (type >= numKnownEvents) {
-	/* Need to increase size of classes array */
-	unsigned size = sizeof(security_id_t);
-	knownEvents = xrealloc(knownEvents, (type + 1) * size);
-	if (!knownEvents)
-	    return BadAlloc;
-	memset(knownEvents + numKnownEvents, 0,
-	       (type - numKnownEvents + 1) * size);
-	numKnownEvents = type + 1;
-    }
-
-    if (!knownEvents[type]) {
-	/* Look in the mappings of event names to contexts */
-	if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) {
-	    ErrorF("SELinux: an event label lookup failed!\n");
-	    return BadValue;
-	}
-	/* Get a SID for context */
-	if (avc_context_to_sid_raw(ctx, knownEvents + type) < 0) {
-	    ErrorF("SELinux: a context_to_SID_raw call failed!\n");
-	    return BadAlloc;
-	}
-	freecon(ctx);
-    }
-
-    /* Perform a transition to obtain the final SID */
-    if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT,
-			   &sid_return->sid) < 0) {
-	ErrorF("SELinux: a compute_create call failed!\n");
-	return BadValue;
-    }
-
-    return Success;
-}
-
-/*
- * Returns the object class corresponding to the given resource type.
- */
-static security_class_t
-SELinuxTypeToClass(RESTYPE type)
-{
-    RESTYPE fulltype = type;
-    type &= TypeMask;
-
-    if (type >= numKnownTypes) {
-	/* Need to increase size of classes array */
-	unsigned size = sizeof(security_class_t);
-	knownTypes = xrealloc(knownTypes, (type + 1) * size);
-	if (!knownTypes)
-	    return 0;
-	memset(knownTypes + numKnownTypes, 0,
-	       (type - numKnownTypes + 1) * size);
-	numKnownTypes = type + 1;
-    }
-
-    if (!knownTypes[type]) {
-	const char *str;
-	knownTypes[type] = SECCLASS_X_RESOURCE;
-
-	if (fulltype & RC_DRAWABLE)
-	    knownTypes[type] = SECCLASS_X_DRAWABLE;
-	if (fulltype == RT_GC)
-	    knownTypes[type] = SECCLASS_X_GC;
-	if (fulltype == RT_FONT)
-	    knownTypes[type] = SECCLASS_X_FONT;
-	if (fulltype == RT_CURSOR)
-	    knownTypes[type] = SECCLASS_X_CURSOR;
-	if (fulltype == RT_COLORMAP)
-	    knownTypes[type] = SECCLASS_X_COLORMAP;
-
-	/* Need to do a string lookup */
-	str = LookupResourceName(fulltype);
-	if (!strcmp(str, "PICTURE"))
-	    knownTypes[type] = SECCLASS_X_DRAWABLE;
-	if (!strcmp(str, "GLYPHSET"))
-	    knownTypes[type] = SECCLASS_X_FONT;
-    }
-
-    return knownTypes[type];
-}
-
-/*
  * Performs an SELinux permission check.
  */
 static int
@@ -445,8 +132,7 @@ SELinuxLabelClient(ClientPtr client)
     /* Try to get a context from the socket */
     if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) {
 	/* Otherwise, fall back to a default context */
-	if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
-	    FatalError("SELinux: failed to look up remote-client context\n");
+	ctx = SELinuxDefaultClientLabel();
     }
 
     /* For local clients, try and determine the executable name */
@@ -662,6 +348,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     SELinuxSubjectRec *subj;
     SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev };
+    security_class_t cls;
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
@@ -686,19 +373,8 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	}
     }
 
-    /* XXX only check read permission on XQueryKeymap */
-    /* This is to allow the numerous apps that call XQueryPointer to work */
-    if (rec->access_mode & DixReadAccess) {
-	ClientPtr client = rec->client;
-	REQUEST(xReq);
-	if (stuff && stuff->reqType != X_QueryKeymap) {
-	    rec->access_mode &= ~DixReadAccess;
-	    rec->access_mode |= DixGetAttrAccess;
-	}
-    }
-
-    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode,
-			&auditdata);
+    cls = IsPointerDevice(rec->dev) ? SECCLASS_X_POINTER : SECCLASS_X_KEYBOARD;
+    rc = SELinuxDoCheck(subj, obj, cls, rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -798,22 +474,12 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     /* If this is a new object that needs labeling, do it now */
     /* XXX there should be a separate callback for this */
     if (obj->sid == unlabeled_sid) {
-	const char *name = rec->ext->name;
-	security_context_t ctx;
 	security_id_t sid;
 
 	serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
-
-	/* Look in the mappings of extension names to contexts */
-	if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) {
-	    ErrorF("SELinux: a property label lookup failed!\n");
-	    rec->status = BadValue;
-	    return;
-	}
-	/* Get a SID for context */
-	if (avc_context_to_sid_raw(ctx, &sid) < 0) {
-	    ErrorF("SELinux: a context_to_SID_raw call failed!\n");
-	    rec->status = BadAlloc;
+	rc = SELinuxExtensionToSID(rec->ext->name, &sid);
+	if (rc != Success) {
+	    rec->status = rc;
 	    return;
 	}
 
@@ -823,11 +489,9 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION,
 			       &obj->sid) < 0) {
 	    ErrorF("SELinux: a SID transition call failed!\n");
-	    freecon(ctx);
 	    rec->status = BadValue;
 	    return;
 	}
-	freecon(ctx);
     }
 
     /* Perform the security check */
@@ -875,7 +539,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	    obj = dixLookupPrivate(&pSel->devPrivates, objectKey);
 	}
 	sidput(tsid);
-	
+
 	if (pSel)
 	    *rec->ppSel = pSel;
 	else {
@@ -1217,661 +881,6 @@ SELinuxObjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	sidput(obj->sid);
 }
 
-
-/*
- * Extension Dispatch
- */
-
-#define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)
-#define CTX_WIN offsetof(SELinuxSubjectRec, win_create_sid)
-#define CTX_PRP offsetof(SELinuxSubjectRec, prp_create_sid)
-#define CTX_SEL offsetof(SELinuxSubjectRec, sel_create_sid)
-#define USE_PRP offsetof(SELinuxSubjectRec, prp_use_sid)
-#define USE_SEL offsetof(SELinuxSubjectRec, sel_use_sid)
-
-typedef struct {
-    security_context_t octx;
-    security_context_t dctx;
-    CARD32 octx_len;
-    CARD32 dctx_len;
-    CARD32 id;
-} SELinuxListItemRec;
-
-static security_context_t
-SELinuxCopyContext(char *ptr, unsigned len)
-{
-    security_context_t copy = xalloc(len + 1);
-    if (!copy)
-	return NULL;
-    strncpy(copy, ptr, len);
-    copy[len] = '\0';
-    return copy;
-}
-
-static int
-ProcSELinuxQueryVersion(ClientPtr client)
-{
-    SELinuxQueryVersionReply rep;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.server_major = SELINUX_MAJOR_VERSION;
-    rep.server_minor = SELINUX_MINOR_VERSION;
-    if (client->swapped) {
-	int n;
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.length, n);
-	swaps(&rep.server_major, n);
-	swaps(&rep.server_minor, n);
-    }
-    WriteToClient(client, sizeof(rep), (char *)&rep);
-    return (client->noClientException);
-}
-
-static int
-SELinuxSendContextReply(ClientPtr client, security_id_t sid)
-{
-    SELinuxGetContextReply rep;
-    security_context_t ctx = NULL;
-    int len = 0;
-
-    if (sid) {
-	if (avc_sid_to_context_raw(sid, &ctx) < 0)
-	    return BadValue;
-	len = strlen(ctx) + 1;
-    }
-
-    rep.type = X_Reply;
-    rep.length = bytes_to_int32(len);
-    rep.sequenceNumber = client->sequence;
-    rep.context_len = len;
-
-    if (client->swapped) {
-	int n;
-	swapl(&rep.length, n);
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.context_len, n);
-    }
-
-    WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
-    WriteToClient(client, len, ctx);
-    freecon(ctx);
-    return client->noClientException;
-}
-
-static int
-ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
-{
-    PrivateRec **privPtr = &client->devPrivates;
-    security_id_t *pSid;
-    security_context_t ctx = NULL;
-    char *ptr;
-    int rc;
-
-    REQUEST(SELinuxSetCreateContextReq);
-    REQUEST_FIXED_SIZE(SELinuxSetCreateContextReq, stuff->context_len);
-
-    if (stuff->context_len > 0) {
-	ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len);
-	if (!ctx)
-	    return BadAlloc;
-    }
-
-    ptr = dixLookupPrivate(privPtr, subjectKey);
-    pSid = (security_id_t *)(ptr + offset);
-    sidput(*pSid);
-    *pSid = NULL;
-
-    rc = Success;
-    if (stuff->context_len > 0) {
-	if (security_check_context_raw(ctx) < 0 ||
-	    avc_context_to_sid_raw(ctx, pSid) < 0)
-	    rc = BadValue;
-    }
-
-    xfree(ctx);
-    return rc;
-}
-
-static int
-ProcSELinuxGetCreateContext(ClientPtr client, unsigned offset)
-{
-    security_id_t *pSid;
-    char *ptr;
-
-    REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq);
-
-    if (offset == CTX_DEV)
-	ptr = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
-    else
-	ptr = dixLookupPrivate(&client->devPrivates, subjectKey);
-
-    pSid = (security_id_t *)(ptr + offset);
-    return SELinuxSendContextReply(client, *pSid);
-}
-
-static int
-ProcSELinuxSetDeviceContext(ClientPtr client)
-{
-    security_context_t ctx;
-    security_id_t sid;
-    DeviceIntPtr dev;
-    SELinuxSubjectRec *subj;
-    SELinuxObjectRec *obj;
-    int rc;
-
-    REQUEST(SELinuxSetContextReq);
-    REQUEST_FIXED_SIZE(SELinuxSetContextReq, stuff->context_len);
-
-    if (stuff->context_len < 1)
-	return BadLength;
-    ctx = SELinuxCopyContext((char *)(stuff + 1), stuff->context_len);
-    if (!ctx)
-	return BadAlloc;
-
-    rc = dixLookupDevice(&dev, stuff->id, client, DixManageAccess);
-    if (rc != Success)
-	goto out;
-
-    if (security_check_context_raw(ctx) < 0 ||
-	avc_context_to_sid_raw(ctx, &sid) < 0) {
-	rc = BadValue;
-	goto out;
-    }
-
-    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
-    sidput(subj->sid);
-    subj->sid = sid;
-    obj = dixLookupPrivate(&dev->devPrivates, objectKey);
-    sidput(obj->sid);
-    sidget(obj->sid = sid);
-
-    rc = Success;
-out:
-    xfree(ctx);
-    return rc;
-}
-
-static int
-ProcSELinuxGetDeviceContext(ClientPtr client)
-{
-    DeviceIntPtr dev;
-    SELinuxSubjectRec *subj;
-    int rc;
-
-    REQUEST(SELinuxGetContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-
-    rc = dixLookupDevice(&dev, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
-    return SELinuxSendContextReply(client, subj->sid);
-}
-
-static int
-ProcSELinuxGetWindowContext(ClientPtr client)
-{
-    WindowPtr pWin;
-    SELinuxObjectRec *obj;
-    int rc;
-
-    REQUEST(SELinuxGetContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    obj = dixLookupPrivate(&pWin->devPrivates, objectKey);
-    return SELinuxSendContextReply(client, obj->sid);
-}
-
-static int
-ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
-{
-    WindowPtr pWin;
-    PropertyPtr pProp;
-    SELinuxObjectRec *obj;
-    int rc;
-
-    REQUEST(SELinuxGetPropertyContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
-
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetPropAccess);
-    if (rc != Success)
-	return rc;
-
-    rc = dixLookupProperty(&pProp, pWin, stuff->property, client,
-			   DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    obj = dixLookupPrivate(&pProp->devPrivates, privKey);
-    return SELinuxSendContextReply(client, obj->sid);
-}
-
-static int
-ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
-{
-    Selection *pSel;
-    SELinuxObjectRec *obj;
-    int rc;
-
-    REQUEST(SELinuxGetContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-
-    rc = dixLookupSelection(&pSel, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    obj = dixLookupPrivate(&pSel->devPrivates, privKey);
-    return SELinuxSendContextReply(client, obj->sid);
-}
-
-static int
-ProcSELinuxGetClientContext(ClientPtr client)
-{
-    ClientPtr target;
-    SELinuxSubjectRec *subj;
-    int rc;
-
-    REQUEST(SELinuxGetContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-
-    rc = dixLookupClient(&target, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    subj = dixLookupPrivate(&target->devPrivates, subjectKey);
-    return SELinuxSendContextReply(client, subj->sid);
-}
-
-static int
-SELinuxPopulateItem(SELinuxListItemRec *i, PrivateRec **privPtr, CARD32 id,
-		    int *size)
-{
-    SELinuxObjectRec *obj = dixLookupPrivate(privPtr, objectKey);
-    SELinuxObjectRec *data = dixLookupPrivate(privPtr, dataKey);
-
-    if (avc_sid_to_context_raw(obj->sid, &i->octx) < 0)
-	return BadValue;
-    if (avc_sid_to_context_raw(data->sid, &i->dctx) < 0)
-	return BadValue;
-
-    i->id = id;
-    i->octx_len = bytes_to_int32(strlen(i->octx) + 1);
-    i->dctx_len = bytes_to_int32(strlen(i->dctx) + 1);
-
-    *size += i->octx_len + i->dctx_len + 3;
-    return Success;
-}
-
-static void
-SELinuxFreeItems(SELinuxListItemRec *items, int count)
-{
-    int k;
-    for (k = 0; k < count; k++) {
-	freecon(items[k].octx);
-	freecon(items[k].dctx);
-    }
-    xfree(items);
-}
-
-static int
-SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items,
-			 int size, int count)
-{
-    int rc, k, n, pos = 0;
-    SELinuxListItemsReply rep;
-    CARD32 *buf;
-
-    buf = xcalloc(size, sizeof(CARD32));
-    if (size && !buf) {
-	rc = BadAlloc;
-	goto out;
-    }
-
-    /* Fill in the buffer */
-    for (k = 0; k < count; k++) {
-	buf[pos] = items[k].id;
-	if (client->swapped)
-	    swapl(buf + pos, n);
-	pos++;
-
-	buf[pos] = items[k].octx_len * 4;
-	if (client->swapped)
-	    swapl(buf + pos, n);
-	pos++;
-
-	buf[pos] = items[k].dctx_len * 4;
-	if (client->swapped)
-	    swapl(buf + pos, n);
-	pos++;
-
-	memcpy((char *)(buf + pos), items[k].octx, strlen(items[k].octx) + 1);
-	pos += items[k].octx_len;
-	memcpy((char *)(buf + pos), items[k].dctx, strlen(items[k].dctx) + 1);
-	pos += items[k].dctx_len;
-    }
-
-    /* Send reply to client */
-    rep.type = X_Reply;
-    rep.length = size;
-    rep.sequenceNumber = client->sequence;
-    rep.count = count;
-
-    if (client->swapped) {
-	swapl(&rep.length, n);
-	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.count, n);
-    }
-
-    WriteToClient(client, sizeof(SELinuxListItemsReply), (char *)&rep);
-    WriteToClient(client, size * 4, (char *)buf);
-
-    /* Free stuff and return */
-    rc = client->noClientException;
-    xfree(buf);
-out:
-    SELinuxFreeItems(items, count);
-    return rc;
-}
-
-static int
-ProcSELinuxListProperties(ClientPtr client)
-{
-    WindowPtr pWin;
-    PropertyPtr pProp;
-    SELinuxListItemRec *items;
-    int rc, count, size, i;
-    CARD32 id;
-
-    REQUEST(SELinuxGetContextReq);
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
-    if (rc != Success)
-	return rc;
-
-    /* Count the number of properties and allocate items */
-    count = 0;
-    for (pProp = wUserProps(pWin); pProp; pProp = pProp->next)
-	count++;
-    items = xcalloc(count, sizeof(SELinuxListItemRec));
-    if (count && !items)
-	return BadAlloc;
-
-    /* Fill in the items and calculate size */
-    i = 0;
-    size = 0;
-    for (pProp = wUserProps(pWin); pProp; pProp = pProp->next) {
-	id = pProp->propertyName;
-	rc = SELinuxPopulateItem(items + i, &pProp->devPrivates, id, &size);
-	if (rc != Success) {
-	    SELinuxFreeItems(items, count);
-	    return rc;
-	}
-	i++;
-    }
-
-    return SELinuxSendItemsToClient(client, items, size, count);
-}
-
-static int
-ProcSELinuxListSelections(ClientPtr client)
-{
-    Selection *pSel;
-    SELinuxListItemRec *items;
-    int rc, count, size, i;
-    CARD32 id;
-
-    REQUEST_SIZE_MATCH(SELinuxGetCreateContextReq);
-
-    /* Count the number of selections and allocate items */
-    count = 0;
-    for (pSel = CurrentSelections; pSel; pSel = pSel->next)
-	count++;
-    items = xcalloc(count, sizeof(SELinuxListItemRec));
-    if (count && !items)
-	return BadAlloc;
-
-    /* Fill in the items and calculate size */
-    i = 0;
-    size = 0;
-    for (pSel = CurrentSelections; pSel; pSel = pSel->next) {
-	id = pSel->selection;
-	rc = SELinuxPopulateItem(items + i, &pSel->devPrivates, id, &size);
-	if (rc != Success) {
-	    SELinuxFreeItems(items, count);
-	    return rc;
-	}
-	i++;
-    }
-
-    return SELinuxSendItemsToClient(client, items, size, count);
-}
-
-static int
-ProcSELinuxDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-    switch (stuff->data) {
-    case X_SELinuxQueryVersion:
-	return ProcSELinuxQueryVersion(client);
-    case X_SELinuxSetDeviceCreateContext:
-	return ProcSELinuxSetCreateContext(client, CTX_DEV);
-    case X_SELinuxGetDeviceCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_DEV);
-    case X_SELinuxSetDeviceContext:
-	return ProcSELinuxSetDeviceContext(client);
-    case X_SELinuxGetDeviceContext:
-	return ProcSELinuxGetDeviceContext(client);
-    case X_SELinuxSetWindowCreateContext:
-	return ProcSELinuxSetCreateContext(client, CTX_WIN);
-    case X_SELinuxGetWindowCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_WIN);
-    case X_SELinuxGetWindowContext:
-	return ProcSELinuxGetWindowContext(client);
-    case X_SELinuxSetPropertyCreateContext:
-	return ProcSELinuxSetCreateContext(client, CTX_PRP);
-    case X_SELinuxGetPropertyCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_PRP);
-    case X_SELinuxSetPropertyUseContext:
-	return ProcSELinuxSetCreateContext(client, USE_PRP);
-    case X_SELinuxGetPropertyUseContext:
-	return ProcSELinuxGetCreateContext(client, USE_PRP);
-    case X_SELinuxGetPropertyContext:
-	return ProcSELinuxGetPropertyContext(client, objectKey);
-    case X_SELinuxGetPropertyDataContext:
-	return ProcSELinuxGetPropertyContext(client, dataKey);
-    case X_SELinuxListProperties:
-	return ProcSELinuxListProperties(client);
-    case X_SELinuxSetSelectionCreateContext:
-	return ProcSELinuxSetCreateContext(client, CTX_SEL);
-    case X_SELinuxGetSelectionCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_SEL);
-    case X_SELinuxSetSelectionUseContext:
-	return ProcSELinuxSetCreateContext(client, USE_SEL);
-    case X_SELinuxGetSelectionUseContext:
-	return ProcSELinuxGetCreateContext(client, USE_SEL);
-    case X_SELinuxGetSelectionContext:
-	return ProcSELinuxGetSelectionContext(client, objectKey);
-    case X_SELinuxGetSelectionDataContext:
-	return ProcSELinuxGetSelectionContext(client, dataKey);
-    case X_SELinuxListSelections:
-	return ProcSELinuxListSelections(client);
-    case X_SELinuxGetClientContext:
-	return ProcSELinuxGetClientContext(client);
-    default:
-	return BadRequest;
-    }
-}
-
-static int
-SProcSELinuxQueryVersion(ClientPtr client)
-{
-    REQUEST(SELinuxQueryVersionReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxQueryVersionReq);
-    swaps(&stuff->client_major, n);
-    swaps(&stuff->client_minor, n);
-    return ProcSELinuxQueryVersion(client);
-}
-
-static int
-SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
-{
-    REQUEST(SELinuxSetCreateContextReq);
-    int n;
-
-    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
-    swapl(&stuff->context_len, n);
-    return ProcSELinuxSetCreateContext(client, offset);
-}
-
-static int
-SProcSELinuxSetDeviceContext(ClientPtr client)
-{
-    REQUEST(SELinuxSetContextReq);
-    int n;
-
-    REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq);
-    swapl(&stuff->id, n);
-    swapl(&stuff->context_len, n);
-    return ProcSELinuxSetDeviceContext(client);
-}
-
-static int
-SProcSELinuxGetDeviceContext(ClientPtr client)
-{
-    REQUEST(SELinuxGetContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id, n);
-    return ProcSELinuxGetDeviceContext(client);
-}
-
-static int
-SProcSELinuxGetWindowContext(ClientPtr client)
-{
-    REQUEST(SELinuxGetContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id, n);
-    return ProcSELinuxGetWindowContext(client);
-}
-
-static int
-SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
-{
-    REQUEST(SELinuxGetPropertyContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
-    swapl(&stuff->window, n);
-    swapl(&stuff->property, n);
-    return ProcSELinuxGetPropertyContext(client, privKey);
-}
-
-static int
-SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
-{
-    REQUEST(SELinuxGetContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id, n);
-    return ProcSELinuxGetSelectionContext(client, privKey);
-}
-
-static int
-SProcSELinuxListProperties(ClientPtr client)
-{
-    REQUEST(SELinuxGetContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id, n);
-    return ProcSELinuxListProperties(client);
-}
-
-static int
-SProcSELinuxGetClientContext(ClientPtr client)
-{
-    REQUEST(SELinuxGetContextReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id, n);
-    return ProcSELinuxGetClientContext(client);
-}
-
-static int
-SProcSELinuxDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-    int n;
-
-    swaps(&stuff->length, n);
-
-    switch (stuff->data) {
-    case X_SELinuxQueryVersion:
-	return SProcSELinuxQueryVersion(client);
-    case X_SELinuxSetDeviceCreateContext:
-	return SProcSELinuxSetCreateContext(client, CTX_DEV);
-    case X_SELinuxGetDeviceCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_DEV);
-    case X_SELinuxSetDeviceContext:
-	return SProcSELinuxSetDeviceContext(client);
-    case X_SELinuxGetDeviceContext:
-	return SProcSELinuxGetDeviceContext(client);
-    case X_SELinuxSetWindowCreateContext:
-	return SProcSELinuxSetCreateContext(client, CTX_WIN);
-    case X_SELinuxGetWindowCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_WIN);
-    case X_SELinuxGetWindowContext:
-	return SProcSELinuxGetWindowContext(client);
-    case X_SELinuxSetPropertyCreateContext:
-	return SProcSELinuxSetCreateContext(client, CTX_PRP);
-    case X_SELinuxGetPropertyCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_PRP);
-    case X_SELinuxSetPropertyUseContext:
-	return SProcSELinuxSetCreateContext(client, USE_PRP);
-    case X_SELinuxGetPropertyUseContext:
-	return ProcSELinuxGetCreateContext(client, USE_PRP);
-    case X_SELinuxGetPropertyContext:
-	return SProcSELinuxGetPropertyContext(client, objectKey);
-    case X_SELinuxGetPropertyDataContext:
-	return SProcSELinuxGetPropertyContext(client, dataKey);
-    case X_SELinuxListProperties:
-	return SProcSELinuxListProperties(client);
-    case X_SELinuxSetSelectionCreateContext:
-	return SProcSELinuxSetCreateContext(client, CTX_SEL);
-    case X_SELinuxGetSelectionCreateContext:
-	return ProcSELinuxGetCreateContext(client, CTX_SEL);
-    case X_SELinuxSetSelectionUseContext:
-	return SProcSELinuxSetCreateContext(client, USE_SEL);
-    case X_SELinuxGetSelectionUseContext:
-	return ProcSELinuxGetCreateContext(client, USE_SEL);
-    case X_SELinuxGetSelectionContext:
-	return SProcSELinuxGetSelectionContext(client, objectKey);
-    case X_SELinuxGetSelectionDataContext:
-	return SProcSELinuxGetSelectionContext(client, dataKey);
-    case X_SELinuxListSelections:
-	return ProcSELinuxListSelections(client);
-    case X_SELinuxGetClientContext:
-	return SProcSELinuxGetClientContext(client);
-    default:
-	return BadRequest;
-    }
-}
-
 #ifdef HAVE_AVC_NETLINK_ACQUIRE_FD
 static int netlink_fd;
 
@@ -1888,13 +897,8 @@ SELinuxWakeupHandler(void *data, int err, void *read_mask)
 }
 #endif
 
-
-/*
- * Extension Setup / Teardown
- */
-
-static void
-SELinuxResetProc(ExtensionEntry *extEntry)
+void
+SELinuxFlaskReset(void)
 {
     /* Unregister callbacks */
     DeleteCallback(&ClientStateCallback, SELinuxClientState, NULL);
@@ -1914,9 +918,6 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     XaceDeleteCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
 
     /* Tear down SELinux stuff */
-    selabel_close(label_hnd);
-    label_hnd = NULL;
-
     audit_close(audit_fd);
 #ifdef HAVE_AVC_NETLINK_ACQUIRE_FD
     avc_netlink_release_fd();
@@ -1927,45 +928,16 @@ SELinuxResetProc(ExtensionEntry *extEntry)
 
     avc_destroy();
     avc_active = 0;
-
-    /* Free local state */
-    xfree(knownAtoms);
-    knownAtoms = NULL;
-    numKnownAtoms = 0;
-
-    xfree(knownEvents);
-    knownEvents = NULL;
-    numKnownEvents = 0;
-
-    xfree(knownTypes);
-    knownTypes = NULL;
-    numKnownTypes = 0;
 }
 
 void
-SELinuxExtensionInit(INITARGS)
+SELinuxFlaskInit(void)
 {
-    ExtensionEntry *extEntry;
-    struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 };
     struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *)0 };
     security_context_t ctx;
     int ret = TRUE;
 
-    /* Check SELinux mode on system */
-    if (!is_selinux_enabled()) {
-	ErrorF("SELinux: Disabled on system, not enabling in X server\n");
-	return;
-    }
-
-    /* Don't init unless there's something to do */
-    if (!security_get_boolean_active("xserver_object_manager"))
-        return;
-
-    /* Check SELinux mode in configuration file */
     switch(selinuxEnforcingState) {
-    case SELINUX_MODE_DISABLED:
-	LogMessage(X_INFO, "SELinux: Disabled in configuration file\n");
-	return;
     case SELINUX_MODE_ENFORCING:
 	LogMessage(X_INFO, "SELinux: Configured in enforcing mode\n");
 	avc_option.value = (char *)1;
@@ -1995,10 +967,6 @@ SELinuxExtensionInit(INITARGS)
 	FatalError("SELinux: Couldn't initialize SELinux userspace AVC\n");
     avc_active = 1;
 
-    label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1);
-    if (!label_hnd)
-	FatalError("SELinux: Failed to open x_contexts mapping in policy\n");
-
     if (security_get_initial_context_raw("unlabeled", &ctx) < 0)
 	FatalError("SELinux: Failed to look up unlabeled context\n");
     if (avc_context_to_sid_raw(ctx, &unlabeled_sid) < 0)
@@ -2057,14 +1025,6 @@ SELinuxExtensionInit(INITARGS)
     if (!ret)
 	FatalError("SELinux: Failed to register one or more callbacks\n");
 
-    /* Add extension to server */
-    extEntry = AddExtension(SELINUX_EXTENSION_NAME,
-			    SELinuxNumberEvents, SELinuxNumberErrors,
-			    ProcSELinuxDispatch, SProcSELinuxDispatch,
-			    SELinuxResetProc, StandardMinorOpcode);
-
-    AddExtensionAlias("Flask", extEntry);
-
     /* Label objects that were created before we could register ourself */
     SELinuxLabelInitial();
 }
diff --git a/xorg-server/Xext/xselinux_label.c b/xorg-server/Xext/xselinux_label.c
new file mode 100644
index 000000000..239536cf3
--- /dev/null
+++ b/xorg-server/Xext/xselinux_label.c
@@ -0,0 +1,381 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <selinux/label.h>
+
+#include "registry.h"
+#include "xselinuxint.h"
+
+/* selection and property atom cache */
+typedef struct {
+    SELinuxObjectRec prp;
+    SELinuxObjectRec sel;
+} SELinuxAtomRec;
+
+/* dynamic array */
+typedef struct {
+    unsigned size;
+    void **array;
+} SELinuxArrayRec;
+
+/* labeling handle */
+static struct selabel_handle *label_hnd;
+
+/* Array of object classes indexed by resource type */
+SELinuxArrayRec arr_types;
+/* Array of event SIDs indexed by event type */
+SELinuxArrayRec arr_events;
+/* Array of property and selection SID structures */
+SELinuxArrayRec arr_atoms;
+
+/*
+ * Dynamic array helpers
+ */
+static void *
+SELinuxArrayGet(SELinuxArrayRec *rec, unsigned key)
+{
+    return (rec->size > key) ? rec->array[key] : 0;
+}
+
+static int
+SELinuxArraySet(SELinuxArrayRec *rec, unsigned key, void *val)
+{
+    if (key >= rec->size) {
+	/* Need to increase size of array */
+	rec->array = xrealloc(rec->array, (key + 1) * sizeof(val));
+	if (!rec->array)
+	    return FALSE;
+	memset(rec->array + rec->size, 0, (key - rec->size + 1) * sizeof(val));
+	rec->size = key + 1;
+    }
+
+    rec->array[key] = val;
+    return TRUE;
+}
+
+static void
+SELinuxArrayFree(SELinuxArrayRec *rec, int free_elements)
+{
+    if (free_elements) {
+	unsigned i = rec->size;
+	while (i)
+	    xfree(rec->array[--i]);
+    }
+
+    xfree(rec->array);
+    rec->size = 0;
+    rec->array = NULL;
+}
+
+/*
+ * Looks up a name in the selection or property mappings
+ */
+static int
+SELinuxAtomToSIDLookup(Atom atom, SELinuxObjectRec *obj, int map, int polymap)
+{
+    const char *name = NameForAtom(atom);
+    security_context_t ctx;
+    int rc = Success;
+
+    obj->poly = 1;
+
+    /* Look in the mappings of names to contexts */
+    if (selabel_lookup_raw(label_hnd, &ctx, name, map) == 0) {
+	obj->poly = 0;
+    } else if (errno != ENOENT) {
+	ErrorF("SELinux: a property label lookup failed!\n");
+	return BadValue;
+    } else if (selabel_lookup_raw(label_hnd, &ctx, name, polymap) < 0) {
+	ErrorF("SELinux: a property label lookup failed!\n");
+	return BadValue;
+    }
+
+    /* Get a SID for context */
+    if (avc_context_to_sid_raw(ctx, &obj->sid) < 0) {
+	ErrorF("SELinux: a context_to_SID_raw call failed!\n");
+	rc = BadAlloc;
+    }
+
+    freecon(ctx);
+    return rc;
+}
+
+/*
+ * Looks up the SID corresponding to the given property or selection atom
+ */
+int
+SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn)
+{
+    SELinuxAtomRec *rec;
+    SELinuxObjectRec *obj;
+    int rc, map, polymap;
+
+    rec = SELinuxArrayGet(&arr_atoms, atom);
+    if (!rec) {
+	rec = xcalloc(1, sizeof(SELinuxAtomRec));
+	if (!rec || !SELinuxArraySet(&arr_atoms, atom, rec))
+	    return BadAlloc;
+    }
+
+    if (prop) {
+	obj = &rec->prp;
+	map = SELABEL_X_PROP;
+	polymap = SELABEL_X_POLYPROP;
+    } else {
+	obj = &rec->sel;
+	map = SELABEL_X_SELN;
+	polymap = SELABEL_X_POLYSELN;
+    }
+
+    if (!obj->sid) {
+	rc = SELinuxAtomToSIDLookup(atom, obj, map, polymap);
+	if (rc != Success)
+	    goto out;
+    }
+
+    *obj_rtn = obj;
+    rc = Success;
+out:
+    return rc;
+}
+
+/*
+ * Looks up a SID for a selection/subject pair
+ */
+int
+SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj,
+		      security_id_t *sid_rtn, int *poly_rtn)
+{
+    int rc;
+    SELinuxObjectRec *obj;
+    security_id_t tsid;
+
+    /* Get the default context and polyinstantiation bit */
+    rc = SELinuxAtomToSID(selection, 0, &obj);
+    if (rc != Success)
+	return rc;
+
+    /* Check for an override context next */
+    if (subj->sel_use_sid) {
+	sidget(tsid = subj->sel_use_sid);
+	goto out;
+    }
+
+    sidget(tsid = obj->sid);
+
+    /* Polyinstantiate if necessary to obtain the final SID */
+    if (obj->poly) {
+	sidput(tsid);
+	if (avc_compute_member(subj->sid, obj->sid,
+			       SECCLASS_X_SELECTION, &tsid) < 0) {
+	    ErrorF("SELinux: a compute_member call failed!\n");
+	    return BadValue;
+	}
+    }
+out:
+    *sid_rtn = tsid;
+    if (poly_rtn)
+	*poly_rtn = obj->poly;
+    return Success;
+}
+
+/*
+ * Looks up a SID for a property/subject pair
+ */
+int
+SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj,
+		     security_id_t *sid_rtn, int *poly_rtn)
+{
+    int rc;
+    SELinuxObjectRec *obj;
+    security_id_t tsid, tsid2;
+
+    /* Get the default context and polyinstantiation bit */
+    rc = SELinuxAtomToSID(property, 1, &obj);
+    if (rc != Success)
+	return rc;
+
+    /* Check for an override context next */
+    if (subj->prp_use_sid) {
+	sidget(tsid = subj->prp_use_sid);
+	goto out;
+    }
+
+    /* Perform a transition */
+    if (avc_compute_create(subj->sid, obj->sid,
+			   SECCLASS_X_PROPERTY, &tsid) < 0) {
+	ErrorF("SELinux: a compute_create call failed!\n");
+	return BadValue;
+    }
+
+    /* Polyinstantiate if necessary to obtain the final SID */
+    if (obj->poly) {
+	tsid2 = tsid;
+	if (avc_compute_member(subj->sid, tsid2,
+			       SECCLASS_X_PROPERTY, &tsid) < 0) {
+	    ErrorF("SELinux: a compute_member call failed!\n");
+	    sidput(tsid2);
+	    return BadValue;
+	}
+	sidput(tsid2);
+    }
+out:
+    *sid_rtn = tsid;
+    if (poly_rtn)
+	*poly_rtn = obj->poly;
+    return Success;
+}
+
+/*
+ * Looks up the SID corresponding to the given event type
+ */
+int
+SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
+		  SELinuxObjectRec *sid_return)
+{
+    const char *name = LookupEventName(type);
+    security_id_t sid;
+    security_context_t ctx;
+    type &= 127;
+
+    sid = SELinuxArrayGet(&arr_events, type);
+    if (!sid) {
+	/* Look in the mappings of event names to contexts */
+	if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EVENT) < 0) {
+	    ErrorF("SELinux: an event label lookup failed!\n");
+	    return BadValue;
+	}
+	/* Get a SID for context */
+	if (avc_context_to_sid_raw(ctx, &sid) < 0) {
+	    ErrorF("SELinux: a context_to_SID_raw call failed!\n");
+	    freecon(ctx);
+	    return BadAlloc;
+	}
+	freecon(ctx);
+	/* Cache the SID value */
+	if (!SELinuxArraySet(&arr_events, type, sid)) {
+	    sidput(sid);
+	    return BadAlloc;
+	}
+    }
+
+    /* Perform a transition to obtain the final SID */
+    if (avc_compute_create(sid_of_window, sid, SECCLASS_X_EVENT,
+			   &sid_return->sid) < 0) {
+	ErrorF("SELinux: a compute_create call failed!\n");
+	return BadValue;
+    }
+
+    return Success;
+}
+
+int
+SELinuxExtensionToSID(const char *name, security_id_t *sid_rtn)
+{
+    security_context_t ctx;
+
+    /* Look in the mappings of extension names to contexts */
+    if (selabel_lookup_raw(label_hnd, &ctx, name, SELABEL_X_EXT) < 0) {
+	ErrorF("SELinux: a property label lookup failed!\n");
+	return BadValue;
+    }
+    /* Get a SID for context */
+    if (avc_context_to_sid_raw(ctx, sid_rtn) < 0) {
+	ErrorF("SELinux: a context_to_SID_raw call failed!\n");
+	freecon(ctx);
+	return BadAlloc;
+    }
+    freecon(ctx);
+    return Success;
+}
+
+/*
+ * Returns the object class corresponding to the given resource type.
+ */
+security_class_t
+SELinuxTypeToClass(RESTYPE type)
+{
+    void *tmp;
+
+    tmp = SELinuxArrayGet(&arr_types, type & TypeMask);
+    if (!tmp) {
+	unsigned long class = SECCLASS_X_RESOURCE;
+
+	if (type & RC_DRAWABLE)
+	    class = SECCLASS_X_DRAWABLE;
+	else if (type == RT_GC)
+	    class = SECCLASS_X_GC;
+	else if (type == RT_FONT)
+	    class = SECCLASS_X_FONT;
+	else if (type == RT_CURSOR)
+	    class = SECCLASS_X_CURSOR;
+	else if (type == RT_COLORMAP)
+	    class = SECCLASS_X_COLORMAP;
+	else {
+	    /* Need to do a string lookup */
+	    const char *str = LookupResourceName(type);
+	    if (!strcmp(str, "PICTURE"))
+		class = SECCLASS_X_DRAWABLE;
+	    else if (!strcmp(str, "GLYPHSET"))
+		class = SECCLASS_X_FONT;
+	}
+
+	tmp = (void *)class;
+	SELinuxArraySet(&arr_types, type & TypeMask, tmp);
+    }
+
+    return (security_class_t)(unsigned long)tmp;
+}
+
+security_context_t
+SELinuxDefaultClientLabel(void)
+{
+    security_context_t ctx;
+
+    if (selabel_lookup_raw(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
+	FatalError("SELinux: failed to look up remote-client context\n");
+
+    return ctx;
+}
+
+void
+SELinuxLabelInit(void)
+{
+    struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *)1 };
+
+    label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1);
+    if (!label_hnd)
+	FatalError("SELinux: Failed to open x_contexts mapping in policy\n");
+}
+
+void
+SELinuxLabelReset(void)
+{
+    selabel_close(label_hnd);
+    label_hnd = NULL;
+
+    /* Free local state */
+    SELinuxArrayFree(&arr_types, 0);
+    SELinuxArrayFree(&arr_events, 0);
+    SELinuxArrayFree(&arr_atoms, 1);
+}
diff --git a/xorg-server/Xext/xselinuxint.h b/xorg-server/Xext/xselinuxint.h
new file mode 100644
index 000000000..854a57dd7
--- /dev/null
+++ b/xorg-server/Xext/xselinuxint.h
@@ -0,0 +1,556 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+********************************************************/
+
+#ifndef _XSELINUXINT_H
+#define _XSELINUXINT_H
+
+#include <selinux/selinux.h>
+#include <selinux/avc.h>
+
+#include "globals.h"
+#include "dixaccess.h"
+#include "dixstruct.h"
+#include "privates.h"
+#include "resource.h"
+#include "registry.h"
+#include "inputstr.h"
+#include "xselinux.h"
+
+/*
+ * Types
+ */
+
+/* subject state (clients and devices only) */
+typedef struct {
+    security_id_t sid;
+    security_id_t dev_create_sid;
+    security_id_t win_create_sid;
+    security_id_t sel_create_sid;
+    security_id_t prp_create_sid;
+    security_id_t sel_use_sid;
+    security_id_t prp_use_sid;
+    struct avc_entry_ref aeref;
+    char *command;
+    int privileged;
+} SELinuxSubjectRec;
+
+/* object state */
+typedef struct {
+    security_id_t sid;
+    int poly;
+} SELinuxObjectRec;
+
+/*
+ * Globals
+ */
+
+extern DevPrivateKey subjectKey;
+extern DevPrivateKey objectKey;
+extern DevPrivateKey dataKey;
+
+/*
+ * Label functions
+ */
+
+int
+SELinuxAtomToSID(Atom atom, int prop, SELinuxObjectRec **obj_rtn);
+
+int
+SELinuxSelectionToSID(Atom selection, SELinuxSubjectRec *subj,
+		      security_id_t *sid_rtn, int *poly_rtn);
+
+int
+SELinuxPropertyToSID(Atom property, SELinuxSubjectRec *subj,
+		     security_id_t *sid_rtn, int *poly_rtn);
+
+int
+SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
+		  SELinuxObjectRec *sid_return);
+
+int
+SELinuxExtensionToSID(const char *name, security_id_t *sid_rtn);
+
+security_class_t
+SELinuxTypeToClass(RESTYPE type);
+
+security_context_t
+SELinuxDefaultClientLabel(void);
+
+void
+SELinuxLabelInit(void);
+
+void
+SELinuxLabelReset(void);
+
+/*
+ * Security module functions
+ */
+
+void
+SELinuxFlaskInit(void);
+
+void
+SELinuxFlaskReset(void);
+
+
+/*
+ * Private Flask definitions
+ */
+
+/* Security class constants */
+#define SECCLASS_X_DRAWABLE		1
+#define SECCLASS_X_SCREEN		2
+#define SECCLASS_X_GC			3
+#define SECCLASS_X_FONT			4
+#define SECCLASS_X_COLORMAP		5
+#define SECCLASS_X_PROPERTY		6
+#define SECCLASS_X_SELECTION		7
+#define SECCLASS_X_CURSOR		8
+#define SECCLASS_X_CLIENT		9
+#define SECCLASS_X_POINTER		10
+#define SECCLASS_X_KEYBOARD		11
+#define SECCLASS_X_SERVER		12
+#define SECCLASS_X_EXTENSION		13
+#define SECCLASS_X_EVENT		14
+#define SECCLASS_X_FAKEEVENT		15
+#define SECCLASS_X_RESOURCE		16
+
+#ifdef _XSELINUX_NEED_FLASK_MAP
+/* Mapping from DixAccess bits to Flask permissions */
+static struct security_class_mapping map[] = {
+    { "x_drawable",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "list_property",	/* DixListPropAccess */
+          "get_property",	/* DixGetPropAccess */
+          "set_property",	/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "list_child",		/* DixListAccess */
+          "add_child",		/* DixAddAccess */
+          "remove_child",	/* DixRemoveAccess */
+          "hide",		/* DixHideAccess */
+          "show",		/* DixShowAccess */
+          "blend",		/* DixBlendAccess */
+          "override",		/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "send",		/* DixSendAccess */
+          "receive",		/* DixReceiveAccess */
+          "",			/* DixUseAccess */
+          "manage",		/* DixManageAccess */
+          NULL }},
+    { "x_screen",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "saver_getattr",	/* DixListPropAccess */
+          "saver_setattr",	/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "hide_cursor",	/* DixHideAccess */
+          "show_cursor",	/* DixShowAccess */
+          "saver_hide",		/* DixBlendAccess */
+          "saver_show",		/* DixGrabAccess */
+          NULL }},
+    { "x_gc",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          NULL }},
+    { "x_font",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "",			/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "add_glyph",		/* DixAddAccess */
+          "remove_glyph",	/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          NULL }},
+    { "x_colormap",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "",			/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "add_color",		/* DixAddAccess */
+          "remove_color",	/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "install",		/* DixInstallAccess */
+          "uninstall",		/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          NULL }},
+    { "x_property",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "write",		/* DixBlendAccess */
+          NULL }},
+    { "x_selection",
+        { "read",		/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "setattr",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          NULL }},
+    { "x_cursor",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          NULL }},
+    { "x_client",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "",			/* DixUseAccess */
+          "manage",		/* DixManageAccess */
+          NULL }},
+    { "x_pointer",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "list_property",	/* DixListPropAccess */
+          "get_property",	/* DixGetPropAccess */
+          "set_property",	/* DixSetPropAccess */
+          "getfocus",		/* DixGetFocusAccess */
+          "setfocus",		/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "add",		/* DixAddAccess */
+          "remove",		/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "grab",		/* DixGrabAccess */
+          "freeze",		/* DixFreezeAccess */
+          "force_cursor",	/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          "manage",		/* DixManageAccess */
+          "",			/* DixDebugAccess */
+          "bell",		/* DixBellAccess */
+          NULL }},
+    { "x_keyboard",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "destroy",		/* DixDestroyAccess */
+          "create",		/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "list_property",	/* DixListPropAccess */
+          "get_property",	/* DixGetPropAccess */
+          "set_property",	/* DixSetPropAccess */
+          "getfocus",		/* DixGetFocusAccess */
+          "setfocus",		/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "add",		/* DixAddAccess */
+          "remove",		/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "grab",		/* DixGrabAccess */
+          "freeze",		/* DixFreezeAccess */
+          "force_cursor",	/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          "manage",		/* DixManageAccess */
+          "",			/* DixDebugAccess */
+          "bell",		/* DixBellAccess */
+          NULL }},
+    { "x_server",
+        { "record",		/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "getattr",		/* DixGetAttrAccess */
+          "setattr",		/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "grab",		/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "",			/* DixUseAccess */
+          "manage",		/* DixManageAccess */
+          "debug",		/* DixDebugAccess */
+          NULL }},
+    { "x_extension",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "query",		/* DixGetAttrAccess */
+          "",			/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "",			/* DixSendAccess */
+          "",			/* DixReceiveAccess */
+          "use",		/* DixUseAccess */
+          NULL }},
+    { "x_event",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "",			/* DixGetAttrAccess */
+          "",			/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "send",		/* DixSendAccess */
+          "receive",		/* DixReceiveAccess */
+          NULL }},
+    { "x_synthetic_event",
+        { "",			/* DixReadAccess */
+          "",			/* DixWriteAccess */
+          "",			/* DixDestroyAccess */
+          "",			/* DixCreateAccess */
+          "",			/* DixGetAttrAccess */
+          "",			/* DixSetAttrAccess */
+          "",			/* DixListPropAccess */
+          "",			/* DixGetPropAccess */
+          "",			/* DixSetPropAccess */
+          "",			/* DixGetFocusAccess */
+          "",			/* DixSetFocusAccess */
+          "",			/* DixListAccess */
+          "",			/* DixAddAccess */
+          "",			/* DixRemoveAccess */
+          "",			/* DixHideAccess */
+          "",			/* DixShowAccess */
+          "",			/* DixBlendAccess */
+          "",			/* DixGrabAccess */
+          "",			/* DixFreezeAccess */
+          "",			/* DixForceAccess */
+          "",			/* DixInstallAccess */
+          "",			/* DixUninstallAccess */
+          "send",		/* DixSendAccess */
+          "receive",		/* DixReceiveAccess */
+          NULL }},
+    { "x_resource",
+        { "read",		/* DixReadAccess */
+          "write",		/* DixWriteAccess */
+          "write",		/* DixDestroyAccess */
+          "write",		/* DixCreateAccess */
+          "read",		/* DixGetAttrAccess */
+          "write",		/* DixSetAttrAccess */
+          "read",		/* DixListPropAccess */
+          "read",		/* DixGetPropAccess */
+          "write",		/* DixSetPropAccess */
+          "read",		/* DixGetFocusAccess */
+          "write",		/* DixSetFocusAccess */
+          "read",		/* DixListAccess */
+          "write",		/* DixAddAccess */
+          "write",		/* DixRemoveAccess */
+          "write",		/* DixHideAccess */
+          "read",		/* DixShowAccess */
+          "read",		/* DixBlendAccess */
+          "write",		/* DixGrabAccess */
+          "write",		/* DixFreezeAccess */
+          "write",		/* DixForceAccess */
+          "write",		/* DixInstallAccess */
+          "write",		/* DixUninstallAccess */
+          "write",		/* DixSendAccess */
+          "read",		/* DixReceiveAccess */
+          "read",		/* DixUseAccess */
+          "write",		/* DixManageAccess */
+          "read",		/* DixDebugAccess */
+          "write",		/* DixBellAccess */
+          NULL }},
+    { NULL }
+};
+
+/* x_resource "read" bits from the list above */
+#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \
+			 DixGetPropAccess|DixGetFocusAccess|DixListAccess| \
+			 DixShowAccess|DixBlendAccess|DixReceiveAccess| \
+			 DixUseAccess|DixDebugAccess)
+
+#endif /* _XSELINUX_NEED_FLASK_MAP */
+#endif /* _XSELINUXINT_H */
diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c
index 6b0e9fd14..5af2b5c83 100644
--- a/xorg-server/Xext/xtest.c
+++ b/xorg-server/Xext/xtest.c
@@ -640,8 +640,8 @@ int AllocXTestDevice (ClientPtr client, char* name,
 
     retval = AllocDevicePair( client, xtestname, ptr, keybd, CorePointerProc, CoreKeyboardProc, FALSE);
     if ( retval == Success ){
-        dixSetPrivate(&((*ptr)->devPrivates), XTestDevicePrivateKey, (void *)master_ptr->id);
-        dixSetPrivate(&((*keybd)->devPrivates), XTestDevicePrivateKey, (void *)master_keybd->id);
+        dixSetPrivate(&((*ptr)->devPrivates), XTestDevicePrivateKey, (void *)(intptr_t)master_ptr->id);
+        dixSetPrivate(&((*keybd)->devPrivates), XTestDevicePrivateKey, (void *)(intptr_t)master_keybd->id);
 
         XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE),
                 XA_INTEGER, 8, PropModeReplace, 1, &dummy,
@@ -677,7 +677,7 @@ IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master)
         return is_XTest;
 
     tmp = dixLookupPrivate(&dev->devPrivates, XTestDevicePrivateKey);
-    mid = (int)tmp;
+    mid = (intptr_t)tmp;
 
     /* deviceid 0 is reserved for XIAllDevices, non-zero mid means XTest
      * device */
diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c
index 04cd11a3f..5229916a9 100644
--- a/xorg-server/Xext/xvdisp.c
+++ b/xorg-server/Xext/xvdisp.c
@@ -1912,7 +1912,7 @@ void XineramifyXv(void)
 	    if((pAdapt->type & XvImageMask) && (pAdapt->nImages > 0)) {
 	      hasOverlay = FALSE;
               for(l = 0; l < pAdapt->nAttributes; l++) {
-	         if(!strcmp(pAdapt->name, "XV_COLORKEY")) {
+	         if(!strcmp(pAdapt->pAttributes[l].name, "XV_COLORKEY")) {
 		   hasOverlay = TRUE;
 		   break;
 		 }
diff --git a/xorg-server/Xi/Makefile.in b/xorg-server/Xi/Makefile.in
index c4c483c81..dab5eeddd 100644
--- a/xorg-server/Xi/Makefile.in
+++ b/xorg-server/Xi/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -254,7 +251,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -268,7 +264,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -354,6 +347,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -385,7 +379,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/Xi/queryst.c b/xorg-server/Xi/queryst.c
index 2ba1edb63..78b97a769 100644
--- a/xorg-server/Xi/queryst.c
+++ b/xorg-server/Xi/queryst.c
@@ -96,7 +96,7 @@ ProcXQueryDeviceState(ClientPtr client)
     rep.sequenceNumber = client->sequence;
 
     rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
-    if (rc != Success)
+    if (rc != Success && rc != BadAccess)
 	return rc;
 
     v = dev->valuator;
@@ -130,8 +130,9 @@ ProcXQueryDeviceState(ClientPtr client)
 	tk->length = sizeof(xKeyState);
 	tk->num_keys = k->xkbInfo->desc->max_key_code -
                        k->xkbInfo->desc->min_key_code + 1;
-	for (i = 0; i < 32; i++)
-	    tk->keys[i] = k->down[i];
+	if (rc != BadAccess)
+	    for (i = 0; i < 32; i++)
+		tk->keys[i] = k->down[i];
 	buf += sizeof(xKeyState);
     }
 
@@ -140,7 +141,8 @@ ProcXQueryDeviceState(ClientPtr client)
 	tb->class = ButtonClass;
 	tb->length = sizeof(xButtonState);
 	tb->num_buttons = b->numButtons;
-	memcpy(tb->buttons, b->down, sizeof(b->down));
+	if (rc != BadAccess)
+	    memcpy(tb->buttons, b->down, sizeof(b->down));
 	buf += sizeof(xButtonState);
     }
 
@@ -152,7 +154,9 @@ ProcXQueryDeviceState(ClientPtr client)
 	tv->mode = v->mode;
 	buf += sizeof(xValuatorState);
 	for (i = 0, values = v->axisVal; i < v->numAxes; i++) {
-	    *((int *)buf) = *values++;
+	    if (rc != BadAccess)
+		*((int *)buf) = *values;
+	    values++;
 	    if (client->swapped) {
 		swapl((int *)buf, n);	/* macro - braces needed */
 	    }
diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c
index 68d91fa87..435868de2 100644
--- a/xorg-server/Xi/xiquerydevice.c
+++ b/xorg-server/Xi/xiquerydevice.c
@@ -45,7 +45,8 @@
 #include "xiquerydevice.h"
 
 static Bool ShouldSkipDevice(ClientPtr client, int deviceid, DeviceIntPtr d);
-static int ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info);
+static int
+ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo* info);
 static int SizeDeviceInfo(DeviceIntPtr dev);
 static void SwapDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info);
 int
@@ -119,7 +120,7 @@ ProcXIQueryDevice(ClientPtr client)
     ptr = info;
     if (dev)
     {
-        len = ListDeviceInfo(dev, (xXIDeviceInfo*)info);
+        len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info);
         if (client->swapped)
             SwapDeviceInfo(dev, (xXIDeviceInfo*)info);
         info += len;
@@ -131,7 +132,7 @@ ProcXIQueryDevice(ClientPtr client)
         {
             if (!skip[i])
             {
-                len = ListDeviceInfo(dev, (xXIDeviceInfo*)info);
+                len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info);
                 if (client->swapped)
                     SwapDeviceInfo(dev, (xXIDeviceInfo*)info);
                 info += len;
@@ -143,7 +144,7 @@ ProcXIQueryDevice(ClientPtr client)
         {
             if (!skip[i])
             {
-                len = ListDeviceInfo(dev, (xXIDeviceInfo*)info);
+                len = ListDeviceInfo(client, dev, (xXIDeviceInfo*)info);
                 if (client->swapped)
                     SwapDeviceInfo(dev, (xXIDeviceInfo*)info);
                 info += len;
@@ -240,7 +241,7 @@ SizeDeviceClasses(DeviceIntPtr dev)
  * @return Number of bytes written into info.
  */
 int
-ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info)
+ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info, Bool reportState)
 {
     unsigned char *bits;
     int mask_len;
@@ -257,9 +258,11 @@ ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info)
     bits = (unsigned char*)&info[1];
     memset(bits, 0, mask_len * 4);
 
-    for (i = 0; dev && dev->button && i < dev->button->numButtons; i++)
-        if (BitIsOn(dev->button->down, i))
-            SetBit(bits, i);
+    if (reportState)
+	for (i = 0; dev && dev->button && i < dev->button->numButtons; i++)
+	    if (BitIsOn(dev->button->down, i))
+		SetBit(bits, i);
+
     bits += mask_len * 4;
     memcpy(bits, dev->button->labels, dev->button->numButtons * sizeof(Atom));
 
@@ -327,7 +330,8 @@ SwapKeyInfo(DeviceIntPtr dev, xXIKeyInfo* info)
  * @return The number of bytes written into info.
  */
 int
-ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber)
+ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber,
+		 Bool reportState)
 {
     ValuatorClassPtr v = dev->valuator;
 
@@ -345,6 +349,9 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber)
     info->mode = v->mode; /* Server doesn't have per-axis mode yet */
     info->sourceid = v->sourceid;
 
+    if (!reportState)
+	info->value = info->min;
+
     return info->length * 4;
 }
 
@@ -389,7 +396,7 @@ int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment)
  * @return The number of bytes used.
  */
 static int
-ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info)
+ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo* info)
 {
     char *any = (char*)&info[1];
     int len = 0, total_len = 0;
@@ -407,7 +414,8 @@ ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info)
     any += len;
     total_len += len;
 
-    return total_len + ListDeviceClasses(dev, any, &info->num_classes);
+    total_len += ListDeviceClasses(client, dev, any, &info->num_classes);
+    return total_len;
 }
 
 /**
@@ -416,16 +424,21 @@ ListDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo* info)
  * written.
  */
 int
-ListDeviceClasses(DeviceIntPtr dev, char *any, uint16_t *nclasses)
+ListDeviceClasses(ClientPtr client, DeviceIntPtr dev,
+		  char *any, uint16_t *nclasses)
 {
     int total_len = 0;
     int len;
     int i;
+    int rc;
+
+    /* Check if the current device state should be suppressed */
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess);
 
     if (dev->button)
     {
         (*nclasses)++;
-        len = ListButtonInfo(dev, (xXIButtonInfo*)any);
+        len = ListButtonInfo(dev, (xXIButtonInfo*)any, rc == Success);
         any += len;
         total_len += len;
     }
@@ -441,7 +454,7 @@ ListDeviceClasses(DeviceIntPtr dev, char *any, uint16_t *nclasses)
     for (i = 0; dev->valuator && i < dev->valuator->numAxes; i++)
     {
         (*nclasses)++;
-        len = ListValuatorInfo(dev, (xXIValuatorInfo*)any, i);
+        len = ListValuatorInfo(dev, (xXIValuatorInfo*)any, i, rc == Success);
         any += len;
         total_len += len;
     }
diff --git a/xorg-server/Xi/xiquerydevice.h b/xorg-server/Xi/xiquerydevice.h
index 34e87bdde..02f06591e 100644
--- a/xorg-server/Xi/xiquerydevice.h
+++ b/xorg-server/Xi/xiquerydevice.h
@@ -37,9 +37,11 @@ int SProcXIQueryDevice(ClientPtr client);
 int ProcXIQueryDevice(ClientPtr client);
 void SRepXIQueryDevice(ClientPtr client, int size, xXIQueryDeviceReply *rep);
 int SizeDeviceClasses(DeviceIntPtr dev);
-int ListDeviceClasses(DeviceIntPtr dev, char* any, uint16_t* nclasses);
+int ListDeviceClasses(ClientPtr client, DeviceIntPtr dev,
+		      char* any, uint16_t* nclasses);
 int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment);
-int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info);
+int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info, Bool reportState);
 int ListKeyInfo(DeviceIntPtr dev, xXIKeyInfo* info);
-int ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber);
+int ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info,
+		     int axisnumber, Bool reportState);
 #endif /* QUERYDEV_H */
diff --git a/xorg-server/aclocal.m4 b/xorg-server/aclocal.m4
index 2dffe3170..ab6c1e847 100644
--- a/xorg-server/aclocal.m4
+++ b/xorg-server/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -87,14 +87,16 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -138,9 +140,9 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -1201,7 +1203,6 @@ m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
-m4_include([m4/shave.m4])
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl
 dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
@@ -1247,7 +1248,7 @@ dnl of the copyright holder.
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
 m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.3.1])
+m4_define([vers_have], [1.3.0])
 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1775,11 +1776,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 # Arrange that distcleancheck ignores ChangeLog left over by distclean.
 #
 AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
-mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
 echo 'git directory not found: installing possibly empty changelog.' >&2)"
 AC_SUBST([CHANGELOG_CMD])
+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
 ]) # XORG_CHANGELOG
 
 dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
diff --git a/xorg-server/compile b/xorg-server/compile
new file mode 100644
index 000000000..1b1d23216
--- /dev/null
+++ b/xorg-server/compile
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/xorg-server/composite/Makefile.in b/xorg-server/composite/Makefile.in
index aa18bdb6c..acc09ef9b 100644
--- a/xorg-server/composite/Makefile.in
+++ b/xorg-server/composite/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -270,7 +267,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -284,7 +280,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -370,6 +363,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -401,7 +395,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c
index 4267a51c7..9bc43b05b 100644
--- a/xorg-server/composite/compwindow.c
+++ b/xorg-server/composite/compwindow.c
@@ -99,7 +99,7 @@ static Bool
 compRepaintBorder (ClientPtr pClient, pointer closure)
 {
     WindowPtr pWindow;
-    int rc = dixLookupWindow(&pWindow, (XID)closure, pClient, DixWriteAccess);
+    int rc = dixLookupWindow(&pWindow, (XID)(intptr_t)closure, pClient, DixWriteAccess);
 
     if (rc == Success) {
 	RegionRec exposed;
@@ -130,7 +130,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data)
     SetBorderSize (pWindow);
     if (HasBorder (pWindow))
 	QueueWorkProc (compRepaintBorder, serverClient,
-		       (pointer) pWindow->drawable.id);
+		       (pointer)(intptr_t) pWindow->drawable.id);
     return WT_WALKCHILDREN;
 }
 
diff --git a/xorg-server/config.guess b/xorg-server/config.guess
index da8331460..e3a2116a7 100644
--- a/xorg-server/config.guess
+++ b/xorg-server/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -656,7 +656,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -822,6 +822,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -882,40 +885,17 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -947,7 +927,7 @@ EOF
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
@@ -1001,14 +981,6 @@ EOF
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1074,7 +1046,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1154,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
diff --git a/xorg-server/config.sub b/xorg-server/config.sub
index a39437d01..eb0389a69 100644
--- a/xorg-server/config.sub
+++ b/xorg-server/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,6 +153,9 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -467,6 +470,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -1260,7 +1267,7 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1613,7 +1620,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/xorg-server/config/Makefile.in b/xorg-server/config/Makefile.in
index 6e4bbc3c2..73ce38585 100644
--- a/xorg-server/config/Makefile.in
+++ b/xorg-server/config/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -277,7 +274,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -291,7 +287,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -377,6 +370,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -408,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/configure b/xorg-server/configure
index 3e56daba7..e07db83d7 100644
--- a/xorg-server/configure
+++ b/xorg-server/configure
@@ -1,20 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xorg-server 1.7.0.902.
+# Generated by GNU Autoconf 2.64 for xorg-server 1.7.99.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +40,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +57,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +89,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +130,301 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-exitcode=0
-if as_func_success; then
-  :
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +511,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -573,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -740,14 +695,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.7.0.902'
-PACKAGE_STRING='xorg-server 1.7.0.902'
+PACKAGE_VERSION='1.7.99.1'
+PACKAGE_STRING='xorg-server 1.7.99.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
 # Factoring default headers for most tests.
@@ -790,27 +745,6 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-Q
-V
-F77
-FC
-CXX
-AM_MAKEFLAGS
-MAKEFLAGS
-shavedir
-CHANGELOG_CMD
-ADMIN_MAN_DIR
-DRIVER_MAN_DIR
-MISC_MAN_DIR
-FILE_MAN_DIR
-LIB_MAN_DIR
-APP_MAN_DIR
-ADMIN_MAN_SUFFIX
-DRIVER_MAN_SUFFIX
-MISC_MAN_SUFFIX
-FILE_MAN_SUFFIX
-LIB_MAN_SUFFIX
-APP_MAN_SUFFIX
 DIX_CFLAGS
 BUILD_TIME
 BUILD_DATE
@@ -821,8 +755,6 @@ BUILD_KDRIVEFBDEVLIB_FALSE
 BUILD_KDRIVEFBDEVLIB_TRUE
 XEPHYR_FALSE
 XEPHYR_TRUE
-XSDLSERVER_FALSE
-XSDLSERVER_TRUE
 KDRIVEFBDEV_FALSE
 KDRIVEFBDEV_TRUE
 KDRIVEVESA_FALSE
@@ -837,8 +769,6 @@ KDRIVE_PURE_LIBS
 KDRIVE_CFLAGS
 KDRIVE_PURE_INCS
 KDRIVE_INCS
-XSDL_INCS
-XSDL_LIBS
 XEPHYR_INCS
 XEPHYR_LIBS
 XEPHYR_CFLAGS
@@ -850,6 +780,9 @@ DMX_BUILD_USB_FALSE
 DMX_BUILD_USB_TRUE
 DMX_BUILD_LNX_FALSE
 DMX_BUILD_LNX_TRUE
+HAVE_DOXYGEN_FALSE
+HAVE_DOXYGEN_TRUE
+DOXYGEN
 X11EXAMPLES_DEP_LIBS
 X11EXAMPLES_DEP_CFLAGS
 XRESEXAMPLES_DEP_LIBS
@@ -976,9 +909,6 @@ XVFB_LIBS
 XVFB_FALSE
 XVFB_TRUE
 LD_EXPORT_SYMBOLS_FLAG
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-CWARNFLAGS
 UTILS_SYS_LIBS
 XSERVER_SYS_LIBS
 XSERVER_LIBS
@@ -1151,6 +1081,23 @@ SPECIAL_DTRACE_OBJECTS_TRUE
 XSERVER_DTRACE_FALSE
 XSERVER_DTRACE_TRUE
 DTRACE
+ADMIN_MAN_DIR
+DRIVER_MAN_DIR
+MISC_MAN_DIR
+FILE_MAN_DIR
+LIB_MAN_DIR
+APP_MAN_DIR
+ADMIN_MAN_SUFFIX
+DRIVER_MAN_SUFFIX
+MISC_MAN_SUFFIX
+FILE_MAN_SUFFIX
+LIB_MAN_SUFFIX
+APP_MAN_SUFFIX
+distcleancheck_listfiles
+CHANGELOG_CMD
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+CWARNFLAGS
 RAWCPPFLAGS
 RAWCPP
 YFLAGS
@@ -1269,6 +1216,7 @@ bindir
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -1288,8 +1236,10 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_largefile
-with_dtrace
+enable_silent_rules
+enable_strict_compilation
 with_release_version
+with_dtrace
 enable_werror
 enable_debug
 enable_unit_tests
@@ -1366,7 +1316,6 @@ enable_standalone_xpbproxy
 enable_xwin
 enable_kdrive
 enable_xephyr
-enable_xsdl
 enable_xfake
 enable_xfbdev
 enable_install_setuid
@@ -1375,8 +1324,7 @@ enable_tcp_transport
 enable_ipv6
 enable_local_transport
 enable_secure_rpc
-enable_silent_rules
-enable_shave
+with_xkb_bin_directory
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1558,8 +1506,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1585,8 +1532,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1790,8 +1736,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1807,8 +1752,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1838,17 +1782,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1865,15 +1809,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1896,8 +1838,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1927,11 +1868,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1970,13 +1909,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2002,7 +1939,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.7.0.902 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.7.99.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2072,7 +2009,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 1.7.0.902:";;
+     short | recursive ) echo "Configuration of xorg-server 1.7.99.1:";;
    esac
   cat <<\_ACEOF
 
@@ -2090,7 +2027,12 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
-  --enable-werror         Treat warnings as errors (default: disabled)
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-strict-compilation
+                          Enable all warnings from compiler and make them
+                          errors (default: disabled)
+  --enable-werror         Obsolete - use --enable-strict-compilation instead
   --enable-debug          Enable debugging (default: disabled)
   --enable-unit-tests     Enable unit-tests (default: auto)
   --enable-use-sigio-by-default
@@ -2151,16 +2093,17 @@ Optional Features:
   --enable-xwin           Build XWin server (default: auto)
   --enable-kdrive         Build kdrive servers (default: no)
   --enable-xephyr         Build the kdrive Xephyr server (default: auto)
-  --enable-xsdl           Build the kdrive Xsdl server (default: auto)
   --enable-xfake          Build the kdrive 'fake' server (default: auto)
   --enable-xfbdev         Build the kdrive framebuffer device server (default:
                           auto)
   --enable-install-setuid Install Xorg server as owned by root with setuid bit
                           (default: auto)
+  --enable-unix-transport Enable UNIX domain socket transport
+  --enable-tcp-transport  Enable TCP socket transport
+  --enable-ipv6           Enable IPv6 support
+  --enable-local-transport
+                          Enable os-specific local transport
   --enable-secure-rpc     Enable Secure RPC
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --enable-shave          use shave to make the build pretty [default=yes]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2168,10 +2111,10 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-dtrace=PATH      Enable dtrace probes (default: enabled if dtrace
-                          found)
   --with-release-version=STRING
                           Use release version string in package name
+  --with-dtrace=PATH      Enable dtrace probes (default: enabled if dtrace
+                          found)
   --with-int10=BACKEND    int10 backend: vm86, x86emu or stub
   --with-vendor-name=VENDOR
                           Vendor string reported by the server
@@ -2221,6 +2164,8 @@ Optional Packages:
                           org.x)
   --with-dri-driver-path=PATH
                           Path to DRI drivers (default: ${libdir}/dri)
+  --with-xkb-bin-directory=DIR
+                          Directory containing xkbcomp program
 
 Some influential environment variables:
   CC          C compiler command
@@ -2404,22 +2349,707 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.7.0.902
-generated by GNU Autoconf 2.63
+xorg-server configure 1.7.99.1
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_member
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.7.0.902, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by xorg-server $as_me 1.7.99.1, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
 
@@ -2455,8 +3085,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -2493,9 +3123,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2511,13 +3141,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -2542,13 +3172,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -2620,39 +3250,41 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
@@ -2671,7 +3303,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -2682,7 +3314,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2690,7 +3322,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -2705,11 +3337,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -2719,17 +3351,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2741,43 +3373,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2786,30 +3395,22 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2009-10-19"
+RELEASE_DATE="2009-10-22)"
 
 am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2835,10 +3436,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2846,11 +3447,11 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2887,7 +3488,7 @@ case $as_dir/ in
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -2903,7 +3504,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2914,7 +3515,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -2925,15 +3526,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2955,11 +3552,8 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -2968,13 +3562,10 @@ then
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -3002,7 +3593,7 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -3023,9 +3614,9 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -3036,24 +3627,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3063,9 +3654,9 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -3076,24 +3667,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3102,7 +3693,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3115,10 +3706,10 @@ fi
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3126,7 +3717,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -3138,7 +3729,7 @@ do
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
@@ -3154,7 +3745,7 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -3167,9 +3758,9 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3180,24 +3771,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3205,11 +3796,11 @@ fi
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3227,11 +3818,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -3251,9 +3842,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3269,7 +3858,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.7.0.902'
+ VERSION='1.7.99.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3310,16 +3899,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -3333,11 +3922,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files shave shave-libtool"
-
-
-# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and
-# XORG_CWARNFLAGS
+# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS
 
 
 
@@ -3375,9 +3960,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3388,24 +3973,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3415,9 +4000,9 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3428,24 +4013,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3454,7 +4039,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3468,9 +4053,9 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3481,24 +4066,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3508,9 +4093,9 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3522,18 +4107,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -3552,10 +4137,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3567,9 +4152,9 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3580,24 +4165,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3611,9 +4196,9 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3624,24 +4209,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3654,7 +4239,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3665,73 +4250,55 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
@@ -3748,17 +4315,17 @@ do
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3775,7 +4342,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3794,84 +4361,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+if test -z "$ac_file"; then :
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 fi
-
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
+  { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3886,32 +4444,24 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3923,17 +4473,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3946,31 +4496,23 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3984,37 +4526,16 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -4023,20 +4544,16 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4047,35 +4564,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4086,36 +4579,12 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4126,42 +4595,17 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -4178,18 +4622,14 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -4246,32 +4686,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -4282,17 +4699,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4311,7 +4730,7 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -4339,12 +4758,12 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -4364,9 +4783,9 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4474,7 +4893,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -4498,9 +4917,9 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
 
 depcc="$CCAS"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4606,7 +5025,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
 CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
 
@@ -4621,141 +5040,41 @@ else
 fi
 
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4771,28 +5090,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4815,9 +5130,9 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -4828,24 +5143,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
 $as_echo "$AS" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4855,9 +5170,9 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
@@ -4868,24 +5183,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
 $as_echo "$ac_ct_AS" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4894,7 +5209,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4907,9 +5222,9 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
@@ -4920,24 +5235,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 $as_echo "$DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4947,9 +5262,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
@@ -4960,24 +5275,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 $as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4986,7 +5301,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4999,9 +5314,9 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -5012,24 +5327,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5039,9 +5354,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -5052,24 +5367,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5078,7 +5393,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5112,7 +5427,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -5144,7 +5459,7 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
@@ -5167,9 +5482,9 @@ macro_revision='1.3012'
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -5177,7 +5492,7 @@ else
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
+     { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -5186,7 +5501,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@ -5206,7 +5521,7 @@ case `"$ac_path_SED" --version 2>&1` in
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -5221,19 +5536,17 @@ esac
       $ac_path_SED_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -5251,9 +5564,9 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5264,7 +5577,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -5284,7 +5597,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -5299,26 +5612,24 @@ esac
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5332,7 +5643,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -5352,7 +5663,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5367,12 +5678,10 @@ esac
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5380,14 +5689,14 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -5401,7 +5710,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in fgrep; do
+    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@ -5421,7 +5730,7 @@ case `"$ac_path_FGREP" --version 2>&1` in
     $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
@@ -5436,12 +5745,10 @@ esac
       $ac_path_FGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -5449,7 +5756,7 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
@@ -5475,7 +5782,7 @@ test -z "$GREP" && GREP=grep
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -5484,7 +5791,7 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -5514,13 +5821,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -5551,18 +5858,16 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5575,7 +5880,7 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -5587,9 +5892,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -5636,7 +5941,7 @@ else
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
@@ -5647,9 +5952,9 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -5660,24 +5965,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5691,9 +5996,9 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -5704,24 +6009,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5734,7 +6039,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5754,33 +6059,33 @@ test -z "$NM" && NM=nm
 
 
 
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5764: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6069: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5767: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6072: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5770: output\"" >&5)
+  (eval echo "\"\$as_me:6075: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -5898,10 +6203,10 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -5915,7 +6220,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
@@ -5925,17 +6230,17 @@ xsi_shell=no
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
 $as_echo "$xsi_shell" >&6; }
 
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 $as_echo "$lt_shell_append" >&6; }
 
 
@@ -5970,14 +6275,14 @@ esac
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
@@ -6006,9 +6311,9 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -6019,24 +6324,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6046,9 +6351,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -6059,24 +6364,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6085,7 +6390,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6102,9 +6407,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -6223,7 +6528,7 @@ linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6298,7 +6603,7 @@ tpf*)
 esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
@@ -6318,9 +6623,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -6331,24 +6636,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6358,9 +6663,9 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -6371,24 +6676,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6397,7 +6702,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6423,9 +6728,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -6436,24 +6741,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6463,9 +6768,9 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -6476,24 +6781,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6502,7 +6807,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6522,9 +6827,9 @@ test -z "$STRIP" && STRIP=:
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6535,24 +6840,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6562,9 +6867,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6575,24 +6880,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6601,7 +6906,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6679,9 +6984,9 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6797,18 +7102,18 @@ void nm_test_func(void){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6861,11 +7166,11 @@ _LT_EOF
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -6899,10 +7204,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
@@ -6929,7 +7234,7 @@ fi
 
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -6941,11 +7246,11 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE="32"
@@ -6959,12 +7264,12 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6962 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  echo '#line 7267 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
@@ -6998,11 +7303,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
@@ -7051,9 +7356,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -7062,11 +7367,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7077,38 +7378,13 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
+  lt_cv_cc_needs_belf=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7116,7 +7392,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -7126,11 +7402,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
@@ -7156,9 +7432,9 @@ need_locks="$enable_libtool_lock"
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -7169,24 +7445,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7196,9 +7472,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -7209,24 +7485,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7235,7 +7511,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7248,9 +7524,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -7261,24 +7537,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7288,9 +7564,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -7301,24 +7577,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7327,7 +7603,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7340,9 +7616,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -7353,24 +7629,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7380,9 +7656,9 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -7393,24 +7669,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7419,7 +7695,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7432,9 +7708,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -7445,24 +7721,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7472,9 +7748,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -7485,24 +7761,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7511,7 +7787,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7524,9 +7800,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -7537,24 +7813,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7564,9 +7840,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -7577,24 +7853,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7603,7 +7879,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7639,9 +7915,9 @@ fi
 
 
 
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -7666,22 +7942,18 @@ else
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7692,42 +7964,17 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
+  lt_cv_ld_exported_symbols_list=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
@@ -7769,14 +8016,14 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -7791,11 +8038,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7804,78 +8047,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -7887,7 +8086,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -7898,11 +8097,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7911,87 +8106,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -8001,16 +8149,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8025,48 +8169,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -8076,18 +8195,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -8097,14 +8212,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -8131,118 +8242,34 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8252,62 +8279,13 @@ fi
 done
 
 
-
 for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
@@ -8325,7 +8303,7 @@ done
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -8358,7 +8336,7 @@ fi
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
@@ -8374,7 +8352,7 @@ test -z "$pic_mode" && pic_mode=default
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -8455,9 +8433,9 @@ if test -n "${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -8470,7 +8448,7 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
@@ -8563,9 +8541,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8616,10 +8594,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8629,9 +8607,9 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8682,10 +8660,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8766,9 +8744,9 @@ lt_prog_compiler_no_builtin_flag=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -8784,11 +8762,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8787: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8765: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8791: \$? = $ac_status" >&5
+   echo "$as_me:8769: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8801,7 +8779,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -8821,7 +8799,7 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
@@ -9093,7 +9071,7 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
 $as_echo "$lt_prog_compiler_pic" >&6; }
 
 
@@ -9105,9 +9083,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -9123,11 +9101,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9126: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9104: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9130: \$? = $ac_status" >&5
+   echo "$as_me:9108: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9140,7 +9118,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -9164,9 +9142,9 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -9192,7 +9170,7 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -9207,9 +9185,9 @@ fi
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9228,11 +9206,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9231: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9209: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9235: \$? = $ac_status" >&5
+   echo "$as_me:9213: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9254,7 +9232,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -9262,9 +9240,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9283,11 +9261,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9286: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9290: \$? = $ac_status" >&5
+   echo "$as_me:9268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9309,7 +9287,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -9318,7 +9296,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -9326,10 +9304,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -9342,7 +9320,7 @@ fi
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -9402,6 +9380,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -9584,7 +9565,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9759,6 +9740,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9784,11 +9766,7 @@ _LT_EOF
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9799,27 +9777,7 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -9833,16 +9791,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9855,11 +9806,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9870,27 +9817,7 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -9904,16 +9831,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10125,42 +10045,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat >conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 int foo(void) {}
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -10173,7 +10067,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10416,7 +10310,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     fi
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
@@ -10453,16 +10347,16 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -10476,11 +10370,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
         else
@@ -10491,7 +10385,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
 $as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
@@ -10655,7 +10549,7 @@ esac
 
 
 
-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
@@ -11077,11 +10971,7 @@ linux* | k*bsd*-gnu)
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11092,41 +10982,13 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -11135,13 +10997,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -11153,6 +11012,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11341,7 +11212,7 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -11443,7 +11314,7 @@ fi
 
 
 
-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -11468,7 +11339,7 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
@@ -11513,18 +11384,14 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11542,43 +11409,18 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -11591,106 +11433,18 @@ fi
     ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11708,145 +11462,32 @@ return shl_load ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11864,57 +11505,28 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11932,57 +11544,28 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
+  ac_cv_lib_svld_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12000,43 +11583,18 @@ return dld_link ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
+  ac_cv_lib_dld_dld_link=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -12075,9 +11633,9 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12086,7 +11644,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12089 "configure"
+#line 11647 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12145,11 +11703,11 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -12166,14 +11724,14 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12182,7 +11740,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12185 "configure"
+#line 11743 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12241,11 +11799,11 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -12262,7 +11820,7 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
@@ -12301,12 +11859,12 @@ fi
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
@@ -12315,15 +11873,15 @@ else
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:$LINENO: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
@@ -12341,12 +11899,12 @@ fi
 
 
   # Report which library types will actually be built
-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
@@ -12367,14 +11925,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
@@ -12415,9 +11973,9 @@ CC="$lt_save_CC"
 # Josh Triplett <josh@freedesktop.org>
 # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DOLT_BASH+set}" = set; then
+if test "${ac_cv_path_DOLT_BASH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DOLT_BASH in
@@ -12430,14 +11988,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -12445,15 +12003,15 @@ esac
 fi
 DOLT_BASH=$ac_cv_path_DOLT_BASH
 if test -n "$DOLT_BASH"; then
-  { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5
 $as_echo "$DOLT_BASH" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5
 $as_echo_n "checking if dolt supports this host... " >&6; }
 dolt_supported=yes
 if test x$DOLT_BASH = x; then
@@ -12478,12 +12036,12 @@ i?86-apple-darwin*)
     ;;
 esac
 if test x$dolt_supported = xno ; then
-    { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5
 $as_echo "no, falling back to libtool" >&6; }
     LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
     LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
 else
-    { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5
 $as_echo "yes, replacing libtool" >&6; }
 
     cat <<__DOLTCOMPILE__EOF__ >doltcompile
@@ -12610,11 +12168,11 @@ fi
 
 # end dolt
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -12632,11 +12190,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -12647,9 +12205,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12662,14 +12220,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -12677,10 +12235,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12690,9 +12248,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -12705,14 +12263,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -12720,10 +12278,10 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12732,7 +12290,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -12745,13 +12303,13 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
@@ -12761,9 +12319,9 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then
+if test "${ac_cv_prog_LEX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
@@ -12774,24 +12332,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
 $as_echo "$LEX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12820,20 +12378,20 @@ main (void)
   return ! yylex () + ! yywrap ();
 }
 _ACEOF
-{ (ac_try="$LEX conftest.l"
+{ { ac_try="$LEX conftest.l"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
 $as_echo_n "checking lex output file root... " >&6; }
-if test "${ac_cv_prog_lex_root+set}" = set; then
+if test "${ac_cv_prog_lex_root+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12842,19 +12400,17 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
 $as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:$LINENO: checking lex library" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
 $as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then
+if test "${ac_cv_lib_lex+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12862,55 +12418,29 @@ else
     ac_cv_lib_lex='none needed'
     for ac_lib in '' -lfl -ll; do
       LIBS="$ac_lib $ac_save_LIBS"
-      cat >conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_lex=$ac_lib
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
     done
     LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
 $as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
 $as_echo_n "checking whether yytext is a pointer... " >&6; }
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
@@ -12919,52 +12449,24 @@ else
 ac_cv_prog_lex_yytext_pointer=no
 ac_save_LIBS=$LIBS
 LIBS="$LEXLIB $ac_save_LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 #define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_prog_lex_yytext_pointer=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
 $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define YYTEXT_POINTER 1
-_ACEOF
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
 fi
 rm -f conftest.l $LEX_OUTPUT_ROOT.c
@@ -12974,9 +12476,9 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
+if test "${ac_cv_prog_YACC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -12987,24 +12489,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
 $as_echo "$YACC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -13014,15 +12516,15 @@ done
 test -n "$YACC" || YACC="yacc"
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
+if test "${enable_largefile+set}" = set; then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -13031,11 +12533,7 @@ else
        while :; do
 	 # IRIX 6.2 and later do not support large files by default,
 	 # so use the C compiler's -n32 option if that helps.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13054,60 +12552,14 @@ main ()
   return 0;
 }
 _ACEOF
-	 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+	 if ac_fn_c_try_compile "$LINENO"; then :
   break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
 	 CC="$CC -n32"
-	 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+	 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_largefile_CC=' -n32'; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
 	 break
        done
@@ -13115,23 +12567,19 @@ rm -f core conftest.err conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
 $as_echo "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13150,38 +12598,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_file_offset_bits=no; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -13201,38 +12622,15 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_file_offset_bits=64; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
 $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
@@ -13244,17 +12642,13 @@ _ACEOF
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then
+if test "${ac_cv_sys_large_files+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13273,38 +12667,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_large_files=no; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -13324,38 +12691,15 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_large_files=1; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
 $as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
@@ -13375,9 +12719,9 @@ for ac_prog in cpp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RAWCPP+set}" = set; then
+if test "${ac_cv_path_RAWCPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $RAWCPP in
@@ -13391,14 +12735,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -13406,10 +12750,10 @@ esac
 fi
 RAWCPP=$ac_cv_path_RAWCPP
 if test -n "$RAWCPP"; then
-  { $as_echo "$as_me:$LINENO: result: $RAWCPP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5
 $as_echo "$RAWCPP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -13422,49 +12766,47 @@ test -n "$RAWCPP" || RAWCPP="${CPP}"
 # Check for flag to avoid builtin definitions - assumes unix is predefined,
 # which is not the best choice for supporting other OS'es, but covers most
 # of the ones we need for now.
-{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -undef" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5
 $as_echo_n "checking if $RAWCPP requires -undef... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 Does cpp redefine unix ?
 _ACEOF
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 else
 	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS=-undef
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	# under Cygwin unix is still defined even with -undef
 	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS="-undef -ansi"
-		{ $as_echo "$as_me:$LINENO: result: yes, with -ansi" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5
 $as_echo "yes, with -ansi" >&6; }
 	else
-		{ { $as_echo "$as_me:$LINENO: error: ${RAWCPP} defines unix with or without -undef.  I don't know what to do." >&5
-$as_echo "$as_me: error: ${RAWCPP} defines unix with or without -undef.  I don't know what to do." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "${RAWCPP} defines unix with or without -undef.  I don't know what to do." "$LINENO" 5
 	fi
 fi
 rm -f conftest.$ac_ext
 
-{ $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -traditional" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
 $as_echo_n "checking if $RAWCPP requires -traditional... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 Does cpp preserve   "whitespace"?
 _ACEOF
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 else
 	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ { $as_echo "$as_me:$LINENO: error: ${RAWCPP} does not preserve whitespace with or without -traditional.  I don't know what to do." >&5
-$as_echo "$as_me: error: ${RAWCPP} does not preserve whitespace with or without -traditional.  I don't know what to do." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "${RAWCPP} does not preserve whitespace with or without -traditional.  I don't know what to do." "$LINENO" 5
 	fi
 fi
 rm -f conftest.$ac_ext
@@ -13472,9 +12814,9 @@ rm -f conftest.$ac_ext
 
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $SED in
@@ -13487,14 +12829,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -13502,18 +12844,394 @@ esac
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { $as_echo "$as_me:$LINENO: result: $SED" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
 $as_echo "$SED" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+
+
+
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+    case `$CC -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then :
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
+
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
+
+
+
+
+
+
+# Check whether --enable-strict-compilation was given.
+if test "${enable_strict_compilation+set}" = set; then :
+  enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
+else
+  STRICT_COMPILE=no
+fi
+
+if test "x$STRICT_COMPILE" = "xyes"; then
+	ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then :
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
+
+	ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default"
+if test "x$ac_cv_have_decl___INTEL_COMPILER" = x""yes; then :
+  INTELCC="yes"
+else
+  INTELCC="no"
+fi
+
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+
+
+
+
+# Check whether --with-release-version was given.
+if test "${with_release_version+set}" = set; then :
+  withval=$with_release_version; RELEASE_VERSION="$withval"
+else
+  RELEASE_VERSION=""
+fi
+
+	if test "x$RELEASE_VERSION" != "x"; then
+		PACKAGE="$PACKAGE-$RELEASE_VERSION"
+		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Building with package name set to $PACKAGE" >&5
+$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
+
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+
+distcleancheck_listfiles='find . -type f ! -name ChangeLog -print'
+
+
+
+
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    APP_MAN_SUFFIX=1
+fi
+if test x$APP_MAN_DIR = x    ; then
+    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+fi
+
+if test x$LIB_MAN_SUFFIX = x    ; then
+    LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
+
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+fi
+
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
+fi
+if test x$MISC_MAN_DIR = x    ; then
+    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+fi
+
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
+# easier overrides at build time.
+XSERVER_CFLAGS='$(CWARNFLAGS)'
+
 
 # Check whether --with-dtrace was given.
-if test "${with_dtrace+set}" = set; then
+if test "${with_dtrace+set}" = set; then :
   withval=$with_dtrace; WDTRACE=$withval
 else
   WDTRACE=auto
@@ -13522,9 +13240,9 @@ fi
 if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
 	# Extract the first word of "dtrace", so it can be a program name with args.
 set dummy dtrace; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DTRACE+set}" = set; then
+if test "${ac_cv_path_DTRACE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DTRACE in
@@ -13538,14 +13256,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not_found"
@@ -13554,159 +13272,25 @@ esac
 fi
 DTRACE=$ac_cv_path_DTRACE
 if test -n "$DTRACE"; then
-  { $as_echo "$as_me:$LINENO: result: $DTRACE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5
 $as_echo "$DTRACE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	if test "x$DTRACE" = "xnot_found" ; then
 		if test "x$WDTRACE" = "xyes" ; then
-			{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: dtrace requested but not found
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: dtrace requested but not found
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "dtrace requested but not found
+See \`config.log' for more details." "$LINENO" 5; }
 		fi
 		WDTRACE="no"
 	else
-		if test "${ac_cv_header_sys_sdt_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5
-$as_echo_n "checking for sys/sdt.h... " >&6; }
-if test "${ac_cv_header_sys_sdt_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5
-$as_echo "$ac_cv_header_sys_sdt_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sys/sdt.h usability" >&5
-$as_echo_n "checking sys/sdt.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/sdt.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sys/sdt.h presence" >&5
-$as_echo_n "checking sys/sdt.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/sdt.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sys/sdt.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for sys/sdt.h" >&5
-$as_echo_n "checking for sys/sdt.h... " >&6; }
-if test "${ac_cv_header_sys_sdt_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_sys_sdt_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5
-$as_echo "$ac_cv_header_sys_sdt_h" >&6; }
-
-fi
-if test "x$ac_cv_header_sys_sdt_h" = x""yes; then
+		ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = x""yes; then :
   HAS_SDT_H="yes"
 else
   HAS_SDT_H="no"
@@ -13720,9 +13304,7 @@ fi
 fi
 if test "x$WDTRACE" != "xno" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XSERVER_DTRACE 1
-_ACEOF
+$as_echo "#define XSERVER_DTRACE 1" >>confdefs.h
 
 
 # Solaris/OpenSolaris require dtrace -G to build dtrace probe information into
@@ -13753,24 +13335,15 @@ else
 fi
 
 
-
-
-
-
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -13784,41 +13357,18 @@ return 0;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$as_ac_Header=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
@@ -13829,17 +13379,13 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -13864,70 +13410,39 @@ for ac_lib in '' dir; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
 $as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -13952,70 +13467,39 @@ for ac_lib in '' x; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
 $as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14030,48 +13514,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -14081,18 +13540,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -14102,14 +13557,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -14136,202 +13587,31 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-
-
-
-
-
-
 for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14341,16 +13621,12 @@ fi
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
+if test "${ac_cv_c_const+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14410,57 +13686,29 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
+  ac_cv_c_const=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 $as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
 	       not a universal capable compiler
@@ -14468,46 +13716,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 	     typedef int dummy;
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 	# Check for potential -arch flags.  It is not universal unless
-	# there are some -arch flags.  Note that *ppc* also matches
-	# ppc64.  This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 	     #include <sys/param.h>
@@ -14525,30 +13761,9 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 		#include <sys/param.h>
@@ -14564,49 +13779,18 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -14621,30 +13805,9 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -14659,51 +13822,20 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -14729,24 +13861,7 @@ return use_ascii (foo) == use_ebcdic (foo);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -14758,20 +13873,10 @@ $as_echo "$ac_try_echo") >&5
 		ac_cv_c_bigendian=unknown
 	      fi
 	    fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -14791,45 +13896,18 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+  ac_cv_c_bigendian=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
     fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
@@ -14838,17 +13916,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
      ENDIAN="X_LITTLE_ENDIAN" ;; #(
    universal)
 
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 
@@ -14856,352 +13929,27 @@ $as_echo "$as_me: error: unknown endianness
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
 $as_echo_n "checking size of unsigned long... " >&6; }
-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') if test "$ac_cv_type_unsigned_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  if test "$ac_cv_type_unsigned_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_unsigned_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (unsigned long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (unsigned long))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (unsigned long))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (unsigned long))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_long=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_unsigned_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (unsigned long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_unsigned_long=0
    fi
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
 $as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
 
 
@@ -15213,108 +13961,13 @@ _ACEOF
 
 if test "$ac_cv_sizeof_unsigned_long" = 8; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _XSERVER64 1
-_ACEOF
+$as_echo "#define _XSERVER64 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (pid_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((pid_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 
-	ac_cv_type_pid_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -15332,151 +13985,12 @@ fi
 #	and a fallback to local macros if none of the above are found
 
 # if <byteswap.h> is found, assume it's the correct version
-
 for ac_header in byteswap.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+if test "x$ac_cv_header_byteswap_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_BYTESWAP_H 1
 _ACEOF
 
 fi
@@ -15485,139 +13999,8 @@ done
 
 
 # if <sys/endian.h> is found, have to check which version
-if test "${ac_cv_header_sys_endian_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5
-$as_echo_n "checking for sys/endian.h... " >&6; }
-if test "${ac_cv_header_sys_endian_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5
-$as_echo "$ac_cv_header_sys_endian_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sys/endian.h usability" >&5
-$as_echo_n "checking sys/endian.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/endian.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sys/endian.h presence" >&5
-$as_echo_n "checking sys/endian.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/endian.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sys/endian.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sys/endian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sys/endian.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for sys/endian.h" >&5
-$as_echo_n "checking for sys/endian.h... " >&6; }
-if test "${ac_cv_header_sys_endian_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_sys_endian_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_endian_h" >&5
-$as_echo "$ac_cv_header_sys_endian_h" >&6; }
-
-fi
-if test "x$ac_cv_header_sys_endian_h" = x""yes; then
+ac_fn_c_check_header_mongrel "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_endian_h" = x""yes; then :
   HAVE_SYS_ENDIAN_H="yes"
 else
   HAVE_SYS_ENDIAN_H="no"
@@ -15626,13 +14009,9 @@ fi
 
 
 if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
-	{ $as_echo "$as_me:$LINENO: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5
 $as_echo_n "checking for __swap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -15650,48 +14029,19 @@ b = __swap16(a);
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   SYS_ENDIAN__SWAP='yes'
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	SYS_ENDIAN__SWAP='no'
+  SYS_ENDIAN__SWAP='no'
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN__SWAP" >&5
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN__SWAP" >&5
 $as_echo "$SYS_ENDIAN__SWAP" >&6; }
 
-	{ $as_echo "$as_me:$LINENO: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5
 $as_echo_n "checking for bswap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -15709,39 +14059,14 @@ b = bswap16(a);
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   SYS_ENDIAN_BSWAP='yes'
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	SYS_ENDIAN_BSWAP='no'
+  SYS_ENDIAN_BSWAP='no'
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:$LINENO: result: $SYS_ENDIAN_BSWAP" >&5
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN_BSWAP" >&5
 $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
 
     	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
@@ -15758,9 +14083,7 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
 
 	if test "$USE_SYS_ENDIAN_H" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_SYS_ENDIAN_H 1
-_ACEOF
+$as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15780,106 +14103,18 @@ _ACEOF
 	fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
+ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-  :
-else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15897,237 +14132,36 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   DLOPEN_LIBS="-ldl"
 fi
 
 fi
 
 
-
 for ac_func in vprintf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
-$as_echo_n "checking for _doprnt... " >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+#define HAVE_VPRINTF 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func__doprnt=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func__doprnt=no
-fi
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-$as_echo "$ac_cv_func__doprnt" >&6; }
-if test "x$ac_cv_func__doprnt" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
 fi
 
@@ -16135,120 +14169,14 @@ fi
 done
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_func in geteuid getuid link memmove memset mkstemp strchr strrchr \
 		strtol getopt getopt_long vsnprintf walkcontext backtrace \
 		getisax getzoneid shmctl64 strcasestr ffs
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16258,16 +14186,12 @@ done
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
+if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -16279,59 +14203,28 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
 $as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
+if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -16363,47 +14256,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
 $as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -16413,21 +14279,15 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
+if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -16437,7 +14297,7 @@ wenotbecray
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
@@ -16445,101 +14305,14 @@ fi
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -16551,19 +14324,15 @@ fi
   done
 fi
 
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
+if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -16586,46 +14355,18 @@ main ()
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
 $as_echo "$ac_cv_c_stack_direction" >&6; }
-
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -16633,464 +14374,36 @@ _ACEOF
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for getdtablesize" >&5
-$as_echo_n "checking for getdtablesize... " >&6; }
-if test "${ac_cv_func_getdtablesize+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define getdtablesize to an innocuous variant, in case <limits.h> declares getdtablesize.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getdtablesize innocuous_getdtablesize
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getdtablesize (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getdtablesize
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getdtablesize ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getdtablesize || defined __stub___getdtablesize
-choke me
-#endif
+ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize"
+if test "x$ac_cv_func_getdtablesize" = x""yes; then :
 
-int
-main ()
-{
-return getdtablesize ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_getdtablesize=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAS_GETDTABLESIZE 1" >>confdefs.h
 
-	ac_cv_func_getdtablesize=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getdtablesize" >&5
-$as_echo "$ac_cv_func_getdtablesize" >&6; }
-if test "x$ac_cv_func_getdtablesize" = x""yes; then
+ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs"
+if test "x$ac_cv_func_getifaddrs" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_GETDTABLESIZE 1
-_ACEOF
+$as_echo "#define HAS_GETIFADDRS 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for getifaddrs" >&5
-$as_echo_n "checking for getifaddrs... " >&6; }
-if test "${ac_cv_func_getifaddrs+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define getifaddrs to an innocuous variant, in case <limits.h> declares getifaddrs.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getifaddrs innocuous_getifaddrs
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getifaddrs (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid"
+if test "x$ac_cv_func_getpeereid" = x""yes; then :
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getifaddrs
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getifaddrs ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getifaddrs || defined __stub___getifaddrs
-choke me
-#endif
-
-int
-main ()
-{
-return getifaddrs ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_getifaddrs=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAS_GETPEEREID 1" >>confdefs.h
 
-	ac_cv_func_getifaddrs=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs" >&5
-$as_echo "$ac_cv_func_getifaddrs" >&6; }
-if test "x$ac_cv_func_getifaddrs" = x""yes; then
+ac_fn_c_check_func "$LINENO" "getpeerucred" "ac_cv_func_getpeerucred"
+if test "x$ac_cv_func_getpeerucred" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_GETIFADDRS 1
-_ACEOF
+$as_echo "#define HAS_GETPEERUCRED 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for getpeereid" >&5
-$as_echo_n "checking for getpeereid... " >&6; }
-if test "${ac_cv_func_getpeereid+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define getpeereid to an innocuous variant, in case <limits.h> declares getpeereid.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getpeereid innocuous_getpeereid
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpeereid (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getpeereid
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getpeereid ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getpeereid || defined __stub___getpeereid
-choke me
-#endif
-
-int
-main ()
-{
-return getpeereid ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_getpeereid=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getpeereid=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpeereid" >&5
-$as_echo "$ac_cv_func_getpeereid" >&6; }
-if test "x$ac_cv_func_getpeereid" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAS_GETPEEREID 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for getpeerucred" >&5
-$as_echo_n "checking for getpeerucred... " >&6; }
-if test "${ac_cv_func_getpeerucred+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define getpeerucred to an innocuous variant, in case <limits.h> declares getpeerucred.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getpeerucred innocuous_getpeerucred
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getpeerucred (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getpeerucred
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getpeerucred ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getpeerucred || defined __stub___getpeerucred
-choke me
-#endif
-
-int
-main ()
-{
-return getpeerucred ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_getpeerucred=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getpeerucred=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpeerucred" >&5
-$as_echo "$ac_cv_func_getpeerucred" >&6; }
-if test "x$ac_cv_func_getpeerucred" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAS_GETPEERUCRED 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for strlcat" >&5
-$as_echo_n "checking for strlcat... " >&6; }
-if test "${ac_cv_func_strlcat+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strlcat to an innocuous variant, in case <limits.h> declares strlcat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strlcat innocuous_strlcat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strlcat (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strlcat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strlcat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strlcat || defined __stub___strlcat
-choke me
-#endif
-
-int
-main ()
-{
-return strlcat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_strlcat=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_strlcat=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcat" >&5
-$as_echo "$ac_cv_func_strlcat" >&6; }
-if test "x$ac_cv_func_strlcat" = x""yes; then
+ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = x""yes; then :
   HAVE_STRLCAT=yes
 else
   HAVE_STRLCAT=no
@@ -17104,96 +14417,10 @@ else
   NEED_STRLCAT_FALSE=
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for strlcpy" >&5
-$as_echo_n "checking for strlcpy... " >&6; }
-if test "${ac_cv_func_strlcpy+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strlcpy to an innocuous variant, in case <limits.h> declares strlcpy.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strlcpy innocuous_strlcpy
+ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = x""yes; then :
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strlcpy (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strlcpy
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strlcpy ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strlcpy || defined __stub___strlcpy
-choke me
-#endif
-
-int
-main ()
-{
-return strlcpy ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_strlcpy=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_strlcpy=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strlcpy" >&5
-$as_echo "$ac_cv_func_strlcpy" >&6; }
-if test "x$ac_cv_func_strlcpy" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAS_STRLCPY 1
-_ACEOF
+$as_echo "#define HAS_STRLCPY 1" >>confdefs.h
 
 fi
 
@@ -17207,113 +14434,22 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for mmap" >&5
-$as_echo_n "checking for mmap... " >&6; }
-if test "${ac_cv_func_mmap+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define mmap to an innocuous variant, in case <limits.h> declares mmap.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define mmap innocuous_mmap
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mmap (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = x""yes; then :
 
-#undef mmap
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mmap ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_mmap || defined __stub___mmap
-choke me
-#endif
-
-int
-main ()
-{
-return mmap ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_mmap=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_mmap=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5
-$as_echo "$ac_cv_func_mmap" >&6; }
-if test "x$ac_cv_func_mmap" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAS_MMAP 1
-_ACEOF
+$as_echo "#define HAS_MMAP 1" >>confdefs.h
 
 fi
 
 
-
-{ $as_echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
 $as_echo_n "checking for sqrt in -lm... " >&6; }
-if test "${ac_cv_lib_m_sqrt+set}" = set; then
+if test "${ac_cv_lib_m_sqrt+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17331,43 +14467,18 @@ return sqrt ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_sqrt=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_sqrt=no
+  ac_cv_lib_m_sqrt=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
 $as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = x""yes; then
+if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -17376,18 +14487,14 @@ _ACEOF
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for cbrt in -lm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cbrt in -lm" >&5
 $as_echo_n "checking for cbrt in -lm... " >&6; }
-if test "${ac_cv_lib_m_cbrt+set}" = set; then
+if test "${ac_cv_lib_m_cbrt+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17405,196 +14512,30 @@ return cbrt ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_cbrt=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_cbrt=no
+  ac_cv_lib_m_cbrt=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cbrt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cbrt" >&5
 $as_echo "$ac_cv_lib_m_cbrt" >&6; }
-if test "x$ac_cv_lib_m_cbrt" = x""yes; then
+if test "x$ac_cv_lib_m_cbrt" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CBRT 1
-_ACEOF
+$as_echo "#define HAVE_CBRT 1" >>confdefs.h
 
 fi
 
 
-
-
-
 for ac_header in ndbm.h dbm.h rpcsvc/dbm.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17604,151 +14545,12 @@ fi
 done
 
 
-
-
-
 for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17766,151 +14568,12 @@ else
 fi
 
 
-
 for ac_header in linux/apm_bios.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/apm_bios.h" "ac_cv_header_linux_apm_bios_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_apm_bios_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LINUX_APM_BIOS_H 1
 _ACEOF
  LNXAPM=yes
 fi
@@ -17926,151 +14589,12 @@ else
 fi
 
 
-
 for ac_header in linux/fb.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_fb_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LINUX_FB_H 1
 _ACEOF
  FBDEV=yes
 fi
@@ -18086,151 +14610,12 @@ else
 fi
 
 
-
 for ac_header in asm/mtrr.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "asm/mtrr.h" "ac_cv_header_asm_mtrr_h" "$ac_includes_default"
+if test "x$ac_cv_header_asm_mtrr_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_ASM_MTRR_H 1
 _ACEOF
  ac_cv_asm_mtrr_h=yes
 fi
@@ -18241,151 +14626,12 @@ if test "x$ac_cv_asm_mtrr_h" = xyes; then
 	HAVE_MTRR=yes
 fi
 
-
 for ac_header in sys/memrange.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/memrange.h" "ac_cv_header_sys_memrange_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_memrange_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_MEMRANGE_H 1
 _ACEOF
  ac_cv_memrange_h=yes
 fi
@@ -18398,157 +14644,16 @@ fi
 
 if test "x$HAVE_MTRR" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_MTRR_SUPPORT 1
-_ACEOF
+$as_echo "#define HAS_MTRR_SUPPORT 1" >>confdefs.h
 
 fi
 
-
 for ac_header in machine/mtrr.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "machine/mtrr.h" "ac_cv_header_machine_mtrr_h" "$ac_includes_default"
+if test "x$ac_cv_header_machine_mtrr_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_MACHINE_MTRR_H 1
 _ACEOF
  ac_cv_machine_mtrr_h=yes
 fi
@@ -18557,68 +14662,17 @@ done
 
 if test "x$ac_cv_machine_mtrr_h" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_MTRR_BUILTIN 1
-_ACEOF
+$as_echo "#define HAS_MTRR_BUILTIN 1" >>confdefs.h
 
 fi
 
-
 for ac_header in sys/linker.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/param.h>
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/linker.h" "ac_cv_header_sys_linker_h" "#include <sys/param.h>
+"
+if test "x$ac_cv_header_sys_linker_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_LINKER_H 1
 _ACEOF
  ac_cv_sys_linker_h=yes
 else
@@ -18636,16 +14690,12 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for SYSV IPC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSV IPC" >&5
 $as_echo_n "checking for SYSV IPC... " >&6; }
-if test "${ac_cv_sysv_ipc+set}" = set; then
+if test "${ac_cv_sysv_ipc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -18666,324 +14716,33 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_sysv_ipc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_sysv_ipc=no
+  ac_cv_sysv_ipc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sysv_ipc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sysv_ipc" >&5
 $as_echo "$ac_cv_sysv_ipc" >&6; }
 if test "x$ac_cv_sysv_ipc" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSV_IPC 1
-_ACEOF
+$as_echo "#define HAVE_SYSV_IPC 1" >>confdefs.h
 
 fi
 
 if test -c /dev/xf86 ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_APERTURE_DRV 1
-_ACEOF
+$as_echo "#define HAS_APERTURE_DRV 1" >>confdefs.h
 
 fi
 
-if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5
-$as_echo_n "checking for machine/apmvar.h... " >&6; }
-if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5
-$as_echo "$ac_cv_header_machine_apmvar_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h usability" >&5
-$as_echo_n "checking machine/apmvar.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <machine/apmvar.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
+ac_fn_c_check_header_mongrel "$LINENO" "machine/apmvar.h" "ac_cv_header_machine_apmvar_h" "$ac_includes_default"
+if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking machine/apmvar.h presence" >&5
-$as_echo_n "checking machine/apmvar.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <machine/apmvar.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5
-$as_echo_n "checking for machine/apmvar.h... " >&6; }
-if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_machine_apmvar_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5
-$as_echo "$ac_cv_header_machine_apmvar_h" >&6; }
-
-fi
-if test "x$ac_cv_header_machine_apmvar_h" = x""yes; then
-
-	if test "${ac_cv_header_sys_event_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5
-$as_echo_n "checking for sys/event.h... " >&6; }
-if test "${ac_cv_header_sys_event_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5
-$as_echo "$ac_cv_header_sys_event_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sys/event.h usability" >&5
-$as_echo_n "checking sys/event.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/event.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sys/event.h presence" >&5
-$as_echo_n "checking sys/event.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/event.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sys/event.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sys/event.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sys/event.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sys/event.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sys/event.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sys/event.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: sys/event.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sys/event.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for sys/event.h" >&5
-$as_echo_n "checking for sys/event.h... " >&6; }
-if test "${ac_cv_header_sys_event_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_sys_event_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5
-$as_echo "$ac_cv_header_sys_event_h" >&6; }
-
-fi
-if test "x$ac_cv_header_sys_event_h" = x""yes; then
+	ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_event_h" = x""yes; then :
   ac_cv_BSD_KQUEUE_APM=yes
 else
   ac_cv_BSD_APM=yes
@@ -19011,152 +14770,17 @@ else
 fi
 
 
-if test "${ac_cv_header_execinfo_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5
-$as_echo_n "checking for execinfo.h... " >&6; }
-if test "${ac_cv_header_execinfo_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5
-$as_echo "$ac_cv_header_execinfo_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking execinfo.h usability" >&5
-$as_echo_n "checking execinfo.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <execinfo.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking execinfo.h presence" >&5
-$as_echo_n "checking execinfo.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <execinfo.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: execinfo.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: execinfo.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5
-$as_echo_n "checking for execinfo.h... " >&6; }
-if test "${ac_cv_header_execinfo_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_execinfo_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5
-$as_echo "$ac_cv_header_execinfo_h" >&6; }
-
-fi
-if test "x$ac_cv_header_execinfo_h" = x""yes; then
+ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
 
-    { $as_echo "$as_me:$LINENO: checking for backtrace in -lc" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5
 $as_echo_n "checking for backtrace in -lc... " >&6; }
-if test "${ac_cv_lib_c_backtrace+set}" = set; then
+if test "${ac_cv_lib_c_backtrace+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19174,53 +14798,24 @@ return backtrace ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_backtrace=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_backtrace=no
+  ac_cv_lib_c_backtrace=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_backtrace" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5
 $as_echo "$ac_cv_lib_c_backtrace" >&6; }
-if test "x$ac_cv_lib_c_backtrace" = x""yes; then
+if test "x$ac_cv_lib_c_backtrace" = x""yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BACKTRACE 1
-_ACEOF
+$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXECINFO_H 1
-_ACEOF
+$as_echo "#define HAVE_EXECINFO_H 1" >>confdefs.h
 
 
 fi
@@ -19239,9 +14834,7 @@ case $host_cpu in
 	case $host_os in
 	        *freebsd*)	SYS_LIBS=-lio ;;
 		*netbsd*)
-cat >>confdefs.h <<\_ACEOF
-#define USE_ALPHA_PIO 1
-_ACEOF
+$as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h
  ;;
 	esac
 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
@@ -19252,23 +14845,15 @@ _ACEOF
   i*86)
 	I386_VIDEO=yes
 	case $host_os in
-		*freebsd*)	cat >>confdefs.h <<\_ACEOF
-#define USE_DEV_IO 1
-_ACEOF
+		*freebsd*)	$as_echo "#define USE_DEV_IO 1" >>confdefs.h
  ;;
-		*dragonfly*)	cat >>confdefs.h <<\_ACEOF
-#define USE_DEV_IO 1
-_ACEOF
+		*dragonfly*)	$as_echo "#define USE_DEV_IO 1" >>confdefs.h
  ;;
-		*netbsd*)	cat >>confdefs.h <<\_ACEOF
-#define USE_I386_IOPL 1
-_ACEOF
+		*netbsd*)	$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
 
 				SYS_LIBS=-li386
 				;;
-		*openbsd*)	cat >>confdefs.h <<\_ACEOF
-#define USE_I386_IOPL 1
-_ACEOF
+		*openbsd*)	$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
 
 				SYS_LIBS=-li386
 				;;
@@ -19289,26 +14874,18 @@ _ACEOF
 	I386_VIDEO=yes
 	case $host_os in
 		*freebsd*)
-cat >>confdefs.h <<\_ACEOF
-#define USE_DEV_IO 1
-_ACEOF
+$as_echo "#define USE_DEV_IO 1" >>confdefs.h
  ;;
 		*dragonfly*)
-cat >>confdefs.h <<\_ACEOF
-#define USE_DEV_IO 1
-_ACEOF
+$as_echo "#define USE_DEV_IO 1" >>confdefs.h
  ;;
 		*netbsd*)
-cat >>confdefs.h <<\_ACEOF
-#define USE_I386_IOPL 1
-_ACEOF
+$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
 
 				SYS_LIBS=-lx86_64
 				;;
 		*openbsd*)
-cat >>confdefs.h <<\_ACEOF
-#define USE_AMD64_IOPL 1
-_ACEOF
+$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h
 
 				SYS_LIBS=-lamd64
 				;;
@@ -19372,66 +14949,44 @@ case $host_os in
 	case $host_os in
 		kfreebsd*-gnu) ;;
 		*)
-cat >>confdefs.h <<\_ACEOF
-#define CSRG_BASED 1
-_ACEOF
+$as_echo "#define CSRG_BASED 1" >>confdefs.h
  ;;
 	esac
 
-cat >>confdefs.h <<\_ACEOF
-#define PCCONS_SUPPORT 1
-_ACEOF
+$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PCVT_SUPPORT 1
-_ACEOF
+$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define SYSCONS_SUPPORT 1
-_ACEOF
+$as_echo "#define SYSCONS_SUPPORT 1" >>confdefs.h
 
 	DRI=yes
 	;;
   *netbsd*)
 
-cat >>confdefs.h <<\_ACEOF
-#define CSRG_BASED 1
-_ACEOF
+$as_echo "#define CSRG_BASED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PCCONS_SUPPORT 1
-_ACEOF
+$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PCVT_SUPPORT 1
-_ACEOF
+$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define WSCONS_SUPPORT 1
-_ACEOF
+$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h
 
 	DRI=yes
 	;;
   *openbsd*)
 
-cat >>confdefs.h <<\_ACEOF
-#define CSRG_BASED 1
-_ACEOF
+$as_echo "#define CSRG_BASED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PCVT_SUPPORT 1
-_ACEOF
+$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define WSCONS_SUPPORT 1
-_ACEOF
+$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h
 
 	;;
   *linux*)
@@ -19439,11 +14994,11 @@ _ACEOF
 	;;
   *solaris*)
 	if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   DRI=yes
 else
   DRI=no
@@ -19454,52 +15009,11 @@ fi
 	;;
   darwin*)
 
-cat >>confdefs.h <<\_ACEOF
-#define CSRG_BASED 1
-_ACEOF
+$as_echo "#define CSRG_BASED 1" >>confdefs.h
 
 	;;
 esac
 
-
-
-# Check whether --with-release-version was given.
-if test "${with_release_version+set}" = set; then
-  withval=$with_release_version; RELEASE_VERSION="$withval"
-else
-  RELEASE_VERSION=""
-fi
-
-	if test "x$RELEASE_VERSION" != "x"; then
-		PACKAGE="$PACKAGE-$RELEASE_VERSION"
-		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
-		{ $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
-$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
-_ACEOF
-
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
-	if test "x$PVM" = "x"; then
-		PVM="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
-_ACEOF
-
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
-	if test "x$PVP" = "x"; then
-		PVP="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
-_ACEOF
-
-
 PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
 PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`
 if test "x$PVS" = "x"; then
@@ -19516,34 +15030,33 @@ VENDOR_WEB="http://wiki.x.org"
 
 
 # Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then
-  enableval=$enable_werror; WERROR=$enableval
-else
-  WERROR=no
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; as_fn_error "--enable-werror has been replaced by --enable-strict-compilation" "$LINENO" 5
 fi
 
+
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; DEBUGGING=$enableval
 else
   DEBUGGING=no
 fi
 
 # Check whether --enable-unit-tests was given.
-if test "${enable_unit_tests+set}" = set; then
+if test "${enable_unit_tests+set}" = set; then :
   enableval=$enable_unit_tests; UNITTESTS=$enableval
 else
   UNITTESTS=auto
 fi
 
 # Check whether --enable-sigio-default was given.
-if test "${enable_sigio_default+set}" = set; then
+if test "${enable_sigio_default+set}" = set; then :
   enableval=$enable_sigio_default; USE_SIGIO_BY_DEFAULT=$enableval
 fi
 
 
 # Check whether --with-int10 was given.
-if test "${with_int10+set}" = set; then
+if test "${with_int10+set}" = set; then :
   withval=$with_int10; INT10="$withval"
 else
   INT10="$DEFAULT_INT10"
@@ -19551,25 +15064,25 @@ fi
 
 
 # Check whether --with-vendor-name was given.
-if test "${with_vendor_name+set}" = set; then
+if test "${with_vendor_name+set}" = set; then :
   withval=$with_vendor_name;  VENDOR_NAME="$withval"
 fi
 
 
 # Check whether --with-vendor-name-short was given.
-if test "${with_vendor_name_short+set}" = set; then
+if test "${with_vendor_name_short+set}" = set; then :
   withval=$with_vendor_name_short;  VENDOR_NAME_SHORT="$withval"
 fi
 
 
 # Check whether --with-vendor-web was given.
-if test "${with_vendor_web+set}" = set; then
+if test "${with_vendor_web+set}" = set; then :
   withval=$with_vendor_web;  VENDOR_WEB="$withval"
 fi
 
 
 # Check whether --with-module-dir was given.
-if test "${with_module_dir+set}" = set; then
+if test "${with_module_dir+set}" = set; then :
   withval=$with_module_dir;  moduledir="$withval"
 else
    moduledir="${libdir}/xorg/modules"
@@ -19577,7 +15090,7 @@ fi
 
 
 # Check whether --with-log-dir was given.
-if test "${with_log_dir+set}" = set; then
+if test "${with_log_dir+set}" = set; then :
   withval=$with_log_dir;  logdir="$withval"
 else
    logdir="$localstatedir/log"
@@ -19585,7 +15098,7 @@ fi
 
 
 # Check whether --with-builder-addr was given.
-if test "${with_builder_addr+set}" = set; then
+if test "${with_builder_addr+set}" = set; then :
   withval=$with_builder_addr;  BUILDERADDR="$withval"
 else
    BUILDERADDR="xorg@lists.freedesktop.org"
@@ -19593,7 +15106,7 @@ fi
 
 
 # Check whether --with-os-name was given.
-if test "${with_os_name+set}" = set; then
+if test "${with_os_name+set}" = set; then :
   withval=$with_os_name;  OSNAME="$withval"
 else
    OSNAME=`uname -srm`
@@ -19601,7 +15114,7 @@ fi
 
 
 # Check whether --with-os-vendor was given.
-if test "${with_os_vendor+set}" = set; then
+if test "${with_os_vendor+set}" = set; then :
   withval=$with_os_vendor;  OSVENDOR="$withval"
 else
    OSVENDOR=""
@@ -19609,14 +15122,14 @@ fi
 
 
 # Check whether --with-builderstring was given.
-if test "${with_builderstring+set}" = set; then
+if test "${with_builderstring+set}" = set; then :
   withval=$with_builderstring;  BUILDERSTRING="$withval"
 
 fi
 
 
 # Check whether --with-fontdir was given.
-if test "${with_fontdir+set}" = set; then
+if test "${with_fontdir+set}" = set; then :
   withval=$with_fontdir;  FONTDIR="$withval"
 else
    FONTDIR="${libdir}/X11/fonts"
@@ -19628,7 +15141,7 @@ case $host_os in
 esac
 
 # Check whether --with-default-font-path was given.
-if test "${with_default_font_path+set}" = set; then
+if test "${with_default_font_path+set}" = set; then :
   withval=$with_default_font_path;  FONTPATH="$withval"
 else
    FONTPATH="${DEFAULT_FONT_PATH}"
@@ -19637,7 +15150,7 @@ fi
 
 
 # Check whether --with-xkb-path was given.
-if test "${with_xkb_path+set}" = set; then
+if test "${with_xkb_path+set}" = set; then :
   withval=$with_xkb_path;  XKBPATH="$withval"
 else
    XKBPATH="${datadir}/X11/xkb"
@@ -19645,7 +15158,7 @@ fi
 
 
 # Check whether --with-xkb-output was given.
-if test "${with_xkb_output+set}" = set; then
+if test "${with_xkb_output+set}" = set; then :
   withval=$with_xkb_output;  XKBOUTPUT="$withval"
 else
    XKBOUTPUT="compiled"
@@ -19653,7 +15166,7 @@ fi
 
 
 # Check whether --with-default-xkb-rules was given.
-if test "${with_default_xkb_rules+set}" = set; then
+if test "${with_default_xkb_rules+set}" = set; then :
   withval=$with_default_xkb_rules;  XKB_DFLT_RULES="$withval"
 else
    XKB_DFLT_RULES=""
@@ -19661,7 +15174,7 @@ fi
 
 
 # Check whether --with-default-xkb-model was given.
-if test "${with_default_xkb_model+set}" = set; then
+if test "${with_default_xkb_model+set}" = set; then :
   withval=$with_default_xkb_model;  XKB_DFLT_MODEL="$withval"
 else
    XKB_DFLT_MODEL="pc104"
@@ -19669,7 +15182,7 @@ fi
 
 
 # Check whether --with-default-xkb-layout was given.
-if test "${with_default_xkb_layout+set}" = set; then
+if test "${with_default_xkb_layout+set}" = set; then :
   withval=$with_default_xkb_layout;  XKB_DFLT_LAYOUT="$withval"
 else
    XKB_DFLT_LAYOUT="us"
@@ -19677,7 +15190,7 @@ fi
 
 
 # Check whether --with-default-xkb-variant was given.
-if test "${with_default_xkb_variant+set}" = set; then
+if test "${with_default_xkb_variant+set}" = set; then :
   withval=$with_default_xkb_variant;  XKB_DFLT_VARIANT="$withval"
 else
    XKB_DFLT_VARIANT=""
@@ -19685,7 +15198,7 @@ fi
 
 
 # Check whether --with-default-xkb-options was given.
-if test "${with_default_xkb_options+set}" = set; then
+if test "${with_default_xkb_options+set}" = set; then :
   withval=$with_default_xkb_options;  XKB_DFLT_OPTIONS="$withval"
 else
    XKB_DFLT_OPTIONS=""
@@ -19693,7 +15206,7 @@ fi
 
 
 # Check whether --with-serverconfig-path was given.
-if test "${with_serverconfig_path+set}" = set; then
+if test "${with_serverconfig_path+set}" = set; then :
   withval=$with_serverconfig_path;  SERVERCONFIG="$withval"
 else
    SERVERCONFIG="${libdir}/xorg"
@@ -19701,7 +15214,7 @@ fi
 
 
 # Check whether --with-apple-applications-dir was given.
-if test "${with_apple_applications_dir+set}" = set; then
+if test "${with_apple_applications_dir+set}" = set; then :
   withval=$with_apple_applications_dir;  APPLE_APPLICATIONS_DIR="${withval}"
 else
    APPLE_APPLICATIONS_DIR="/Applications/Utilities"
@@ -19710,7 +15223,7 @@ fi
 
 
 # Check whether --with-apple-application-name was given.
-if test "${with_apple_application_name+set}" = set; then
+if test "${with_apple_application_name+set}" = set; then :
   withval=$with_apple_application_name;  APPLE_APPLICATION_NAME="${withval}"
 else
    APPLE_APPLICATION_NAME="X11"
@@ -19719,7 +15232,7 @@ fi
 
 
 # Check whether --with-launchd-id-prefix was given.
-if test "${with_launchd_id_prefix+set}" = set; then
+if test "${with_launchd_id_prefix+set}" = set; then :
   withval=$with_launchd_id_prefix;  LAUNCHD_ID_PREFIX="${withval}"
 else
    LAUNCHD_ID_PREFIX="org.x"
@@ -19732,7 +15245,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 # Check whether --enable-sparkle was given.
-if test "${enable_sparkle+set}" = set; then
+if test "${enable_sparkle+set}" = set; then :
   enableval=$enable_sparkle;  XQUARTZ_SPARKLE="${enableval}"
 else
    XQUARTZ_SPARKLE="no"
@@ -19740,28 +15253,28 @@ fi
 
 
 # Check whether --enable-builddocs was given.
-if test "${enable_builddocs+set}" = set; then
+if test "${enable_builddocs+set}" = set; then :
   enableval=$enable_builddocs; BUILDDOCS=$enableval
 else
   BUILDDOCS=no
 fi
 
 # Check whether --enable-install-libxf86config was given.
-if test "${enable_install_libxf86config+set}" = set; then
+if test "${enable_install_libxf86config+set}" = set; then :
   enableval=$enable_install_libxf86config; INSTALL_LIBXF86CONFIG=$enableval
 else
   INSTALL_LIBXF86CONFIG=no
 fi
 
 # Check whether --enable-null-root-cursor was given.
-if test "${enable_null_root_cursor+set}" = set; then
+if test "${enable_null_root_cursor+set}" = set; then :
   enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval
 else
   NULL_ROOT_CURSOR=no
 fi
 
 # Check whether --enable-visibility was given.
-if test "${enable_visibility+set}" = set; then
+if test "${enable_visibility+set}" = set; then :
   enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval
 else
   SYMBOL_VISIBILITY=auto
@@ -19770,21 +15283,21 @@ fi
 
 
 # Check whether --with-dri-driver-path was given.
-if test "${with_dri_driver_path+set}" = set; then
+if test "${with_dri_driver_path+set}" = set; then :
   withval=$with_dri_driver_path;  DRI_DRIVER_PATH="$withval"
 else
    DRI_DRIVER_PATH="${libdir}/dri"
 fi
 
 # Check whether --enable-aiglx was given.
-if test "${enable_aiglx+set}" = set; then
+if test "${enable_aiglx+set}" = set; then :
   enableval=$enable_aiglx; AIGLX=$enableval
 else
   AIGLX=yes
 fi
 
 # Check whether --enable-glx-tls was given.
-if test "${enable_glx_tls+set}" = set; then
+if test "${enable_glx_tls+set}" = set; then :
   enableval=$enable_glx_tls; GLX_USE_TLS=$enableval
 else
   GLX_USE_TLS=no
@@ -19792,222 +15305,222 @@ fi
 
 
 # Check whether --enable-registry was given.
-if test "${enable_registry+set}" = set; then
+if test "${enable_registry+set}" = set; then :
   enableval=$enable_registry; XREGISTRY=$enableval
 else
   XREGISTRY=yes
 fi
 
 # Check whether --enable-composite was given.
-if test "${enable_composite+set}" = set; then
+if test "${enable_composite+set}" = set; then :
   enableval=$enable_composite; COMPOSITE=$enableval
 else
   COMPOSITE=yes
 fi
 
 # Check whether --enable-mitshm was given.
-if test "${enable_mitshm+set}" = set; then
+if test "${enable_mitshm+set}" = set; then :
   enableval=$enable_mitshm; MITSHM=$enableval
 else
   MITSHM=yes
 fi
 
 # Check whether --enable-xres was given.
-if test "${enable_xres+set}" = set; then
+if test "${enable_xres+set}" = set; then :
   enableval=$enable_xres; RES=$enableval
 else
   RES=yes
 fi
 
 # Check whether --enable-record was given.
-if test "${enable_record+set}" = set; then
+if test "${enable_record+set}" = set; then :
   enableval=$enable_record; RECORD=$enableval
 else
   RECORD=no
 fi
 
 # Check whether --enable-xv was given.
-if test "${enable_xv+set}" = set; then
+if test "${enable_xv+set}" = set; then :
   enableval=$enable_xv; XV=$enableval
 else
   XV=yes
 fi
 
 # Check whether --enable-xvmc was given.
-if test "${enable_xvmc+set}" = set; then
+if test "${enable_xvmc+set}" = set; then :
   enableval=$enable_xvmc; XVMC=$enableval
 else
   XVMC=yes
 fi
 
 # Check whether --enable-dga was given.
-if test "${enable_dga+set}" = set; then
+if test "${enable_dga+set}" = set; then :
   enableval=$enable_dga; DGA=$enableval
 else
   DGA=auto
 fi
 
 # Check whether --enable-screensaver was given.
-if test "${enable_screensaver+set}" = set; then
+if test "${enable_screensaver+set}" = set; then :
   enableval=$enable_screensaver; SCREENSAVER=$enableval
 else
   SCREENSAVER=yes
 fi
 
 # Check whether --enable-xdmcp was given.
-if test "${enable_xdmcp+set}" = set; then
+if test "${enable_xdmcp+set}" = set; then :
   enableval=$enable_xdmcp; XDMCP=$enableval
 else
   XDMCP=auto
 fi
 
 # Check whether --enable-xdm-auth-1 was given.
-if test "${enable_xdm_auth_1+set}" = set; then
+if test "${enable_xdm_auth_1+set}" = set; then :
   enableval=$enable_xdm_auth_1; XDMAUTH=$enableval
 else
   XDMAUTH=auto
 fi
 
 # Check whether --enable-glx was given.
-if test "${enable_glx+set}" = set; then
+if test "${enable_glx+set}" = set; then :
   enableval=$enable_glx; GLX=$enableval
 else
   GLX=yes
 fi
 
 # Check whether --enable-dri was given.
-if test "${enable_dri+set}" = set; then
+if test "${enable_dri+set}" = set; then :
   enableval=$enable_dri; DRI=$enableval
 fi
 
 # Check whether --enable-dri2 was given.
-if test "${enable_dri2+set}" = set; then
+if test "${enable_dri2+set}" = set; then :
   enableval=$enable_dri2; DRI2=$enableval
 else
   DRI2=auto
 fi
 
 # Check whether --enable-xinerama was given.
-if test "${enable_xinerama+set}" = set; then
+if test "${enable_xinerama+set}" = set; then :
   enableval=$enable_xinerama; XINERAMA=$enableval
 else
   XINERAMA=yes
 fi
 
 # Check whether --enable-xf86vidmode was given.
-if test "${enable_xf86vidmode+set}" = set; then
+if test "${enable_xf86vidmode+set}" = set; then :
   enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval
 else
   XF86VIDMODE=auto
 fi
 
 # Check whether --enable-xace was given.
-if test "${enable_xace+set}" = set; then
+if test "${enable_xace+set}" = set; then :
   enableval=$enable_xace; XACE=$enableval
 else
   XACE=yes
 fi
 
 # Check whether --enable-xselinux was given.
-if test "${enable_xselinux+set}" = set; then
+if test "${enable_xselinux+set}" = set; then :
   enableval=$enable_xselinux; XSELINUX=$enableval
 else
   XSELINUX=no
 fi
 
 # Check whether --enable-xcsecurity was given.
-if test "${enable_xcsecurity+set}" = set; then
+if test "${enable_xcsecurity+set}" = set; then :
   enableval=$enable_xcsecurity; XCSECURITY=$enableval
 else
   XCSECURITY=no
 fi
 
 # Check whether --enable-xcalibrate was given.
-if test "${enable_xcalibrate+set}" = set; then
+if test "${enable_xcalibrate+set}" = set; then :
   enableval=$enable_xcalibrate; XCALIBRATE=$enableval
 else
   XCALIBRATE=no
 fi
 
 # Check whether --enable-tslib was given.
-if test "${enable_tslib+set}" = set; then
+if test "${enable_tslib+set}" = set; then :
   enableval=$enable_tslib; TSLIB=$enableval
 else
   TSLIB=no
 fi
 
 # Check whether --enable-multibuffer was given.
-if test "${enable_multibuffer+set}" = set; then
+if test "${enable_multibuffer+set}" = set; then :
   enableval=$enable_multibuffer; MULTIBUFFER=$enableval
 else
   MULTIBUFFER=no
 fi
 
 # Check whether --enable-dbe was given.
-if test "${enable_dbe+set}" = set; then
+if test "${enable_dbe+set}" = set; then :
   enableval=$enable_dbe; DBE=$enableval
 else
   DBE=yes
 fi
 
 # Check whether --enable-xf86bigfont was given.
-if test "${enable_xf86bigfont+set}" = set; then
+if test "${enable_xf86bigfont+set}" = set; then :
   enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval
 else
   XF86BIGFONT=no
 fi
 
 # Check whether --enable-dpms was given.
-if test "${enable_dpms+set}" = set; then
+if test "${enable_dpms+set}" = set; then :
   enableval=$enable_dpms; DPMSExtension=$enableval
 else
   DPMSExtension=yes
 fi
 
 # Check whether --enable-config-dbus was given.
-if test "${enable_config_dbus+set}" = set; then
+if test "${enable_config_dbus+set}" = set; then :
   enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval
 else
   CONFIG_DBUS_API=no
 fi
 
 # Check whether --enable-config-hal was given.
-if test "${enable_config_hal+set}" = set; then
+if test "${enable_config_hal+set}" = set; then :
   enableval=$enable_config_hal; CONFIG_HAL=$enableval
 else
   CONFIG_HAL=auto
 fi
 
 # Check whether --enable-xfree86-utils was given.
-if test "${enable_xfree86_utils+set}" = set; then
+if test "${enable_xfree86_utils+set}" = set; then :
   enableval=$enable_xfree86_utils; XF86UTILS=$enableval
 else
   XF86UTILS=yes
 fi
 
 # Check whether --enable-xaa was given.
-if test "${enable_xaa+set}" = set; then
+if test "${enable_xaa+set}" = set; then :
   enableval=$enable_xaa; XAA=$enableval
 else
   XAA=yes
 fi
 
 # Check whether --enable-vgahw was given.
-if test "${enable_vgahw+set}" = set; then
+if test "${enable_vgahw+set}" = set; then :
   enableval=$enable_vgahw; VGAHW=$enableval
 else
   VGAHW=yes
 fi
 
 # Check whether --enable-vbe was given.
-if test "${enable_vbe+set}" = set; then
+if test "${enable_vbe+set}" = set; then :
   enableval=$enable_vbe; VBE=$enableval
 else
   VBE=yes
 fi
 
 # Check whether --enable-int10-module was given.
-if test "${enable_int10_module+set}" = set; then
+if test "${enable_int10_module+set}" = set; then :
   enableval=$enable_int10_module; INT10MODULE=$enableval
 else
   INT10MODULE=yes
@@ -20015,84 +15528,77 @@ fi
 
 
 # Check whether --enable-xorg was given.
-if test "${enable_xorg+set}" = set; then
+if test "${enable_xorg+set}" = set; then :
   enableval=$enable_xorg; XORG=$enableval
 else
   XORG=auto
 fi
 
 # Check whether --enable-dmx was given.
-if test "${enable_dmx+set}" = set; then
+if test "${enable_dmx+set}" = set; then :
   enableval=$enable_dmx; DMX=$enableval
 else
   DMX=auto
 fi
 
 # Check whether --enable-xvfb was given.
-if test "${enable_xvfb+set}" = set; then
+if test "${enable_xvfb+set}" = set; then :
   enableval=$enable_xvfb; XVFB=$enableval
 else
   XVFB=yes
 fi
 
 # Check whether --enable-xnest was given.
-if test "${enable_xnest+set}" = set; then
+if test "${enable_xnest+set}" = set; then :
   enableval=$enable_xnest; XNEST=$enableval
 else
   XNEST=auto
 fi
 
 # Check whether --enable-xquartz was given.
-if test "${enable_xquartz+set}" = set; then
+if test "${enable_xquartz+set}" = set; then :
   enableval=$enable_xquartz; XQUARTZ=$enableval
 else
   XQUARTZ=auto
 fi
 
 # Check whether --enable-standalone-xpbproxy was given.
-if test "${enable_standalone_xpbproxy+set}" = set; then
+if test "${enable_standalone_xpbproxy+set}" = set; then :
   enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval
 else
   STANDALONE_XPBPROXY=no
 fi
 
 # Check whether --enable-xwin was given.
-if test "${enable_xwin+set}" = set; then
+if test "${enable_xwin+set}" = set; then :
   enableval=$enable_xwin; XWIN=$enableval
 else
   XWIN=auto
 fi
 
 # Check whether --enable-kdrive was given.
-if test "${enable_kdrive+set}" = set; then
+if test "${enable_kdrive+set}" = set; then :
   enableval=$enable_kdrive; KDRIVE=$enableval
 else
   KDRIVE=no
 fi
 
 # Check whether --enable-xephyr was given.
-if test "${enable_xephyr+set}" = set; then
+if test "${enable_xephyr+set}" = set; then :
   enableval=$enable_xephyr; XEPHYR=$enableval
 else
   XEPHYR=auto
 fi
 
-# Check whether --enable-xsdl was given.
-if test "${enable_xsdl+set}" = set; then
-  enableval=$enable_xsdl; XSDL=$enableval
-else
-  XSDL=auto
-fi
-
 # Check whether --enable-xfake was given.
-if test "${enable_xfake+set}" = set; then
+if test "${enable_xfake+set}" = set; then :
   enableval=$enable_xfake; XFAKE=$enableval
 else
   XFAKE=auto
 fi
 
 # Check whether --enable-xfbdev was given.
-if test "${enable_xfbdev+set}" = set; then
+if test "${enable_xfbdev+set}" = set; then :
   enableval=$enable_xfbdev; XFBDEV=$enableval
 else
   XFBDEV=auto
@@ -20101,13 +15607,13 @@ fi
 
 
 # Check whether --enable-install-setuid was given.
-if test "${enable_install_setuid+set}" = set; then
+if test "${enable_install_setuid+set}" = set; then :
   enableval=$enable_install_setuid; SETUID=$enableval
 else
   SETUID=auto
 fi
 
-{ $as_echo "$as_me:$LINENO: checking to see if we can install the Xorg server as root" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if we can install the Xorg server as root" >&5
 $as_echo_n "checking to see if we can install the Xorg server as root... " >&6; }
 if test "x$SETUID" = "xauto" ; then
 	case $host_os in
@@ -20124,7 +15630,7 @@ if test "x$SETUID" = "xauto" ; then
 		rm -f testfile
 	fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $SETUID" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETUID" >&5
 $as_echo "$SETUID" >&6; }
  if test "x$SETUID" = "xyes"; then
   INSTALL_SETUID_TRUE=
@@ -20138,6 +15644,39 @@ fi
 
 
 # Transport selection macro from xtrans.m4
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+
+int
+main ()
+{
+return *(signal (0, 0)) (0) == 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_type_signal=int
+else
+  ac_cv_type_signal=void
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
 
 
 
@@ -20146,53 +15685,45 @@ fi
 	*)	unixdef="yes"  ;;
  esac
  # Check whether --enable-unix-transport was given.
-if test "${enable_unix_transport+set}" = set; then
+if test "${enable_unix_transport+set}" = set; then :
   enableval=$enable_unix_transport; UNIXCONN=$enableval
 else
   UNIXCONN=$unixdef
 fi
 
- { $as_echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5
 $as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; }
  if test "$UNIXCONN" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define UNIXCONN 1
-_ACEOF
+$as_echo "#define UNIXCONN 1" >>confdefs.h
 
  fi
- { $as_echo "$as_me:$LINENO: result: $UNIXCONN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5
 $as_echo "$UNIXCONN" >&6; }
  # Check whether --enable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
+if test "${enable_tcp_transport+set}" = set; then :
   enableval=$enable_tcp_transport; TCPCONN=$enableval
 else
   TCPCONN=yes
 fi
 
- { $as_echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5
 $as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $TCPCONN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5
 $as_echo "$TCPCONN" >&6; }
  if test "$TCPCONN" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCPCONN 1
-_ACEOF
+$as_echo "#define TCPCONN 1" >>confdefs.h
 
 
  # SVR4 hides these in libraries other than libc
- { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
 $as_echo_n "checking for library containing socket... " >&6; }
-if test "${ac_cv_search_socket+set}" = set; then
+if test "${ac_cv_search_socket+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20217,69 +15748,38 @@ for ac_lib in '' socket; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_socket=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_socket+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_socket+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_socket+set}" = set; then
-  :
+if test "${ac_cv_search_socket+set}" = set; then :
+
 else
   ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
 $as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
- { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
 $as_echo_n "checking for library containing gethostbyname... " >&6; }
-if test "${ac_cv_search_gethostbyname+set}" = set; then
+if test "${ac_cv_search_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20304,71 +15804,39 @@ for ac_lib in '' nsl; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gethostbyname=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_gethostbyname+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_gethostbyname+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_gethostbyname+set}" = set; then
-  :
+if test "${ac_cv_search_gethostbyname+set}" = set; then :
+
 else
   ac_cv_search_gethostbyname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
 $as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-
-{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
 $as_echo_n "checking for main in -lws2_32... " >&6; }
-if test "${ac_cv_lib_ws2_32_main+set}" = set; then
+if test "${ac_cv_lib_ws2_32_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lws2_32  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -20380,43 +15848,18 @@ return main ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ws2_32_main=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ws2_32_main=no
+  ac_cv_lib_ws2_32_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
 $as_echo "$ac_cv_lib_ws2_32_main" >&6; }
-if test "x$ac_cv_lib_ws2_32_main" = x""yes; then
+if test "x$ac_cv_lib_ws2_32_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBWS2_32 1
 _ACEOF
@@ -20429,95 +15872,11 @@ ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
 
  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
  # Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then
+if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6; IPV6CONN=$enableval
 else
-  { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-$as_echo_n "checking for getaddrinfo... " >&6; }
-if test "${ac_cv_func_getaddrinfo+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getaddrinfo innocuous_getaddrinfo
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getaddrinfo (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getaddrinfo
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getaddrinfo || defined __stub___getaddrinfo
-choke me
-#endif
-
-int
-main ()
-{
-return getaddrinfo ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_getaddrinfo=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getaddrinfo=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-$as_echo "$ac_cv_func_getaddrinfo" >&6; }
-if test "x$ac_cv_func_getaddrinfo" = x""yes; then
+  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+if test "x$ac_cv_func_getaddrinfo" = x""yes; then :
   IPV6CONN=yes
 else
   IPV6CONN=no
@@ -20525,235 +15884,36 @@ fi
 
 fi
 
- { $as_echo "$as_me:$LINENO: checking if IPv6 support should be built" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5
 $as_echo_n "checking if IPv6 support should be built... " >&6; }
  if test "$IPV6CONN" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define IPv6 1
-_ACEOF
+$as_echo "#define IPv6 1" >>confdefs.h
 
  fi
- { $as_echo "$as_me:$LINENO: result: $IPV6CONN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5
 $as_echo "$IPV6CONN" >&6; }
 
  # 4.3BSD-Reno added a new member to struct sockaddr_in
- { $as_echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5
-$as_echo_n "checking for struct sockaddr_in.sin_len... " >&6; }
-if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-
-int
-main ()
-{
-static struct sockaddr_in ac_aggr;
-if (ac_aggr.sin_len)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_sockaddr_in_sin_len=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+ ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+"
+if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then :
 
-int
-main ()
-{
-static struct sockaddr_in ac_aggr;
-if (sizeof ac_aggr.sin_len)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_sockaddr_in_sin_len=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_sockaddr_in_sin_len=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5
-$as_echo "$ac_cv_member_struct_sockaddr_in_sin_len" >&6; }
-if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define BSD44SOCKETS 1
-_ACEOF
+$as_echo "#define BSD44SOCKETS 1" >>confdefs.h
 
 fi
 
 
  # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
- { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
-$as_echo_n "checking for socklen_t... " >&6; }
-if test "${ac_cv_type_socklen_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_socklen_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 $ac_includes_default
 #include <sys/socket.h>
-
-int
-main ()
-{
-if (sizeof (socklen_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-$ac_includes_default
-#include <sys/socket.h>
-
-int
-main ()
-{
-if (sizeof ((socklen_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_socklen_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-$as_echo "$ac_cv_type_socklen_t" >&6; }
-if test "x$ac_cv_type_socklen_t" = x""yes; then
+"
+if test "x$ac_cv_type_socklen_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SOCKLEN_T 1
@@ -20770,21 +15930,19 @@ fi
 	*)			localdef="no"  ;;
  esac
  # Check whether --enable-local-transport was given.
-if test "${enable_local_transport+set}" = set; then
+if test "${enable_local_transport+set}" = set; then :
   enableval=$enable_local_transport; LOCALCONN=$enableval
 else
   LOCALCONN=$localdef
 fi
 
- { $as_echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5
 $as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $LOCALCONN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5
 $as_echo "$LOCALCONN" >&6; }
  if test "$LOCALCONN" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define LOCALCONN 1
-_ACEOF
+$as_echo "#define LOCALCONN 1" >>confdefs.h
 
  fi
 
@@ -20793,7 +15951,7 @@ _ACEOF
 # Secure RPC detection macro from xtrans.m4
 
  # Check whether --enable-secure-rpc was given.
-if test "${enable_secure_rpc+set}" = set; then
+if test "${enable_secure_rpc+set}" = set; then :
   enableval=$enable_secure_rpc; SECURE_RPC=$enableval
 else
   SECURE_RPC="try"
@@ -20802,101 +15960,12 @@ fi
 
  if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then
 	FOUND_SECURE_RPC="no"
-
-
-for ac_func in authdes_seccreate authdes_create
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_func in authdes_seccreate authdes_create
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -20906,23 +15975,17 @@ done
 
 	if test "x$FOUND_SECURE_RPC" = "xno" ; then
 		if test "x$SECURE_RPC" = "xyes" ; then
-	{ { $as_echo "$as_me:$LINENO: error: Secure RPC requested, but required functions not found" >&5
-$as_echo "$as_me: error: Secure RPC requested, but required functions not found" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Secure RPC requested, but required functions not found" "$LINENO" 5
 		fi
 		SECURE_RPC="no"
 	else
-				{ $as_echo "$as_me:$LINENO: checking for library containing getsecretkey" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getsecretkey" >&5
 $as_echo_n "checking for library containing getsecretkey... " >&6; }
-if test "${ac_cv_search_getsecretkey+set}" = set; then
+if test "${ac_cv_search_getsecretkey+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20947,54 +16010,27 @@ for ac_lib in '' rpcsvc; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_getsecretkey=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_getsecretkey+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_getsecretkey+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_getsecretkey+set}" = set; then
-  :
+if test "${ac_cv_search_getsecretkey+set}" = set; then :
+
 else
   ac_cv_search_getsecretkey=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getsecretkey" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getsecretkey" >&5
 $as_echo "$ac_cv_search_getsecretkey" >&6; }
 ac_res=$ac_cv_search_getsecretkey
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -21002,16 +16038,14 @@ fi
 		SECURE_RPC="yes"
 	fi
  fi
- { $as_echo "$as_me:$LINENO: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5
 $as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; }
  if test "x$SECURE_RPC" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SECURE_RPC 1
-_ACEOF
+$as_echo "#define SECURE_RPC 1" >>confdefs.h
 
  fi
- { $as_echo "$as_me:$LINENO: result: $SECURE_RPC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SECURE_RPC" >&5
 $as_echo "$SECURE_RPC" >&6; }
 
  if test "x$SECURE_RPC" = xyes; then
@@ -21048,150 +16082,12 @@ else
 fi
 
 if test "x$INT10" = xyes; then
-
-
-for ac_header in sys/vm86.h sys/io.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+		for ac_header in sys/vm86.h sys/io.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -21221,28 +16117,24 @@ if test x"$cross_compiling" = x"yes" ; then
   HAVE_DEFS_ENT=no
 else
   as_ac_File=`$as_echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
 $as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-ac_res=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_ac_File
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_File'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
   HAVE_DEFS_ENT=yes
 fi
 
@@ -21250,9 +16142,9 @@ fi
 
 # Extract the first word of "linuxdoc", so it can be a program name with args.
 set dummy linuxdoc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LINUXDOC+set}" = set; then
+if test "${ac_cv_path_LINUXDOC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $LINUXDOC in
@@ -21265,14 +16157,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -21280,19 +16172,19 @@ esac
 fi
 LINUXDOC=$ac_cv_path_LINUXDOC
 if test -n "$LINUXDOC"; then
-  { $as_echo "$as_me:$LINENO: result: $LINUXDOC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUXDOC" >&5
 $as_echo "$LINUXDOC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "ps2pdf", so it can be a program name with args.
 set dummy ps2pdf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PS2PDF+set}" = set; then
+if test "${ac_cv_path_PS2PDF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PS2PDF in
@@ -21305,14 +16197,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -21320,16 +16212,16 @@ esac
 fi
 PS2PDF=$ac_cv_path_PS2PDF
 if test -n "$PS2PDF"; then
-  { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5
 $as_echo "$PS2PDF" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking Whether to build documentation" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build documentation" >&5
 $as_echo_n "checking Whether to build documentation... " >&6; }
 
 if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
@@ -21347,10 +16239,10 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $BUILDDOC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDDOC" >&5
 $as_echo "$BUILDDOC" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build pdf documentation" >&5
 $as_echo_n "checking Whether to build pdf documentation... " >&6; }
 
 if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
@@ -21368,7 +16260,7 @@ else
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDPDFDOC" >&5
 $as_echo "$BUILDPDFDOC" >&6; }
 
 MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
@@ -21396,52 +16288,28 @@ case $host_os in
 		DRI2=no
 
 		if test x$XQUARTZ = xauto; then
-			{ $as_echo "$as_me:$LINENO: checking whether to build Xquartz" >&5
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xquartz" >&5
 $as_echo_n "checking whether to build Xquartz... " >&6; }
-if test "${xorg_cv_Carbon_framework+set}" = set; then
+if test "${xorg_cv_Carbon_framework+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
 		 		save_LDFLAGS=$LDFLAGS
 				LDFLAGS="$LDFLAGS -framework Carbon"
-				cat >conftest.$ac_ext <<_ACEOF
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 char FSFindFolder(); int main() { FSFindFolder(); return 0;}
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   xorg_cv_Carbon_framework=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	xorg_cv_Carbon_framework=no
+  xorg_cv_Carbon_framework=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 			LDFLAGS=$save_LDFLAGS
 fi
-{ $as_echo "$as_me:$LINENO: result: $xorg_cv_Carbon_framework" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_Carbon_framework" >&5
 $as_echo "$xorg_cv_Carbon_framework" >&6; }
 
 			if test "X$xorg_cv_Carbon_framework" = Xyes; then
@@ -21502,40 +16370,44 @@ LIBGLIB="glib-2.0 >= 2.16"
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
 $as_echo_n "checking for DBUS... " >&6; }
 
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DBUS_CFLAGS"; then
+        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DBUS_LIBS"; then
+        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -21548,14 +16420,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 HAVE_DBUS=no
 elif test $pkg_failed = untried; then
@@ -21563,15 +16435,13 @@ elif test $pkg_failed = untried; then
 else
 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_DBUS=yes
 fi
 if test "x$HAVE_DBUS" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DBUS 1
-_ACEOF
+$as_echo "#define HAVE_DBUS 1" >>confdefs.h
 
 fi
  if test "x$HAVE_DBUS" = xyes; then
@@ -21588,15 +16458,11 @@ if test "x$CONFIG_DBUS_API" = xauto; then
 fi
 if test "x$CONFIG_DBUS_API" = xyes; then
 	if ! test "x$HAVE_DBUS" = xyes; then
-		{ { $as_echo "$as_me:$LINENO: error: D-Bus configuration API requested, but D-Bus is not installed." >&5
-$as_echo "$as_me: error: D-Bus configuration API requested, but D-Bus is not installed." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "D-Bus configuration API requested, but D-Bus is not installed." "$LINENO" 5
 	fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_DBUS_API 1
-_ACEOF
+$as_echo "#define CONFIG_DBUS_API 1" >>confdefs.h
 
 	CONFIG_NEED_DBUS="yes"
 fi
@@ -21611,40 +16477,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
 $as_echo_n "checking for HAL... " >&6; }
 
-if test -n "$HAL_CFLAGS"; then
-    pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HAL_CFLAGS"; then
+        pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$HAL_LIBS"; then
-    pkg_cv_HAL_LIBS="$HAL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HAL_LIBS"; then
+        pkg_cv_HAL_LIBS="$HAL_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -21657,14 +16527,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1`
+	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"`
         else
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1`
+	        HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$HAL_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 HAVE_HAL=no
 elif test $pkg_failed = untried; then
@@ -21672,7 +16542,7 @@ elif test $pkg_failed = untried; then
 else
 	HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
 	HAL_LIBS=$pkg_cv_HAL_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_HAL=yes
 fi
@@ -21681,15 +16551,11 @@ if test "x$CONFIG_HAL" = xauto; then
 fi
 if test "x$CONFIG_HAL" = xyes; then
 	if ! test "x$HAVE_HAL" = xyes; then
-		{ { $as_echo "$as_me:$LINENO: error: HAL hotplug API requested, but HAL is not installed." >&5
-$as_echo "$as_me: error: HAL hotplug API requested, but HAL is not installed." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "HAL hotplug API requested, but HAL is not installed." "$LINENO" 5
 	fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_HAL 1
-_ACEOF
+$as_echo "#define CONFIG_HAL 1" >>confdefs.h
 
         REQUIRED_LIBS="$REQUIRED_LIBS hal"
 	CONFIG_NEED_DBUS="yes"
@@ -21706,9 +16572,7 @@ fi
 if test "x$CONFIG_NEED_DBUS" = xyes; then
 	REQUIRED_LIBS="$REQUIRED_LIBS dbus-1"
 
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_NEED_DBUS 1
-_ACEOF
+$as_echo "#define CONFIG_NEED_DBUS 1" >>confdefs.h
 
 fi
  if test "x$CONFIG_NEED_DBUS" = xyes; then
@@ -21732,9 +16596,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ $as_echo "$as_me:$LINENO: checking for glibc..." >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc..." >&5
 $as_echo_n "checking for glibc...... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 #include <features.h>
 #ifndef __GLIBC__
@@ -21742,146 +16607,32 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   glibc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   glibc=no
 fi
-
 rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $glibc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibc" >&5
 $as_echo "$glibc" >&6; }
 
-
 for ac_func in clock_gettime
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
+if test "x$ac_cv_func_clock_gettime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CLOCK_GETTIME 1
 _ACEOF
  have_clock_gettime=yes
 else
-  { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
 $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21899,43 +16650,18 @@ return clock_gettime ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_clock_gettime=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_rt_clock_gettime=no
+  ac_cv_lib_rt_clock_gettime=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
 $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
   have_clock_gettime=-lrt
 else
   have_clock_gettime=no
@@ -21945,7 +16671,7 @@ fi
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking for a useful monotonic clock ..." >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a useful monotonic clock ..." >&5
 $as_echo_n "checking for a useful monotonic clock ...... " >&6; }
 
 if ! test "x$have_clock_gettime" = xno; then
@@ -21963,10 +16689,11 @@ if ! test "x$have_clock_gettime" = xno; then
         CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
     fi
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   MONOTONIC_CLOCK="cross compiling"
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 #include <time.h>
 
@@ -21980,57 +16707,28 @@ int main(int argc, char *argv[]) {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   MONOTONIC_CLOCK=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-MONOTONIC_CLOCK=no
+  MONOTONIC_CLOCK=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-
     LIBS="$LIBS_SAVE"
     CPPFLAGS="$CPPFLAGS_SAVE"
 else
     MONOTONIC_CLOCK=no
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $MONOTONIC_CLOCK" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONOTONIC_CLOCK" >&5
 $as_echo "$MONOTONIC_CLOCK" >&6; }
 
 if test "x$MONOTONIC_CLOCK" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MONOTONIC_CLOCK 1
-_ACEOF
+$as_echo "#define MONOTONIC_CLOCK 1" >>confdefs.h
 
     LIBS="$LIBS $CLOCK_LIBS"
 fi
@@ -22045,14 +16743,10 @@ fi
 
 if test "x$XV" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XV 1
-_ACEOF
+$as_echo "#define XV 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XvExtension 1
-_ACEOF
+$as_echo "#define XvExtension 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO"
 else
@@ -22069,9 +16763,7 @@ fi
 
 if test "x$XVMC" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XvMCExtension 1
-_ACEOF
+$as_echo "#define XvMCExtension 1" >>confdefs.h
 
 fi
 
@@ -22085,9 +16777,7 @@ fi
 
 if test "x$XREGISTRY" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XREGISTRY 1
-_ACEOF
+$as_echo "#define XREGISTRY 1" >>confdefs.h
 
 fi
 
@@ -22101,9 +16791,7 @@ fi
 
 if test "x$COMPOSITE" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define COMPOSITE 1
-_ACEOF
+$as_echo "#define COMPOSITE 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO"
 	COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
@@ -22120,14 +16808,10 @@ fi
 
 if test "x$MITSHM" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MITSHM 1
-_ACEOF
+$as_echo "#define MITSHM 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_SHM 1
-_ACEOF
+$as_echo "#define HAS_SHM 1" >>confdefs.h
 
 fi
 
@@ -22141,9 +16825,7 @@ fi
 
 if test "x$RECORD" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XRECORD 1
-_ACEOF
+$as_echo "#define XRECORD 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO"
 	RECORD_LIB='$(top_builddir)/record/librecord.la'
@@ -22159,9 +16841,7 @@ fi
 
 if test "x$SCREENSAVER" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SCREENSAVER 1
-_ACEOF
+$as_echo "#define SCREENSAVER 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO"
 fi
@@ -22176,9 +16856,7 @@ fi
 
 if test "x$RES" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define RES 1
-_ACEOF
+$as_echo "#define RES 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"
 fi
@@ -22186,40 +16864,44 @@ fi
 if test "x$GLX" = xyes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
 $as_echo_n "checking for XLIB... " >&6; }
 
-if test -n "$XLIB_CFLAGS"; then
-    pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XLIB_CFLAGS"; then
+        pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XLIB_LIBS"; then
-    pkg_cv_XLIB_LIBS="$XLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XLIB_LIBS"; then
+        pkg_cv_XLIB_LIBS="$XLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22232,25 +16914,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
         else
-	        XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XLIB_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11) were not met:
-
-$XLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XLIB_CFLAGS
-and XLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (x11) were not met:
+	as_fn_error "Package requirements (x11) were not met:
 
 $XLIB_PKG_ERRORS
 
@@ -22260,12 +16931,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XLIB_CFLAGS
 and XLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -22274,61 +16944,54 @@ and XLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XLIB_CFLAGS
-and XLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
 	XLIB_LIBS=$pkg_cv_XLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
 $as_echo_n "checking for GL... " >&6; }
 
-if test -n "$GL_CFLAGS"; then
-    pkg_cv_GL_CFLAGS="$GL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GL_CFLAGS"; then
+        pkg_cv_GL_CFLAGS="$GL_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$GL_LIBS"; then
-    pkg_cv_GL_LIBS="$GL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GL_LIBS"; then
+        pkg_cv_GL_LIBS="$GL_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22341,25 +17004,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
         else
-	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GL_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBGL) were not met:
-
-$GL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GL_CFLAGS
-and GL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($GLPROTO $LIBGL) were not met:
+	as_fn_error "Package requirements ($GLPROTO $LIBGL) were not met:
 
 $GL_PKG_ERRORS
 
@@ -22369,22 +17021,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables GL_CFLAGS
 and GL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GL_CFLAGS
-and GL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -22393,20 +17034,17 @@ and GL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GL_CFLAGS=$pkg_cv_GL_CFLAGS
 	GL_LIBS=$pkg_cv_GL_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define GLXEXT 1
-_ACEOF
+$as_echo "#define GLXEXT 1" >>confdefs.h
 
 	GLX_LIBS='$(top_builddir)/glx/libglx.la'
 	GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
@@ -22424,9 +17062,7 @@ fi
 
 if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define AIGLX 1
-_ACEOF
+$as_echo "#define AIGLX 1" >>confdefs.h
 
 else
 	AIGLX=no
@@ -22456,46 +17092,48 @@ fi
 
 if test "x$DRI" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86DRI 1
-_ACEOF
+$as_echo "#define XF86DRI 1" >>confdefs.h
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRIPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRIPROTO" >&5
 $as_echo_n "checking for DRIPROTO... " >&6; }
 
-if test -n "$DRIPROTO_CFLAGS"; then
-    pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRIPROTO_CFLAGS"; then
+        pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRIPROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRIPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DRIPROTO_LIBS"; then
-    pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRIPROTO_LIBS"; then
+        pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRIPROTO_LIBS=`$PKG_CONFIG --libs "$DRIPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22508,14 +17146,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1`
+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"`
         else
-	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1`
+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DRIPROTO_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($DRIPROTO) were not met:
+	as_fn_error "Package requirements ($DRIPROTO) were not met:
 
 $DRIPROTO_PKG_ERRORS
 
@@ -22525,33 +17163,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DRIPROTO_CFLAGS
 and DRIPROTO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($DRIPROTO) were not met:
-
-$DRIPROTO_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DRIPROTO_CFLAGS
-and DRIPROTO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DRIPROTO_CFLAGS
-and DRIPROTO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -22560,51 +17176,54 @@ and DRIPROTO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DRIPROTO_CFLAGS=$pkg_cv_DRIPROTO_CFLAGS
 	DRIPROTO_LIBS=$pkg_cv_DRIPROTO_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRI" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5
 $as_echo_n "checking for DRI... " >&6; }
 
-if test -n "$DRI_CFLAGS"; then
-    pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI_CFLAGS"; then
+        pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRI_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBDRI" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DRI_LIBS"; then
-    pkg_cv_DRI_LIBS="$DRI_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI_LIBS"; then
+        pkg_cv_DRI_LIBS="$DRI_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRI_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBDRI" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22617,14 +17236,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1`
+	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
         else
-	        DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1`
+	        DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DRI_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO $LIBDRI) were not met:
+	as_fn_error "Package requirements ($GLPROTO $LIBDRI) were not met:
 
 $DRI_PKG_ERRORS
 
@@ -22634,33 +17253,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DRI_CFLAGS
 and DRI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($GLPROTO $LIBDRI) were not met:
-
-$DRI_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DRI_CFLAGS
-and DRI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -22669,12 +17266,11 @@ and DRI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DRI_CFLAGS=$pkg_cv_DRI_CFLAGS
 	DRI_LIBS=$pkg_cv_DRI_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -22683,40 +17279,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DRI2PROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI2PROTO" >&5
 $as_echo_n "checking for DRI2PROTO... " >&6; }
 
-if test -n "$DRI2PROTO_CFLAGS"; then
-    pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI2PROTO_CFLAGS"; then
+        pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DRI2PROTO_LIBS"; then
-    pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRI2PROTO_LIBS"; then
+        pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22729,14 +17329,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1`
+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"`
         else
-	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1`
+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DRI2PROTO_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 HAVE_DRI2PROTO=no
 elif test $pkg_failed = untried; then
@@ -22744,21 +17344,17 @@ elif test $pkg_failed = untried; then
 else
 	DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS
 	DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_DRI2PROTO=yes
 fi
 case "$DRI2,$HAVE_DRI2PROTO" in
 	yes,no)
-		{ { $as_echo "$as_me:$LINENO: error: DRI2 requested, but dri2proto not found." >&5
-$as_echo "$as_me: error: DRI2 requested, but dri2proto not found." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "DRI2 requested, but dri2proto not found." "$LINENO" 5
 		;;
 	yes,yes | auto,yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define DRI2 1
-_ACEOF
+$as_echo "#define DRI2 1" >>confdefs.h
 
 		DRI2=yes
 		;;
@@ -22775,40 +17371,44 @@ fi
 if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBDRM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM" >&5
 $as_echo_n "checking for LIBDRM... " >&6; }
 
-if test -n "$LIBDRM_CFLAGS"; then
-    pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBDRM_CFLAGS"; then
+        pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$LIBDRM_LIBS"; then
-    pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBDRM_LIBS"; then
+        pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -22821,25 +17421,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1`
+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"`
         else
-	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1`
+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBDRM_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDRM) were not met:
-
-$LIBDRM_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBDRM_CFLAGS
-and LIBDRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBDRM) were not met:
+	as_fn_error "Package requirements ($LIBDRM) were not met:
 
 $LIBDRM_PKG_ERRORS
 
@@ -22849,22 +17438,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables LIBDRM_CFLAGS
 and LIBDRM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBDRM_CFLAGS
-and LIBDRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -22873,12 +17451,11 @@ and LIBDRM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS
 	LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -22889,11 +17466,7 @@ fi
 if test "x$DRI2" = xyes; then
 	save_CFLAGS=$CFLAGS
 	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
@@ -22901,43 +17474,20 @@ cat >>conftest.$ac_ext <<_ACEOF
 #error DRI2 extension not available.
 #endif
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   HAVE_DRI2EXTENSION=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	HAVE_DRI2EXTENSION=no
+  HAVE_DRI2EXTENSION=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	CFLAGS=$save_CFLAGS
 	if test "x$HAVE_DRI2EXTENSION" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DRI2_AIGLX 1
-_ACEOF
+$as_echo "#define DRI2_AIGLX 1" >>confdefs.h
 
 		DRI2_AIGLX=yes
 	else
-		{ $as_echo "$as_me:$LINENO: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&5
 $as_echo "$as_me: DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h." >&6;}
 		DRI2_AIGLX=no
 	fi
@@ -22962,14 +17512,10 @@ fi
 
 if test "x$XINERAMA" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XINERAMA 1
-_ACEOF
+$as_echo "#define XINERAMA 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PANORAMIX 1
-_ACEOF
+$as_echo "#define PANORAMIX 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO"
 fi
@@ -22984,9 +17530,7 @@ fi
 
 if test "x$XACE" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XACE 1
-_ACEOF
+$as_echo "#define XACE 1" >>confdefs.h
 
 fi
 
@@ -23000,179 +17544,32 @@ fi
 
 if test "x$XSELINUX" = xyes; then
 	if test "x$XACE" != xyes; then
-		{ { $as_echo "$as_me:$LINENO: error: cannot build SELinux extension without X-ACE" >&5
-$as_echo "$as_me: error: cannot build SELinux extension without X-ACE" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "cannot build SELinux extension without X-ACE" "$LINENO" 5
 	fi
-
-
-for ac_header in selinux/selinux.h selinux/avc.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_header in selinux/selinux.h selinux/avc.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: SELinux include files not found" >&5
-$as_echo "$as_me: error: SELinux include files not found" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "SELinux include files not found" "$LINENO" 5
 fi
 
 done
 
-
-{ $as_echo "$as_me:$LINENO: checking for avc_init in -lselinux" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avc_init in -lselinux" >&5
 $as_echo_n "checking for avc_init in -lselinux... " >&6; }
-if test "${ac_cv_lib_selinux_avc_init+set}" = set; then
+if test "${ac_cv_lib_selinux_avc_init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lselinux  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -23190,43 +17587,18 @@ return avc_init ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_selinux_avc_init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_selinux_avc_init=no
+  ac_cv_lib_selinux_avc_init=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_avc_init" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_avc_init" >&5
 $as_echo "$ac_cv_lib_selinux_avc_init" >&6; }
-if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then
+if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSELINUX 1
 _ACEOF
@@ -23234,179 +17606,31 @@ _ACEOF
   LIBS="-lselinux $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: SELinux library not found" >&5
-$as_echo "$as_me: error: SELinux library not found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-for ac_header in libaudit.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  as_fn_error "SELinux library not found" "$LINENO" 5
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_header in libaudit.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default"
+if test "x$ac_cv_header_libaudit_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LIBAUDIT_H 1
 _ACEOF
 
 else
-  { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system headers" >&5
-$as_echo "$as_me: error: SELinux extension requires audit system headers" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "SELinux extension requires audit system headers" "$LINENO" 5
 fi
 
 done
 
-
-{ $as_echo "$as_me:$LINENO: checking for audit_open in -laudit" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5
 $as_echo_n "checking for audit_open in -laudit... " >&6; }
-if test "${ac_cv_lib_audit_audit_open+set}" = set; then
+if test "${ac_cv_lib_audit_audit_open+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-laudit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -23424,43 +17648,18 @@ return audit_open ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_audit_audit_open=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_audit_audit_open=no
+  ac_cv_lib_audit_audit_open=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audit_audit_open" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5
 $as_echo "$ac_cv_lib_audit_audit_open" >&6; }
-if test "x$ac_cv_lib_audit_audit_open" = x""yes; then
+if test "x$ac_cv_lib_audit_audit_open" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAUDIT 1
 _ACEOF
@@ -23468,77 +17667,19 @@ _ACEOF
   LIBS="-laudit $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: SELinux extension requires audit system library" >&5
-$as_echo "$as_me: error: SELinux extension requires audit system library" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "SELinux extension requires audit system library" "$LINENO" 5
 fi
 
-        { $as_echo "$as_me:$LINENO: checking whether avc_netlink_acquire_fd is declared" >&5
-$as_echo_n "checking whether avc_netlink_acquire_fd is declared... " >&6; }
-if test "${ac_cv_have_decl_avc_netlink_acquire_fd+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <selinux/avc.h>
-
-int
-main ()
-{
-#ifndef avc_netlink_acquire_fd
-  (void) avc_netlink_acquire_fd;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_avc_netlink_acquire_fd=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_avc_netlink_acquire_fd=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_avc_netlink_acquire_fd" >&5
-$as_echo "$ac_cv_have_decl_avc_netlink_acquire_fd" >&6; }
-if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then
+        ac_fn_c_check_decl "$LINENO" "avc_netlink_acquire_fd" "ac_cv_have_decl_avc_netlink_acquire_fd" "#include <selinux/avc.h>
+"
+if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AVC_NETLINK_ACQUIRE_FD 1
-_ACEOF
+$as_echo "#define HAVE_AVC_NETLINK_ACQUIRE_FD 1" >>confdefs.h
 
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XSELINUX 1
-_ACEOF
+$as_echo "#define XSELINUX 1" >>confdefs.h
 
 	SELINUX_LIB="-lselinux -laudit"
 fi
@@ -23553,14 +17694,10 @@ fi
 
 if test "x$XCSECURITY" = xyes; then
 	if test "x$XACE" != xyes; then
-		{ { $as_echo "$as_me:$LINENO: error: cannot build Security extension without X-ACE" >&5
-$as_echo "$as_me: error: cannot build Security extension without X-ACE" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "cannot build Security extension without X-ACE" "$LINENO" 5
 	fi
 
-cat >>confdefs.h <<\_ACEOF
-#define XCSECURITY 1
-_ACEOF
+$as_echo "#define XCSECURITY 1" >>confdefs.h
 
 fi
 
@@ -23574,9 +17711,7 @@ fi
 
 if test "x$MULTIBUFFER" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MULTIBUFFER 1
-_ACEOF
+$as_echo "#define MULTIBUFFER 1" >>confdefs.h
 
 	# Requires xextproto which is always required
 fi
@@ -23591,9 +17726,7 @@ fi
 
 if test "x$DBE" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBE 1
-_ACEOF
+$as_echo "#define DBE 1" >>confdefs.h
 
 	DBE_LIB='$(top_builddir)/dbe/libdbe.la'
 fi
@@ -23608,9 +17741,7 @@ fi
 
 if test "x$XF86BIGFONT" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86BIGFONT 1
-_ACEOF
+$as_echo "#define XF86BIGFONT 1" >>confdefs.h
 
 	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"
 fi
@@ -23625,17 +17756,13 @@ fi
 
 if test "x$DPMSExtension" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DPMSExtension 1
-_ACEOF
+$as_echo "#define DPMSExtension 1" >>confdefs.h
 
 fi
 
 if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XCALIBRATE 1
-_ACEOF
+$as_echo "#define XCALIBRATE 1" >>confdefs.h
 
    REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"
 else
@@ -23651,33 +17778,25 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define RENDER 1
-_ACEOF
+$as_echo "#define RENDER 1" >>confdefs.h
 
 RENDER_LIB='$(top_builddir)/render/librender.la'
 RENDER_INC='-I$(top_srcdir)/render'
 
 
-cat >>confdefs.h <<\_ACEOF
-#define RANDR 1
-_ACEOF
+$as_echo "#define RANDR 1" >>confdefs.h
 
 RANDR_LIB='$(top_builddir)/randr/librandr.la'
 RANDR_INC='-I$(top_srcdir)/randr'
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XFIXES 1
-_ACEOF
+$as_echo "#define XFIXES 1" >>confdefs.h
 
 FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'
 FIXES_INC='-I$(top_srcdir)/xfixes'
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DAMAGE 1
-_ACEOF
+$as_echo "#define DAMAGE 1" >>confdefs.h
 
 DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la'
 DAMAGE_INC='-I$(top_srcdir)/damageext'
@@ -23730,9 +17849,7 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define SHAPE 1
-_ACEOF
+$as_echo "#define SHAPE 1" >>confdefs.h
 
 
 
@@ -23753,11 +17870,20 @@ _ACEOF
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+# Check whether --with-xkb-bin-directory was given.
+if test "${with_xkb_bin_directory+set}" = set; then :
+  withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval"
+else
+  XKB_BIN_DIRECTORY="$bindir"
+fi
+
+
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$bindir\""
+  eval ac_define_dir="\"$XKB_BIN_DIRECTORY\""
   eval ac_define_dir="\"$ac_define_dir\""
   XKB_BIN_DIRECTORY="$ac_define_dir"
 
@@ -23771,7 +17897,7 @@ _ACEOF
 
 
 XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-if [ x$XKBOUTPUT_FIRSTCHAR != x/ ] ; then
+if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then
    XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
 fi
 
@@ -23841,336 +17967,80 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
 XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
 REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
 
-{ $as_echo "$as_me:$LINENO: checking for strcasecmp" >&5
-$as_echo_n "checking for strcasecmp... " >&6; }
-if test "${ac_cv_func_strcasecmp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strcasecmp to an innocuous variant, in case <limits.h> declares strcasecmp.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strcasecmp innocuous_strcasecmp
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strcasecmp (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strcasecmp
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = x""yes; then :
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strcasecmp ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strcasecmp || defined __stub___strcasecmp
-choke me
-#endif
-
-int
-main ()
-{
-return strcasecmp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_strcasecmp=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_strcasecmp=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5
-$as_echo "$ac_cv_func_strcasecmp" >&6; }
-if test "x$ac_cv_func_strcasecmp" = x""yes; then
-  :
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_STRCASECMP 1
-_ACEOF
+$as_echo "#define NEED_STRCASECMP 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for strncasecmp" >&5
-$as_echo_n "checking for strncasecmp... " >&6; }
-if test "${ac_cv_func_strncasecmp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strncasecmp to an innocuous variant, in case <limits.h> declares strncasecmp.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strncasecmp innocuous_strncasecmp
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strncasecmp (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strncasecmp
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strncasecmp ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strncasecmp || defined __stub___strncasecmp
-choke me
-#endif
-
-int
-main ()
-{
-return strncasecmp ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_strncasecmp=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_strncasecmp=no
-fi
+ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
+if test "x$ac_cv_func_strncasecmp" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strncasecmp" >&5
-$as_echo "$ac_cv_func_strncasecmp" >&6; }
-if test "x$ac_cv_func_strncasecmp" = x""yes; then
-  :
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_STRNCASECMP 1
-_ACEOF
+$as_echo "#define NEED_STRNCASECMP 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for strcasestr" >&5
-$as_echo_n "checking for strcasestr... " >&6; }
-if test "${ac_cv_func_strcasestr+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strcasestr to an innocuous variant, in case <limits.h> declares strcasestr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strcasestr innocuous_strcasestr
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strcasestr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strcasestr
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strcasestr ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strcasestr || defined __stub___strcasestr
-choke me
-#endif
-
-int
-main ()
-{
-return strcasestr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_strcasestr=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_strcasestr=no
-fi
+ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+if test "x$ac_cv_func_strcasestr" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcasestr" >&5
-$as_echo "$ac_cv_func_strcasestr" >&6; }
-if test "x$ac_cv_func_strcasestr" = x""yes; then
-  :
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_STRCASESTR 1
-_ACEOF
+$as_echo "#define NEED_STRCASESTR 1" >>confdefs.h
 
 fi
 
 
 if test "x$NULL_ROOT_CURSOR" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NULL_ROOT_CURSOR 1
-_ACEOF
+$as_echo "#define NULL_ROOT_CURSOR 1" >>confdefs.h
 
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XDMCP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5
 $as_echo_n "checking for XDMCP... " >&6; }
 
-if test -n "$XDMCP_CFLAGS"; then
-    pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XDMCP_CFLAGS"; then
+        pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XDMCP_LIBS"; then
-    pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XDMCP_LIBS"; then
+        pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -24183,14 +18053,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1`
+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"`
         else
-	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1`
+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XDMCP_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 have_libxdmcp="no"
 elif test $pkg_failed = untried; then
@@ -24198,23 +18068,19 @@ elif test $pkg_failed = untried; then
 else
 	XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS
 	XDMCP_LIBS=$pkg_cv_XDMCP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_libxdmcp="yes"
 fi
 if test "x$have_libxdmcp" = xyes; then
-	{ $as_echo "$as_me:$LINENO: checking for XdmcpWrap in -lXdmcp" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpWrap in -lXdmcp" >&5
 $as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; }
-if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then
+if test "${ac_cv_lib_Xdmcp_XdmcpWrap+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXdmcp $XDMCP_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -24232,43 +18098,18 @@ return XdmcpWrap ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xdmcp_XdmcpWrap=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_Xdmcp_XdmcpWrap=no
+  ac_cv_lib_Xdmcp_XdmcpWrap=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5
 $as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; }
-if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then
+if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = x""yes; then :
   have_xdmcpwrap="yes"
 else
   have_xdmcpwrap="no"
@@ -24300,9 +18141,7 @@ fi
 
 if test "x$XDMCP" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XDMCP 1
-_ACEOF
+$as_echo "#define XDMCP 1" >>confdefs.h
 
 	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
 	XDMCP_MODULES="xdmcp"
@@ -24318,9 +18157,7 @@ fi
 
 if test "x$XDMAUTH" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HASXDMAUTH 1
-_ACEOF
+$as_echo "#define HASXDMAUTH 1" >>confdefs.h
 
 	if ! test "x$XDMCP" = xyes; then
 		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
@@ -24482,16 +18319,12 @@ _ACEOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_LIBCWRAPPER 1
-_ACEOF
+$as_echo "#define NO_LIBCWRAPPER 1" >>confdefs.h
 
 
 if test "x$DEBUGGING" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
+$as_echo "#define DEBUG 1" >>confdefs.h
 
 fi
  if test "x$DEBUGGING" = xyes; then
@@ -24507,40 +18340,44 @@ fi
 if test "x$UNITTESTS" != xno ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
 
-if test -n "$GLIB_CFLAGS"; then
-    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLIB_CFLAGS"; then
+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$LIBGLIB" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$GLIB_LIBS"; then
-    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLIB_LIBS"; then
+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$LIBGLIB" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -24553,14 +18390,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 HAVE_GLIB=no
 elif test $pkg_failed = untried; then
@@ -24568,7 +18405,7 @@ elif test $pkg_failed = untried; then
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_GLIB=yes
 fi
@@ -24576,18 +18413,14 @@ fi
        # Check if linker supports -wrap, passed via compiler flags
        # When cross-compiling, reports no, since unit tests run from
        # "make check", so would be running on build machine,  not target
-       { $as_echo "$as_me:$LINENO: checking whether the linker supports -wrap" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports -wrap" >&5
 $as_echo_n "checking whether the linker supports -wrap... " >&6; }
        save_LDFLAGS="$LDFLAGS"
        LDFLAGS="$LDFLAGS -Wl,-wrap,exit"
-       if test "$cross_compiling" = yes; then
+       if test "$cross_compiling" = yes; then :
   linker_can_wrap="no"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	void __wrap_exit (int s)
@@ -24602,43 +18435,16 @@ exit (1);
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   linker_can_wrap="yes"
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-linker_can_wrap="no"
+  linker_can_wrap="no"
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
-       { $as_echo "$as_me:$LINENO: result: $linker_can_wrap" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $linker_can_wrap" >&5
 $as_echo "$linker_can_wrap" >&6; }
        LDFLAGS="$save_LDFLAGS"
 fi
@@ -24652,19 +18458,13 @@ if test "x$UNITTESTS" = xauto; then
 fi
 if test "x$UNITTESTS" = xyes; then
        if test "x$HAVE_GLIB" = xno; then
-           { { $as_echo "$as_me:$LINENO: error: glib required to build unit tests" >&5
-$as_echo "$as_me: error: glib required to build unit tests" >&2;}
-   { (exit 1); exit 1; }; }
+           as_fn_error "glib required to build unit tests" "$LINENO" 5
        fi
        if test "x$linker_can_wrap" = xno; then
-           { { $as_echo "$as_me:$LINENO: error: ld -wrap support required to build unit tests" >&5
-$as_echo "$as_me: error: ld -wrap support required to build unit tests" >&2;}
-   { (exit 1); exit 1; }; }
+           as_fn_error "ld -wrap support required to build unit tests" "$LINENO" 5
        fi
 
-cat >>confdefs.h <<\_ACEOF
-#define UNITTESTS 1
-_ACEOF
+$as_echo "#define UNITTESTS 1" >>confdefs.h
 
 
 
@@ -24679,24 +18479,16 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XTEST 1
-_ACEOF
+$as_echo "#define XTEST 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XSYNC 1
-_ACEOF
+$as_echo "#define XSYNC 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XCMISC 1
-_ACEOF
+$as_echo "#define XCMISC 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define BIGREQS 1
-_ACEOF
+$as_echo "#define BIGREQS 1" >>confdefs.h
 
 
 if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then
@@ -24726,18 +18518,14 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
 # Some systems have matching functionality in the smaller/simpler libmd
 # Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS
 if test "x$SHA1_LIB" = "x" ; then
-  { $as_echo "$as_me:$LINENO: checking for SHA1Init in -lmd" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1Init in -lmd" >&5
 $as_echo_n "checking for SHA1Init in -lmd... " >&6; }
-if test "${ac_cv_lib_md_SHA1Init+set}" = set; then
+if test "${ac_cv_lib_md_SHA1Init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -24755,48 +18543,21 @@ return SHA1Init ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_md_SHA1Init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_md_SHA1Init=no
+  ac_cv_lib_md_SHA1Init=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_md_SHA1Init" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_SHA1Init" >&5
 $as_echo "$ac_cv_lib_md_SHA1Init" >&6; }
-if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then
+if test "x$ac_cv_lib_md_SHA1Init" = x""yes; then :
   SHA1_LIB="-lmd"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHA1_IN_LIBMD 1
-_ACEOF
+$as_echo "#define HAVE_SHA1_IN_LIBMD 1" >>confdefs.h
 
 fi
 
@@ -24804,11 +18565,11 @@ fi
 
 if test "x$SHA1_LIB" = "x" ; then
   if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OPENSSL\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"OPENSSL\""; } >&5
   ($PKG_CONFIG --exists --print-errors "OPENSSL") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   openssl
 else
   HAVE_OPENSSL_PKC=yes
@@ -24816,18 +18577,14 @@ fi
   if test "x$HAVE_OPENSSL_PKC" = xyes; then
     REQUIRED_LIBS="$REQUIRED_LIBS openssl"
   else
-    { $as_echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5
 $as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; }
-if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then
+if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -24845,48 +18602,21 @@ return SHA1_Init ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypto_SHA1_Init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypto_SHA1_Init=no
+  ac_cv_lib_crypto_SHA1_Init=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SHA1_Init" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_Init" >&5
 $as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; }
-if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then
+if test "x$ac_cv_lib_crypto_SHA1_Init" = x""yes; then :
   SHA1_LIB="-lcrypto"
 else
-  { { $as_echo "$as_me:$LINENO: error: OpenSSL must be installed in order to build the X server." >&5
-$as_echo "$as_me: error: OpenSSL must be installed in order to build the X server." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "OpenSSL must be installed in order to build the X server." "$LINENO" 5
 fi
 
   fi
@@ -24894,40 +18624,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERCFLAGS" >&5
 $as_echo_n "checking for XSERVERCFLAGS... " >&6; }
 
-if test -n "$XSERVERCFLAGS_CFLAGS"; then
-    pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSERVERCFLAGS_CFLAGS"; then
+        pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XSERVERCFLAGS_LIBS"; then
-    pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSERVERCFLAGS_LIBS"; then
+        pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -24940,25 +18674,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
         else
-	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XSERVERCFLAGS_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met:
-
-$XSERVERCFLAGS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS
-and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met:
+	as_fn_error "Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met:
 
 $XSERVERCFLAGS_PKG_ERRORS
 
@@ -24968,12 +18691,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS
 and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -24982,61 +18704,54 @@ and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS
-and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS
 	XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERLIBS" >&5
 $as_echo_n "checking for XSERVERLIBS... " >&6; }
 
-if test -n "$XSERVERLIBS_CFLAGS"; then
-    pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSERVERLIBS_CFLAGS"; then
+        pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XSERVERLIBS_LIBS"; then
-    pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSERVERLIBS_LIBS"; then
+        pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -25049,14 +18764,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1`
+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
         else
-	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1`
+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XSERVERLIBS_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_LIBS) were not met:
+	as_fn_error "Package requirements ($REQUIRED_LIBS) were not met:
 
 $XSERVERLIBS_PKG_ERRORS
 
@@ -25066,23 +18781,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS
 and XSERVERLIBS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($REQUIRED_LIBS) were not met:
-
-$XSERVERLIBS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS
-and XSERVERLIBS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -25091,22 +18794,11 @@ and XSERVERLIBS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS
-and XSERVERLIBS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS
 	XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -25126,7 +18818,7 @@ fi
 # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
 # require.
 #
-XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
+XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
 XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
 
@@ -25139,102 +18831,9 @@ UTILS_SYS_LIBS="${SYS_LIBS}"
 # Some platforms require extra flags to do this.   gcc should set these flags
 # when -rdynamic is passed to it, other compilers/linkers may need to be added
 # here.
-
-
-if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
--Wbad-function-cast"
-    case `$CC -dumpversion` in
-    3.4.* | 4.*)
-	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
-	;;
-    esac
-else
-    { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then
-  SUNCC="yes"
-else
-  SUNCC="no"
-fi
-
-    if test "x$SUNCC" = "xyes"; then
-	CWARNFLAGS="-v"
-    fi
-fi
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-AM_BACKSLASH='\'
-
-
 if test "x$GCC" = "xyes"; then
-       if test "x$WERROR" = "xyes"; then
-               CWARNFLAGS="${CWARNFLAGS} -Werror"
-       fi
        LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
 fi
-XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS"
 case $host_os in
        openbsd*)
        LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
@@ -25242,13 +18841,9 @@ case $host_os in
 esac
 
 
-{ $as_echo "$as_me:$LINENO: checking if SVR4 needs to be defined" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5
 $as_echo_n "checking if SVR4 needs to be defined... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined(SVR4) || defined(__svr4__) || defined(__SVR4)
@@ -25257,17 +18852,15 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I_AM_SVR4" >/dev/null 2>&1; then
+  $EGREP "I_AM_SVR4" >/dev/null 2>&1; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define SVR4 1
-_ACEOF
+$as_echo "#define SVR4 1" >>confdefs.h
 
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 rm -f conftest*
@@ -25277,9 +18870,9 @@ XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Xvfb DDX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xvfb DDX" >&5
 $as_echo_n "checking whether to build Xvfb DDX... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $XVFB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5
 $as_echo "$XVFB" >&6; }
  if test "x$XVFB" = xyes; then
   XVFB_TRUE=
@@ -25301,40 +18894,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XNESTMODULES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNESTMODULES" >&5
 $as_echo_n "checking for XNESTMODULES... " >&6; }
 
-if test -n "$XNESTMODULES_CFLAGS"; then
-    pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XNESTMODULES_CFLAGS"; then
+        pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XNESTMODULES_LIBS"; then
-    pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XNESTMODULES_LIBS"; then
+        pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -25347,14 +18944,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
         else
-	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XNESTMODULES_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 have_xnest=no
 elif test $pkg_failed = untried; then
@@ -25362,16 +18959,16 @@ elif test $pkg_failed = untried; then
 else
 	XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS
 	XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_xnest=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking whether to build Xnest DDX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5
 $as_echo_n "checking whether to build Xnest DDX... " >&6; }
 if test "x$XNEST" = xauto; then
 	XNEST="$have_xnest"
 fi
-{ $as_echo "$as_me:$LINENO: result: $XNEST" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XNEST" >&5
 $as_echo "$XNEST" >&6; }
  if test "x$XNEST" = xyes; then
   XNEST_TRUE=
@@ -25384,9 +18981,7 @@ fi
 
 if test "x$XNEST" = xyes; then
 	if test "x$have_xnest" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: Xnest build explicitly requested, but required modules not found." >&5
-$as_echo "$as_me: error: Xnest build explicitly requested, but required modules not found." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Xnest build explicitly requested, but required modules not found." "$LINENO" 5
 	fi
 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB"
 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
@@ -25396,7 +18991,7 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Xorg DDX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg DDX" >&5
 $as_echo_n "checking whether to build Xorg DDX... " >&6; }
 if test "x$XORG" = xauto; then
 	XORG="yes"
@@ -25405,7 +19000,7 @@ if test "x$XORG" = xauto; then
 		darwin*) XORG="no" ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $XORG" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG" >&5
 $as_echo "$XORG" >&6; }
 
 xorg_bus_linuxpci=no
@@ -25422,65 +19017,13 @@ if test "x$XORG" = xyes; then
 			symbol_visibility=
 	have_visibility=disabled
 	if test x$SYMBOL_VISIBILITY != xno; then
-	    { $as_echo "$as_me:$LINENO: checking for symbol visibility support" >&5
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol visibility support" >&5
 $as_echo_n "checking for symbol visibility support... " >&6; }
 	    if test x$GCC = xyes; then
 		VISIBILITY_CFLAGS="-fvisibility=hidden"
 	    else
-		{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then
+		ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then :
   SUNCC="yes"
 else
   SUNCC="no"
@@ -25495,11 +19038,7 @@ fi
 	    if test x$have_visibility != xno; then
 		save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xfuncproto.h>
 		     extern _X_HIDDEN int hidden_int;
@@ -25514,36 +19053,15 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   have_visibility=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	have_visibility=no
+  have_visibility=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		CFLAGS=$save_CFLAGS
 	    fi
-	    { $as_echo "$as_me:$LINENO: result: $have_visibility" >&5
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_visibility" >&5
 $as_echo "$have_visibility" >&6; }
 	    if test x$have_visibility != xno; then
 		symbol_visibility=$VISIBILITY_CFLAGS
@@ -25555,40 +19073,44 @@ $as_echo "$have_visibility" >&6; }
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5
 $as_echo_n "checking for PCIACCESS... " >&6; }
 
-if test -n "$PCIACCESS_CFLAGS"; then
-    pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PCIACCESS_CFLAGS"; then
+        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$PCIACCESS_LIBS"; then
-    pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PCIACCESS_LIBS"; then
+        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -25601,14 +19123,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1`
+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"`
         else
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1`
+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PCIACCESS_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBPCIACCESS) were not met:
+	as_fn_error "Package requirements ($LIBPCIACCESS) were not met:
 
 $PCIACCESS_PKG_ERRORS
 
@@ -25618,33 +19140,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables PCIACCESS_CFLAGS
 and PCIACCESS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBPCIACCESS) were not met:
-
-$PCIACCESS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PCIACCESS_CFLAGS
-and PCIACCESS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -25653,12 +19153,11 @@ and PCIACCESS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
 	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -25666,405 +19165,45 @@ fi
 	SAVE_CFLAGS=$CFLAGS
 	CFLAGS=$PCIACCESS_CFLAGS
 	LIBS=$PCIACCESS_LIBS
-
-for ac_func in pci_system_init_dev_mem
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_func in pci_system_init_dev_mem
+do :
+  ac_fn_c_check_func "$LINENO" "pci_system_init_dev_mem" "ac_cv_func_pci_system_init_dev_mem"
+if test "x$ac_cv_func_pci_system_init_dev_mem" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PCI_SYSTEM_INIT_DEV_MEM 1
 _ACEOF
 
 fi
 done
 
-
-for ac_func in pci_device_enable
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_func in pci_device_enable
+do :
+  ac_fn_c_check_func "$LINENO" "pci_device_enable" "ac_cv_func_pci_device_enable"
+if test "x$ac_cv_func_pci_device_enable" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PCI_DEVICE_ENABLE 1
 _ACEOF
 
 fi
 done
 
-
-for ac_func in pci_device_is_boot_vga
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_func in pci_device_is_boot_vga
+do :
+  ac_fn_c_check_func "$LINENO" "pci_device_is_boot_vga" "ac_cv_func_pci_device_is_boot_vga"
+if test "x$ac_cv_func_pci_device_is_boot_vga" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PCI_DEVICE_IS_BOOT_VGA 1
 _ACEOF
 
 fi
 done
 
-
-for ac_func in pci_device_vgaarb_init
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	for ac_func in pci_device_vgaarb_init
+do :
+  ac_fn_c_check_func "$LINENO" "pci_device_vgaarb_init" "ac_cv_func_pci_device_vgaarb_init"
+if test "x$ac_cv_func_pci_device_vgaarb_init" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PCI_DEVICE_VGAARB_INIT 1
 _ACEOF
 
 fi
@@ -26124,302 +19263,24 @@ done
 		# Use the same stubs as BSD for old functions, since we now
 		# use libpciaccess for PCI
 		xorg_bus_bsdpci="yes"
-
-for ac_header in sys/kd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+		for ac_header in sys/kd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/kd.h" "ac_cv_header_sys_kd_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_kd_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_KD_H 1
 _ACEOF
 
 fi
 
 done
 
-
-for ac_header in sys/vt.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+		for ac_header in sys/vt.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/vt.h" "ac_cv_header_sys_vt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_vt_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_VT_H 1
 _ACEOF
  solaris_vt=yes
 else
@@ -26429,75 +19290,21 @@ fi
 done
 
 		# Check for minimum supported release
-		{ $as_echo "$as_me:$LINENO: checking Solaris version" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Solaris version" >&5
 $as_echo_n "checking Solaris version... " >&6; }
 	        OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e s'/\..*$//'`
 		if test "${OS_MINOR}" -ge 7 ; then
-	        	{ $as_echo "$as_me:$LINENO: result: Solaris ${OS_MINOR}" >&5
+	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris ${OS_MINOR}" >&5
 $as_echo "Solaris ${OS_MINOR}" >&6; }
 		else
-			{ $as_echo "$as_me:$LINENO: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&5
 $as_echo "Solaris \`echo ${host_os}|sed -e 's/^.*solaris//\`" >&6; }
 		fi
 		if test "${OS_MINOR}" -lt 8 ; then
-			{ { $as_echo "$as_me:$LINENO: error: This release no longer supports Solaris versions older than Solaris 8." >&5
-$as_echo "$as_me: error: This release no longer supports Solaris versions older than Solaris 8." >&2;}
-   { (exit 1); exit 1; }; }
+			as_fn_error "This release no longer supports Solaris versions older than Solaris 8." "$LINENO" 5
 		fi
-		{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then
+		ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then :
   SUNCC="yes"
 else
   SUNCC="no"
@@ -26506,60 +19313,8 @@ fi
 		if test "x$SUNCC" = "xyes"; then
 			solaris_asm_inline="yes"
 		fi
-		{ $as_echo "$as_me:$LINENO: checking whether _LP64 is declared" >&5
-$as_echo_n "checking whether _LP64 is declared... " >&6; }
-if test "${ac_cv_have_decl__LP64+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef _LP64
-  (void) _LP64;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl__LP64=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl__LP64=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__LP64" >&5
-$as_echo "$ac_cv_have_decl__LP64" >&6; }
-if test "x$ac_cv_have_decl__LP64" = x""yes; then
+		ac_fn_c_check_decl "$LINENO" "_LP64" "ac_cv_have_decl__LP64" "$ac_includes_default"
+if test "x$ac_cv_have_decl__LP64" = x""yes; then :
   SOLARIS_64="yes"
 else
   SOLARIS_64="no"
@@ -26579,15 +19334,10 @@ fi
 			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 			;;
 		  *)
-			{ { $as_echo "$as_me:$LINENO: error: Unsupported Solaris platform. Only SPARC & x86 \
+			as_fn_error "Unsupported Solaris platform. Only SPARC & x86 \
 			are supported on Solaris in this release.   If you are \
 			interested in porting Xorg to your platform, please email \
-			xorg@lists.freedesktop.org." >&5
-$as_echo "$as_me: error: Unsupported Solaris platform. Only SPARC & x86 \
-			are supported on Solaris in this release.   If you are \
-			interested in porting Xorg to your platform, please email \
-			xorg@lists.freedesktop.org." >&2;}
-   { (exit 1); exit 1; }; } ;;
+			xorg@lists.freedesktop.org." "$LINENO" 5 ;;
 		esac
 
 		if test x$solaris_asm_inline = xyes ; then
@@ -26606,13 +19356,9 @@ $as_echo "$as_me: error: Unsupported Solaris platform. Only SPARC & x86 \
 	  *)
 	  	XORG_OS="unknown"
 		XORG_OS_SUBDIR="unknown"
-		{ { $as_echo "$as_me:$LINENO: error: Your OS is unknown. Xorg currently only supports Linux, \
-		Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \
-	        Xorg to your platform, please email xorg@lists.freedesktop.org." >&5
-$as_echo "$as_me: error: Your OS is unknown. Xorg currently only supports Linux, \
+		as_fn_error "Your OS is unknown. Xorg currently only supports Linux, \
 		Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \
-	        Xorg to your platform, please email xorg@lists.freedesktop.org." >&2;}
-   { (exit 1); exit 1; }; }
+	        Xorg to your platform, please email xorg@lists.freedesktop.org." "$LINENO" 5
 		;;
 	esac
 
@@ -26628,40 +19374,44 @@ $as_echo "$as_me: error: Your OS is unknown. Xorg currently only supports Linux,
 	if test "x$DGA" = xauto; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DGA" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
 $as_echo_n "checking for DGA... " >&6; }
 
-if test -n "$DGA_CFLAGS"; then
-    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DGA_CFLAGS"; then
+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DGA_LIBS"; then
-    pkg_cv_DGA_LIBS="$DGA_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DGA_LIBS"; then
+        pkg_cv_DGA_LIBS="$DGA_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -26674,14 +19424,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
         else
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DGA_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 DGA=no
 elif test $pkg_failed = untried; then
@@ -26689,7 +19439,7 @@ elif test $pkg_failed = untried; then
 else
 	DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
 	DGA_LIBS=$pkg_cv_DGA_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	DGA=yes
 fi
@@ -26698,40 +19448,44 @@ fi
 		XORG_MODULES="$XORG_MODULES $DGAPROTO"
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DGA" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
 $as_echo_n "checking for DGA... " >&6; }
 
-if test -n "$DGA_CFLAGS"; then
-    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DGA_CFLAGS"; then
+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DGA_LIBS"; then
-    pkg_cv_DGA_LIBS="$DGA_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DGA_LIBS"; then
+        pkg_cv_DGA_LIBS="$DGA_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -26744,25 +19498,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
         else
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DGA_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($DGAPROTO) were not met:
-
-$DGA_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DGA_CFLAGS
-and DGA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($DGAPROTO) were not met:
+	as_fn_error "Package requirements ($DGAPROTO) were not met:
 
 $DGA_PKG_ERRORS
 
@@ -26772,22 +19515,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DGA_CFLAGS
 and DGA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DGA_CFLAGS
-and DGA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -26796,64 +19528,63 @@ and DGA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
 	DGA_LIBS=$pkg_cv_DGA_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define DGA 1
-_ACEOF
+$as_echo "#define DGA 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XFreeXDGA 1
-_ACEOF
+$as_echo "#define XFreeXDGA 1" >>confdefs.h
 
 	fi
 
 	if test "x$XF86VIDMODE" = xauto; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
 $as_echo_n "checking for XF86VIDMODE... " >&6; }
 
-if test -n "$XF86VIDMODE_CFLAGS"; then
-    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XF86VIDMODE_CFLAGS"; then
+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XF86VIDMODE_LIBS"; then
-    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XF86VIDMODE_LIBS"; then
+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -26866,14 +19597,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
         else
-	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 XF86VIDMODE=no
 elif test $pkg_failed = untried; then
@@ -26881,7 +19612,7 @@ elif test $pkg_failed = untried; then
 else
 	XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS
 	XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	XF86VIDMODE=yes
 fi
@@ -26890,40 +19621,44 @@ fi
 		XORG_MODULES="$XORG_MODULES $VIDMODEPROTO"
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
 $as_echo_n "checking for XF86VIDMODE... " >&6; }
 
-if test -n "$XF86VIDMODE_CFLAGS"; then
-    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XF86VIDMODE_CFLAGS"; then
+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "$VIDMODEPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XF86VIDMODE_LIBS"; then
-    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XF86VIDMODE_LIBS"; then
+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "$VIDMODEPROTO" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -26936,14 +19671,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
         else
-	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($VIDMODEPROTO) were not met:
+	as_fn_error "Package requirements ($VIDMODEPROTO) were not met:
 
 $XF86VIDMODE_PKG_ERRORS
 
@@ -26953,23 +19688,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS
 and XF86VIDMODE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($VIDMODEPROTO) were not met:
-
-$XF86VIDMODE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS
-and XF86VIDMODE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -26978,69 +19701,60 @@ and XF86VIDMODE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XF86VIDMODE_CFLAGS
-and XF86VIDMODE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS
 	XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define XF86VIDMODE 1
-_ACEOF
+$as_echo "#define XF86VIDMODE 1" >>confdefs.h
 
 	fi
 
 	if test -n "$XORG_MODULES"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XORG_MODULES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG_MODULES" >&5
 $as_echo_n "checking for XORG_MODULES... " >&6; }
 
-if test -n "$XORG_MODULES_CFLAGS"; then
-    pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_MODULES_CFLAGS"; then
+        pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XORG_MODULES_CFLAGS=`$PKG_CONFIG --cflags "$XORG_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XORG_MODULES_LIBS"; then
-    pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_MODULES_LIBS"; then
+        pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XORG_MODULES_LIBS=`$PKG_CONFIG --libs "$XORG_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -27053,14 +19767,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1`
+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"`
         else
-	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1`
+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XORG_MODULES_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($XORG_MODULES) were not met:
+	as_fn_error "Package requirements ($XORG_MODULES) were not met:
 
 $XORG_MODULES_PKG_ERRORS
 
@@ -27070,33 +19784,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XORG_MODULES_CFLAGS
 and XORG_MODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($XORG_MODULES) were not met:
-
-$XORG_MODULES_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XORG_MODULES_CFLAGS
-and XORG_MODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XORG_MODULES_CFLAGS
-and XORG_MODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -27105,12 +19797,11 @@ and XORG_MODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS
 	XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -27126,9 +19817,9 @@ fi
 
 	# Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -27141,14 +19832,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
@@ -27157,18 +19848,16 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 		if test "x$PERL" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: Perl is required to build the XFree86/Xorg DDX." >&5
-$as_echo "$as_me: error: Perl is required to build the XFree86/Xorg DDX." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Perl is required to build the XFree86/Xorg DDX." "$LINENO" 5
 	fi
 
 
@@ -27178,24 +19867,16 @@ $as_echo "$as_me: error: Perl is required to build the XFree86/Xorg DDX." >&2;}
 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
 	LOGPREFIX="$logdir/Xorg."
 
-cat >>confdefs.h <<\_ACEOF
-#define XORG_SERVER 1
-_ACEOF
+$as_echo "#define XORG_SERVER 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XORGSERVER 1
-_ACEOF
+$as_echo "#define XORGSERVER 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XFree86Server 1
-_ACEOF
+$as_echo "#define XFree86Server 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XFree86LOADER 1
-_ACEOF
+$as_echo "#define XFree86LOADER 1" >>confdefs.h
 
 
 cat >>confdefs.h <<_ACEOF
@@ -27203,19 +19884,13 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_XF86_TYPES 1
-_ACEOF
+$as_echo "#define NEED_XF86_TYPES 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_XF86_PROTOTYPES 1
-_ACEOF
+$as_echo "#define NEED_XF86_PROTOTYPES 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define __XSERVERNAME__ "Xorg"
-_ACEOF
+$as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h
 
 
   prefix_NONE=
@@ -27308,15 +19983,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define XSERVER_LIBPCIACCESS 1
-_ACEOF
+$as_echo "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h
 
 	if test "x$VGAHW" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WITH_VGAHW 1
-_ACEOF
+$as_echo "#define WITH_VGAHW 1" >>confdefs.h
 
 	fi
 
@@ -27432,7 +20103,7 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to build XWin DDX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XWin DDX" >&5
 $as_echo_n "checking whether to build XWin DDX... " >&6; }
 if test "x$XWIN" = xauto; then
 	case $host_os in
@@ -27441,16 +20112,16 @@ if test "x$XWIN" = xauto; then
 		*) XWIN="no" ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $XWIN" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XWIN" >&5
 $as_echo "$XWIN" >&6; }
 
 if test "x$XWIN" = xyes; then
 	if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$WINDOWSWMPROTO\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$WINDOWSWMPROTO") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   WINDOWSWM=yes
 else
   WINDOWSWM=no
@@ -27463,9 +20134,9 @@ _ACEOF
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
@@ -27476,24 +20147,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
 $as_echo "$WINDRES" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -27503,9 +20174,9 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
@@ -27516,24 +20187,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
 $as_echo "$ac_ct_WINDRES" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -27542,7 +20213,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -27557,40 +20228,44 @@ fi
 			XWIN_SERVER_NAME=XWin
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
 $as_echo_n "checking for XWINMODULES... " >&6; }
 
-if test -n "$XWINMODULES_CFLAGS"; then
-    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XWINMODULES_CFLAGS"; then
+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XWINMODULES_LIBS"; then
-    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XWINMODULES_LIBS"; then
+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -27603,14 +20278,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
         else
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XWINMODULES_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met:
+	as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met:
 
 $XWINMODULES_PKG_ERRORS
 
@@ -27620,33 +20295,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XWINMODULES_CFLAGS
 and XWINMODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met:
-
-$XWINMODULES_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XWINMODULES_CFLAGS
-and XWINMODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XWINMODULES_CFLAGS
-and XWINMODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -27655,26 +20308,21 @@ and XWINMODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS
 	XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_DEVWINDOWS 1
-_ACEOF
+$as_echo "#define HAS_DEVWINDOWS 1" >>confdefs.h
 
 
 						if test "x$WINDOWSWM" = xyes ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ROOTLESS 1
-_ACEOF
+$as_echo "#define ROOTLESS 1" >>confdefs.h
 
 			       CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND"
 			fi
@@ -27685,40 +20333,44 @@ _ACEOF
 			XWIN_SERVER_NAME=Xming
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
 $as_echo_n "checking for XWINMODULES... " >&6; }
 
-if test -n "$XWINMODULES_CFLAGS"; then
-    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XWINMODULES_CFLAGS"; then
+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "x11 xdmcp xau xfont" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XWINMODULES_LIBS"; then
-    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XWINMODULES_LIBS"; then
+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "x11 xdmcp xau xfont" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -27731,14 +20383,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
         else
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XWINMODULES_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met:
+	as_fn_error "Package requirements (x11 xdmcp xau xfont) were not met:
 
 $XWINMODULES_PKG_ERRORS
 
@@ -27748,23 +20400,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XWINMODULES_CFLAGS
 and XWINMODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met:
-
-$XWINMODULES_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XWINMODULES_CFLAGS
-and XWINMODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -27773,34 +20413,19 @@ and XWINMODULES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XWINMODULES_CFLAGS
-and XWINMODULES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS
 	XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define RELOCATE_PROJECTROOT 1
-_ACEOF
+$as_echo "#define RELOCATE_PROJECTROOT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_WINSOCK 1
-_ACEOF
+$as_echo "#define HAS_WINSOCK 1" >>confdefs.h
 
 			XWIN_SYS_LIBS=-lwinsock2
 			;;
@@ -27813,39 +20438,29 @@ _ACEOF
 
 	if test "x$DEBUGGING" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CYGDEBUG 1
-_ACEOF
+$as_echo "#define CYGDEBUG 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define CYGWINDOWING_DEBUG 1
-_ACEOF
+$as_echo "#define CYGWINDOWING_DEBUG 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define CYGMULTIWINDOW_DEBUG 1
-_ACEOF
+$as_echo "#define CYGMULTIWINDOW_DEBUG 1" >>confdefs.h
 
 	fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DDXOSVERRORF 1
-_ACEOF
+$as_echo "#define DDXOSVERRORF 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DDXBEFORERESET 1
-_ACEOF
+$as_echo "#define DDXBEFORERESET 1" >>confdefs.h
 
 	if test "x$XF86VIDMODE" = xyes; then
-		{ $as_echo "$as_me:$LINENO: Disabling XF86VidMode extension" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling XF86VidMode extension" >&5
 $as_echo "$as_me: Disabling XF86VidMode extension" >&6;}
 		XF86VIDMODE=no
 	fi
 	if test "x$COMPOSITE" = xyes; then
-		{ $as_echo "$as_me:$LINENO: Disabling Composite extension" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling Composite extension" >&5
 $as_echo "$as_me: Disabling Composite extension" >&6;}
 		COMPOSITE=no
 	fi
@@ -27925,31 +20540,23 @@ fi
 
 if test "x$XQUARTZ" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XQUARTZ 1
-_ACEOF
+$as_echo "#define XQUARTZ 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ROOTLESS 1
-_ACEOF
+$as_echo "#define ROOTLESS 1" >>confdefs.h
 
 
 	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
 
 
-	{ $as_echo "$as_me:$LINENO: checking for xp_init in -lXplugin" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5
 $as_echo_n "checking for xp_init in -lXplugin... " >&6; }
-if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then
+if test "${ac_cv_lib_Xplugin_xp_init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXplugin  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -27967,43 +20574,18 @@ return xp_init ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xplugin_xp_init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_Xplugin_xp_init=no
+  ac_cv_lib_Xplugin_xp_init=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xplugin_xp_init" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xplugin_xp_init" >&5
 $as_echo "$ac_cv_lib_Xplugin_xp_init" >&6; }
-if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then
+if test "x$ac_cv_lib_Xplugin_xp_init" = x""yes; then :
   :
 fi
 
@@ -28012,40 +20594,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XPBPROXY" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPBPROXY" >&5
 $as_echo_n "checking for XPBPROXY... " >&6; }
 
-if test -n "$XPBPROXY_CFLAGS"; then
-    pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XPBPROXY_CFLAGS"; then
+        pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XPBPROXY_CFLAGS=`$PKG_CONFIG --cflags "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XPBPROXY_LIBS"; then
-    pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XPBPROXY_LIBS"; then
+        pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XPBPROXY_LIBS=`$PKG_CONFIG --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -28058,25 +20644,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
         else
-	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XPBPROXY_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met:
-
-$XPBPROXY_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XPBPROXY_CFLAGS
-and XPBPROXY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met:
+	as_fn_error "Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met:
 
 $XPBPROXY_PKG_ERRORS
 
@@ -28086,12 +20661,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XPBPROXY_CFLAGS
 and XPBPROXY_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -28100,39 +20674,24 @@ and XPBPROXY_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XPBPROXY_CFLAGS
-and XPBPROXY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS
 	XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
         if test "x$XQUARTZ_SPARKLE" = xyes ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define XQUARTZ_SPARKLE 1
-_ACEOF
+$as_echo "#define XQUARTZ_SPARKLE 1" >>confdefs.h
 
         fi
 
 	if test "x$STANDALONE_XPBPROXY" = xyes ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STANDALONE_XPBPROXY 1
-_ACEOF
+$as_echo "#define STANDALONE_XPBPROXY 1" >>confdefs.h
 
 	fi
 fi
@@ -28150,9 +20709,9 @@ OBJCFLAGS='$(CFLAGS)'
 
 depcc="$OBJC" am_compiler_list='gcc3 gcc'
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -28258,7 +20817,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_OBJC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; }
 OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type
 
@@ -28301,40 +20860,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DMXMODULES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXMODULES" >&5
 $as_echo_n "checking for DMXMODULES... " >&6; }
 
-if test -n "$DMXMODULES_CFLAGS"; then
-    pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXMODULES_CFLAGS"; then
+        pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXMODULES_CFLAGS=`$PKG_CONFIG --cflags "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DMXMODULES_LIBS"; then
-    pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXMODULES_LIBS"; then
+        pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXMODULES_LIBS=`$PKG_CONFIG --libs "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -28347,14 +20910,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
         else
-	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DMXMODULES_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 have_dmx=no
 elif test $pkg_failed = untried; then
@@ -28362,11 +20925,11 @@ elif test $pkg_failed = untried; then
 else
 	DMXMODULES_CFLAGS=$pkg_cv_DMXMODULES_CFLAGS
 	DMXMODULES_LIBS=$pkg_cv_DMXMODULES_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_dmx=yes
 fi
-{ $as_echo "$as_me:$LINENO: checking whether to build Xdmx DDX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xdmx DDX" >&5
 $as_echo_n "checking whether to build Xdmx DDX... " >&6; }
 if test "x$DMX" = xauto; then
 	DMX="$have_dmx"
@@ -28375,7 +20938,7 @@ if test "x$DMX" = xauto; then
 		darwin*) DMX="no" ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $DMX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMX" >&5
 $as_echo "$DMX" >&6; }
  if test "x$DMX" = xyes; then
   DMX_TRUE=
@@ -28386,13 +20949,12 @@ else
 fi
 
 
+DOXYGEN="not_found"
+
 if test "x$DMX" = xyes; then
 	if test "x$have_dmx" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: Xdmx build explicitly requested, but required
-		              modules not found." >&5
-$as_echo "$as_me: error: Xdmx build explicitly requested, but required
-		              modules not found." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Xdmx build explicitly requested, but required
+		              modules not found." "$LINENO" 5
 	fi
 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
@@ -28402,278 +20964,16 @@ $as_echo "$as_me: error: Xdmx build explicitly requested, but required
 
 
 
-	if test "${ac_cv_header_linux_input_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5
-$as_echo_n "checking for linux/input.h... " >&6; }
-if test "${ac_cv_header_linux_input_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5
-$as_echo "$ac_cv_header_linux_input_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking linux/input.h usability" >&5
-$as_echo_n "checking linux/input.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <linux/input.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking linux/input.h presence" >&5
-$as_echo_n "checking linux/input.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <linux/input.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: linux/input.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: linux/input.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: linux/input.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: linux/input.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: linux/input.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: linux/input.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: linux/input.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/input.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: linux/input.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for linux/input.h" >&5
-$as_echo_n "checking for linux/input.h... " >&6; }
-if test "${ac_cv_header_linux_input_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_linux_input_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5
-$as_echo "$ac_cv_header_linux_input_h" >&6; }
-
-fi
-if test "x$ac_cv_header_linux_input_h" = x""yes; then
+	ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_input_h" = x""yes; then :
   DMX_BUILD_USB="yes"
 else
   DMX_BUILD_USB="no"
 fi
 
 
-	if test "${ac_cv_header_linux_keyboard_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5
-$as_echo_n "checking for linux/keyboard.h... " >&6; }
-if test "${ac_cv_header_linux_keyboard_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5
-$as_echo "$ac_cv_header_linux_keyboard_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h usability" >&5
-$as_echo_n "checking linux/keyboard.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <linux/keyboard.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking linux/keyboard.h presence" >&5
-$as_echo_n "checking linux/keyboard.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <linux/keyboard.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: linux/keyboard.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for linux/keyboard.h" >&5
-$as_echo_n "checking for linux/keyboard.h... " >&6; }
-if test "${ac_cv_header_linux_keyboard_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_linux_keyboard_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_keyboard_h" >&5
-$as_echo "$ac_cv_header_linux_keyboard_h" >&6; }
-
-fi
-if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then
+	ac_fn_c_check_header_mongrel "$LINENO" "linux/keyboard.h" "ac_cv_header_linux_keyboard_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_keyboard_h" = x""yes; then :
   DMX_BUILD_LNX="yes"
 else
   DMX_BUILD_LNX="no"
@@ -28682,40 +20982,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMXCONFIG_DEP" >&5
 $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; }
 
-if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
-    pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
+        pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XDMXCONFIG_DEP_CFLAGS=`$PKG_CONFIG --cflags "xaw7 xmu xt xpm x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XDMXCONFIG_DEP_LIBS"; then
-    pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XDMXCONFIG_DEP_LIBS"; then
+        pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XDMXCONFIG_DEP_LIBS=`$PKG_CONFIG --libs "xaw7 xmu xt xpm x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -28728,25 +21032,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1`
+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
         else
-	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1`
+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xaw7 xmu xt xpm x11) were not met:
-
-$XDMXCONFIG_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS
-and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xaw7 xmu xt xpm x11) were not met:
+	as_fn_error "Package requirements (xaw7 xmu xt xpm x11) were not met:
 
 $XDMXCONFIG_DEP_PKG_ERRORS
 
@@ -28756,22 +21049,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS
 and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS
-and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -28780,12 +21062,11 @@ and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XDMXCONFIG_DEP_CFLAGS=$pkg_cv_XDMXCONFIG_DEP_CFLAGS
 	XDMXCONFIG_DEP_LIBS=$pkg_cv_XDMXCONFIG_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -28793,40 +21074,44 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXEXAMPLES_DEP" >&5
 $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; }
 
-if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DMXEXAMPLES_DEP_LIBS"; then
-    pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXEXAMPLES_DEP_LIBS"; then
+        pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -28839,14 +21124,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
         else
-	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met:
+	as_fn_error "Package requirements ($LIBDMX $LIBXEXT x11) were not met:
 
 $DMXEXAMPLES_DEP_PKG_ERRORS
 
@@ -28856,33 +21141,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS
 and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met:
-
-$DMXEXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS
-and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS
-and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -28891,52 +21154,55 @@ and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DMXEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXEXAMPLES_DEP_CFLAGS
 	DMXEXAMPLES_DEP_LIBS=$pkg_cv_DMXEXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXMUEXAMPLES_DEP" >&5
 $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; }
 
-if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
-    pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
+        pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXXMUEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -28949,14 +21215,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
         else
-	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met:
+	as_fn_error "Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met:
 
 $DMXXMUEXAMPLES_DEP_PKG_ERRORS
 
@@ -28966,33 +21232,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS
 and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met:
-
-$DMXXMUEXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS
-and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS
-and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -29001,52 +21245,55 @@ and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DMXXMUEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS
 	DMXXMUEXAMPLES_DEP_LIBS=$pkg_cv_DMXXMUEXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXIEXAMPLES_DEP" >&5
 $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; }
 
-if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
-    pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
+        pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DMXXIEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -29059,14 +21306,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
         else
-	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met:
+	as_fn_error "Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met:
 
 $DMXXIEXAMPLES_DEP_PKG_ERRORS
 
@@ -29076,33 +21323,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS
 and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met:
-
-$DMXXIEXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS
-and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS
-and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -29111,52 +21336,55 @@ and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DMXXIEXAMPLES_DEP_CFLAGS=$pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS
 	DMXXIEXAMPLES_DEP_LIBS=$pkg_cv_DMXXIEXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTSTEXAMPLES_DEP" >&5
 $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; }
 
-if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XTSTEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXTST $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
-    pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
+        pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XTSTEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXTST $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -29169,14 +21397,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
         else
-	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met:
+	as_fn_error "Package requirements ($LIBXTST $LIBXEXT x11) were not met:
 
 $XTSTEXAMPLES_DEP_PKG_ERRORS
 
@@ -29186,23 +21414,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS
 and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met:
-
-$XTSTEXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS
-and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -29211,62 +21427,55 @@ and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS
-and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XTSTEXAMPLES_DEP_CFLAGS=$pkg_cv_XTSTEXAMPLES_DEP_CFLAGS
 	XTSTEXAMPLES_DEP_LIBS=$pkg_cv_XTSTEXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRESEXAMPLES_DEP" >&5
 $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; }
 
-if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XRESEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "xres $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XRESEXAMPLES_DEP_LIBS"; then
-    pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XRESEXAMPLES_DEP_LIBS"; then
+        pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XRESEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "xres $LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -29279,25 +21488,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1`
+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
         else
-	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1`
+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xres $LIBXEXT x11) were not met:
-
-$XRESEXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS
-and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xres $LIBXEXT x11) were not met:
+	as_fn_error "Package requirements (xres $LIBXEXT x11) were not met:
 
 $XRESEXAMPLES_DEP_PKG_ERRORS
 
@@ -29307,12 +21505,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS
 and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -29321,62 +21518,55 @@ and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS
-and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XRESEXAMPLES_DEP_CFLAGS=$pkg_cv_XRESEXAMPLES_DEP_CFLAGS
 	XRESEXAMPLES_DEP_LIBS=$pkg_cv_XRESEXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXAMPLES_DEP" >&5
 $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; }
 
-if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
-    pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
+        pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_X11EXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$X11EXAMPLES_DEP_LIBS"; then
-    pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11EXAMPLES_DEP_LIBS"; then
+        pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_X11EXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXEXT x11" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -29389,14 +21579,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1`
+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"`
         else
-	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1`
+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXEXT x11) were not met:
+	as_fn_error "Package requirements ($LIBXEXT x11) were not met:
 
 $X11EXAMPLES_DEP_PKG_ERRORS
 
@@ -29406,23 +21596,11 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS
 and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements ($LIBXEXT x11) were not met:
-
-$X11EXAMPLES_DEP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS
-and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -29431,27 +21609,71 @@ and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS
-and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	X11EXAMPLES_DEP_CFLAGS=$pkg_cv_X11EXAMPLES_DEP_CFLAGS
 	X11EXAMPLES_DEP_LIBS=$pkg_cv_X11EXAMPLES_DEP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
+
 fi
+# Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DOXYGEN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="not_found"
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$DOXYGEN" = "xnot_found" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&5
+$as_echo "$as_me: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&2;}
+fi
+
+ if test "x$DOXYGEN" != "xnot_found"; then
+  HAVE_DOXYGEN_TRUE=
+  HAVE_DOXYGEN_FALSE='#'
+else
+  HAVE_DOXYGEN_TRUE='#'
+  HAVE_DOXYGEN_FALSE=
+fi
+
  if test "x$DMX_BUILD_LNX" = xyes; then
   DMX_BUILD_LNX_TRUE=
   DMX_BUILD_LNX_FALSE='#'
@@ -29472,9 +21694,6 @@ fi
 
 XEPHYR_LIBS=
 XEPHYR_INCS=
-XSDL_LIBS=
-XSDL_INCS=
-XSDL_DIRS=
 
  if test x$KDRIVE = xyes; then
   KDRIVE_TRUE=
@@ -29486,160 +21705,18 @@ fi
 
 if test "$KDRIVE" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define KDRIVESERVER 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define KDRIVEDDXACTIONS /**/
-_ACEOF
-
-
-
-
-for ac_header in sys/vm86.h sys/io.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define KDRIVESERVER 1" >>confdefs.h
 
-  ac_header_preproc=no
-fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+$as_echo "#define KDRIVEDDXACTIONS /**/" >>confdefs.h
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+    for ac_header in sys/vm86.h sys/io.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -29655,157 +21732,16 @@ done
     if test "x$KDRIVEVESA" = xyes; then
         KDRIVEFBDEVLIB=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define KDRIVEVESA 1
-_ACEOF
+$as_echo "#define KDRIVEVESA 1" >>confdefs.h
 
     fi
 
-
-for ac_header in linux/fb.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+    for ac_header in linux/fb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_fb_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LINUX_FB_H 1
 _ACEOF
 
 fi
@@ -29819,49 +21755,51 @@ done
     if test "x$XFBDEV" = xyes; then
         KDRIVEFBDEVLIB=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define KDRIVEFBDEV 1
-_ACEOF
+$as_echo "#define KDRIVEFBDEV 1" >>confdefs.h
 
     fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for TSLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
 $as_echo_n "checking for TSLIB... " >&6; }
 
-if test -n "$TSLIB_CFLAGS"; then
-    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$TSLIB_CFLAGS"; then
+        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$TSLIB_LIBS"; then
-    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$TSLIB_LIBS"; then
+        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -29874,14 +21812,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1`
+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"`
         else
-	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1`
+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TSLIB_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 HAVE_TSLIB="no"
 elif test $pkg_failed = untried; then
@@ -29889,23 +21827,19 @@ elif test $pkg_failed = untried; then
 else
 	TSLIB_CFLAGS=$pkg_cv_TSLIB_CFLAGS
 	TSLIB_LIBS=$pkg_cv_TSLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_TSLIB="yes"
 fi
     if test "x$HAVE_TSLIB" = xno; then
-        { $as_echo "$as_me:$LINENO: checking for ts_open in -lts" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ts_open in -lts" >&5
 $as_echo_n "checking for ts_open in -lts... " >&6; }
-if test "${ac_cv_lib_ts_ts_open+set}" = set; then
+if test "${ac_cv_lib_ts_ts_open+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lts  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -29923,43 +21857,18 @@ return ts_open ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ts_ts_open=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ts_ts_open=no
+  ac_cv_lib_ts_ts_open=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ts_ts_open" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ts_ts_open" >&5
 $as_echo "$ac_cv_lib_ts_ts_open" >&6; }
-if test "x$ac_cv_lib_ts_ts_open" = x""yes; then
+if test "x$ac_cv_lib_ts_ts_open" = x""yes; then :
   HAVE_TSLIB="yes"
 fi
 
@@ -29971,184 +21880,14 @@ fi
 
     if test "x$TSLIB" = xyes; then
         if ! test "x$HAVE_TSLIB" = xyes; then
-            { { $as_echo "$as_me:$LINENO: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&5
-$as_echo "$as_me: error: tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" >&2;}
-   { (exit 1); exit 1; }; }
+            as_fn_error "tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" "$LINENO" 5
         else
 
-cat >>confdefs.h <<\_ACEOF
-#define TSLIB 1
-_ACEOF
+$as_echo "#define TSLIB 1" >>confdefs.h
 
         fi
     fi
 
-
-for ac_header in SDL/SDL.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    if test x"$ac_cv_header_SDL_SDL_h" = xyes && test "x$XSDL" = xauto; then
-       XSDL=yes
-    fi
-
-    if test x"$XSDL" = xyes; then
-       # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
-
-cat >>confdefs.h <<\_ACEOF
-#define XSDLSERVER 1
-_ACEOF
-
-       XSDL_LIBS="`sdl-config --libs`"
-       XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
-    fi
-
     XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
@@ -30159,40 +21898,44 @@ _ACEOF
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XEPHYR" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEPHYR" >&5
 $as_echo_n "checking for XEPHYR... " >&6; }
 
-if test -n "$XEPHYR_CFLAGS"; then
-    pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEPHYR_CFLAGS"; then
+        pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "$XEPHYR_REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XEPHYR_LIBS"; then
-    pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEPHYR_LIBS"; then
+        pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "$XEPHYR_REQUIRED_LIBS" 2>/dev/null`
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
@@ -30205,14 +21948,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
         else
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XEPHYR_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 xephyr="no"
 elif test $pkg_failed = untried; then
@@ -30220,7 +21963,7 @@ elif test $pkg_failed = untried; then
 else
 	XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS
 	XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	xephyr="yes"
 fi
@@ -30229,106 +21972,18 @@ fi
     fi
 
     # Xephyr needs nanosleep() which is in librt on Solaris
-    { $as_echo "$as_me:$LINENO: checking for nanosleep" >&5
-$as_echo_n "checking for nanosleep... " >&6; }
-if test "${ac_cv_func_nanosleep+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define nanosleep to an innocuous variant, in case <limits.h> declares nanosleep.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define nanosleep innocuous_nanosleep
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char nanosleep (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef nanosleep
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char nanosleep ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_nanosleep || defined __stub___nanosleep
-choke me
-#endif
-
-int
-main ()
-{
-return nanosleep ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_nanosleep=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_nanosleep=no
-fi
+    ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
+if test "x$ac_cv_func_nanosleep" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_nanosleep" >&5
-$as_echo "$ac_cv_func_nanosleep" >&6; }
-if test "x$ac_cv_func_nanosleep" = x""yes; then
-  :
 else
-  { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
 $as_echo_n "checking for nanosleep in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
+if test "${ac_cv_lib_rt_nanosleep+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -30346,43 +22001,18 @@ return nanosleep ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_nanosleep=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_rt_nanosleep=no
+  ac_cv_lib_rt_nanosleep=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
 $as_echo "$ac_cv_lib_rt_nanosleep" >&6; }
-if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then
+if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then :
   XEPHYR_LIBS="$XEPHYR_LIBS -lrt"
 fi
 
@@ -30413,8 +22043,6 @@ fi
 
 
 
-
-
 fi
 
 
@@ -30454,14 +22082,6 @@ else
   KDRIVEFBDEV_FALSE=
 fi
 
- if test x"$XSDL" = xyes; then
-  XSDLSERVER_TRUE=
-  XSDLSERVER_FALSE='#'
-else
-  XSDLSERVER_TRUE='#'
-  XSDLSERVER_FALSE=
-fi
-
  if test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes; then
   XEPHYR_TRUE=
   XEPHYR_FALSE='#'
@@ -30488,11 +22108,7 @@ fi
 
 
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -30508,36 +22124,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
@@ -30571,173 +22162,7 @@ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
 
 
 
-# Man page sections - used in config utils & generating man pages
-
-
-
-if test x$APP_MAN_SUFFIX = x    ; then
-    APP_MAN_SUFFIX=1
-fi
-if test x$APP_MAN_DIR = x    ; then
-    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
-fi
-
-if test x$LIB_MAN_SUFFIX = x    ; then
-    LIB_MAN_SUFFIX=3
-fi
-if test x$LIB_MAN_DIR = x    ; then
-    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
-fi
-
-if test x$FILE_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	FILE_MAN_SUFFIX=4  ;;
-	*)		FILE_MAN_SUFFIX=5  ;;
-    esac
-fi
-if test x$FILE_MAN_DIR = x    ; then
-    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
-fi
-
-if test x$MISC_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	MISC_MAN_SUFFIX=5  ;;
-	*)		MISC_MAN_SUFFIX=7  ;;
-    esac
-fi
-if test x$MISC_MAN_DIR = x    ; then
-    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
-fi
-
-if test x$DRIVER_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
-	*)		DRIVER_MAN_SUFFIX=4  ;;
-    esac
-fi
-if test x$DRIVER_MAN_DIR = x    ; then
-    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
-fi
-
-if test x$ADMIN_MAN_SUFFIX = x    ; then
-    case $host_os in
-	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
-	*)		ADMIN_MAN_SUFFIX=8  ;;
-    esac
-fi
-if test x$ADMIN_MAN_DIR = x    ; then
-    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
-mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
-
-
-
-
-
-  # Check whether --enable-shave was given.
-if test "${enable_shave+set}" = set; then
-  enableval=$enable_shave;
-else
-  enable_shave=yes
-
-fi
-
-
-
-  if test x"$enable_shave" = xyes; then
-        shavedir="$ac_pwd/."
-
-
-        MAKEFLAGS=-s
-
-    AM_MAKEFLAGS='`test -z $V && echo -s`'
-
-
-        # Extract the first word of "sed", so it can be a program name with args.
-set dummy sed; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_SED+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$SED"; then
-  ac_cv_prog_SED="$SED" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_SED="sed"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-fi
-fi
-SED=$ac_cv_prog_SED
-if test -n "$SED"; then
-  { $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-        SHAVE_SAVED_LIBTOOL=$LIBTOOL
-    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
-
-
-        SHAVE_SAVED_CC=$CC
-    SHAVE_SAVED_CXX=$CXX
-    SHAVE_SAVED_FC=$FC
-    SHAVE_SAVED_F77=$F77
-    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
-    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
-    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
-    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
-
-
-
-
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-
-
-
-
-ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile fb/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/damage/Makefile miext/shadow/Makefile miext/cw/Makefile miext/rootless/Makefile os/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/doc/devel/Makefile hw/xfree86/doc/man/Makefile hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/sco/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/sysv/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf8_16bpp/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/doc/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile hw/xnest/Makefile hw/xwin/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/doc/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/sdl/Makefile hw/kdrive/src/Makefile test/Makefile test/xi2/Makefile xorg-server.pc"
+ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile fb/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/damage/Makefile miext/shadow/Makefile miext/cw/Makefile miext/rootless/Makefile os/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/dixmods/extmod/Makefile hw/xfree86/doc/Makefile hw/xfree86/doc/devel/Makefile hw/xfree86/doc/man/Makefile hw/xfree86/doc/sgml/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/exa/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/sco/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/sysv/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf8_16bpp/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/doc/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile hw/xnest/Makefile hw/xwin/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/doc/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/src/Makefile test/Makefile test/xi2/Makefile xorg-server.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -30766,13 +22191,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -30780,8 +22205,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -30804,11 +22229,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -30828,8 +22253,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -30845,721 +22270,419 @@ else
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XSERVER_DTRACE_TRUE}" && test -z "${XSERVER_DTRACE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XSERVER_DTRACE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XSERVER_DTRACE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XSERVER_DTRACE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SPECIAL_DTRACE_OBJECTS_TRUE}" && test -z "${SPECIAL_DTRACE_OBJECTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 if test -z "${NEED_STRLCAT_TRUE}" && test -z "${NEED_STRLCAT_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_STRLCAT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"NEED_STRLCAT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"NEED_STRLCAT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NEED_VSNPRINTF_TRUE}" && test -z "${NEED_VSNPRINTF_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_VSNPRINTF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"NEED_VSNPRINTF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"NEED_VSNPRINTF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AGP_TRUE}" && test -z "${AGP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AGP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AGP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AGP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LNXAPM_TRUE}" && test -z "${LNXAPM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"LNXAPM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"LNXAPM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"LNXAPM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${FBDEVHW_TRUE}" && test -z "${FBDEVHW_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"FBDEVHW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"FBDEVHW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"FBDEVHW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${FREEBSD_KLDLOAD_TRUE}" && test -z "${FREEBSD_KLDLOAD_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"FREEBSD_KLDLOAD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"FREEBSD_KLDLOAD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"FREEBSD_KLDLOAD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BSD_APM_TRUE}" && test -z "${BSD_APM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_APM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BSD_APM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BSD_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BSD_KQUEUE_APM_TRUE}" && test -z "${BSD_KQUEUE_APM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BSD_KQUEUE_APM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BSD_KQUEUE_APM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BSD_KQUEUE_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ALPHA_VIDEO_TRUE}" && test -z "${ALPHA_VIDEO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ALPHA_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ALPHA_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ALPHA_VIDEO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARM_VIDEO_TRUE}" && test -z "${ARM_VIDEO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ARM_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARM_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ARM_VIDEO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${I386_VIDEO_TRUE}" && test -z "${I386_VIDEO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"I386_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"I386_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"I386_VIDEO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${PPC_VIDEO_TRUE}" && test -z "${PPC_VIDEO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"PPC_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"PPC_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"PPC_VIDEO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SPARC64_VIDEO_TRUE}" && test -z "${SPARC64_VIDEO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SPARC64_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SPARC64_VIDEO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SPARC64_VIDEO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_SETUID_TRUE}" && test -z "${INSTALL_SETUID_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_SETUID\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INSTALL_SETUID\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INSTALL_SETUID\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SECURE_RPC_TRUE}" && test -z "${SECURE_RPC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SECURE_RPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SECURE_RPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SECURE_RPC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INT10_VM86_TRUE}" && test -z "${INT10_VM86_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_VM86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INT10_VM86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INT10_VM86\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INT10_X86EMU_TRUE}" && test -z "${INT10_X86EMU_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_X86EMU\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INT10_X86EMU\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INT10_X86EMU\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INT10_STUB_TRUE}" && test -z "${INT10_STUB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INT10_STUB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INT10_STUB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INT10_STUB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILDDOCS_TRUE}" && test -z "${BUILDDOCS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDDOCS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILDDOCS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BUILDDOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LINUXDOC_TRUE}" && test -z "${BUILD_LINUXDOC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_LINUXDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BUILD_LINUXDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BUILD_PDFDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_LIBXF86CONFIG_TRUE}" && test -z "${INSTALL_LIBXF86CONFIG_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INSTALL_LIBXF86CONFIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INSTALL_LIBXF86CONFIG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_DBUS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CONFIG_DBUS_API_TRUE}" && test -z "${CONFIG_DBUS_API_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_DBUS_API\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CONFIG_DBUS_API\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"CONFIG_DBUS_API\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CONFIG_HAL_TRUE}" && test -z "${CONFIG_HAL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CONFIG_HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"CONFIG_HAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CONFIG_NEED_DBUS_TRUE}" && test -z "${CONFIG_NEED_DBUS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_NEED_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CONFIG_NEED_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"CONFIG_NEED_DBUS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XV_TRUE}" && test -z "${XV_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XVMC_TRUE}" && test -z "${XVMC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XVMC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XVMC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XVMC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XREGISTRY_TRUE}" && test -z "${XREGISTRY_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XREGISTRY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XREGISTRY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XREGISTRY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${COMPOSITE_TRUE}" && test -z "${COMPOSITE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"COMPOSITE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"COMPOSITE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"COMPOSITE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MITSHM_TRUE}" && test -z "${MITSHM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MITSHM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MITSHM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MITSHM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${RECORD_TRUE}" && test -z "${RECORD_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"RECORD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"RECORD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"RECORD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SCREENSAVER_TRUE}" && test -z "${SCREENSAVER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SCREENSAVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SCREENSAVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SCREENSAVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${RES_TRUE}" && test -z "${RES_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"RES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"RES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"RES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GLX_TRUE}" && test -z "${GLX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GLX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AIGLX_TRUE}" && test -z "${AIGLX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AIGLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AIGLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AIGLX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DRI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DRI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DRI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DRI2_TRUE}" && test -z "${DRI2_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DRI2\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DRI2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DRI2_AIGLX_TRUE}" && test -z "${DRI2_AIGLX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DRI2_AIGLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DRI2_AIGLX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DRI2_AIGLX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XINERAMA_TRUE}" && test -z "${XINERAMA_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XINERAMA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XINERAMA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XINERAMA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XACE_TRUE}" && test -z "${XACE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XACE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XACE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XACE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XSELINUX_TRUE}" && test -z "${XSELINUX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XSELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XSELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XSELINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XCSECURITY_TRUE}" && test -z "${XCSECURITY_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XCSECURITY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XCSECURITY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XCSECURITY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MULTIBUFFER_TRUE}" && test -z "${MULTIBUFFER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MULTIBUFFER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MULTIBUFFER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MULTIBUFFER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DBE_TRUE}" && test -z "${DBE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DBE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DBE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DBE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XF86BIGFONT_TRUE}" && test -z "${XF86BIGFONT_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XF86BIGFONT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XF86BIGFONT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XF86BIGFONT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DPMSExtension_TRUE}" && test -z "${DPMSExtension_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DPMSExtension\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DPMSExtension\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DPMSExtension\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XCALIBRATE_TRUE}" && test -z "${XCALIBRATE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XCALIBRATE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XCALIBRATE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XCALIBRATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XF86UTILS_TRUE}" && test -z "${XF86UTILS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XF86UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XF86UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XF86UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XAA_TRUE}" && test -z "${XAA_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XAA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XAA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XAA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${VGAHW_TRUE}" && test -z "${VGAHW_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"VGAHW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"VGAHW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"VGAHW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${VBE_TRUE}" && test -z "${VBE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"VBE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"VBE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"VBE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INT10MODULE_TRUE}" && test -z "${INT10MODULE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INT10MODULE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INT10MODULE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INT10MODULE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XDMCP_TRUE}" && test -z "${XDMCP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XDMCP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XDMCP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XDMCP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XDMAUTH_TRUE}" && test -z "${XDMAUTH_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XDMAUTH\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XDMAUTH\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XDMAUTH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${UNITTESTS_TRUE}" && test -z "${UNITTESTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"UNITTESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"UNITTESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"UNITTESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XVFB_TRUE}" && test -z "${XVFB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XVFB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XVFB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XVFB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XNEST_TRUE}" && test -z "${XNEST_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XNEST\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XNEST\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XNEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XORG_TRUE}" && test -z "${XORG_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XORG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XORG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XORG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XORG_BUS_LINUXPCI_TRUE}" && test -z "${XORG_BUS_LINUXPCI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_LINUXPCI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XORG_BUS_LINUXPCI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XORG_BUS_LINUXPCI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XORG_BUS_BSDPCI_TRUE}" && test -z "${XORG_BUS_BSDPCI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_BSDPCI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XORG_BUS_BSDPCI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XORG_BUS_BSDPCI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XORG_BUS_SPARC_TRUE}" && test -z "${XORG_BUS_SPARC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XORG_BUS_SPARC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XORG_BUS_SPARC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XORG_BUS_SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LINUX_IA64_TRUE}" && test -z "${LINUX_IA64_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_IA64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"LINUX_IA64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"LINUX_IA64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LINUX_ALPHA_TRUE}" && test -z "${LINUX_ALPHA_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX_ALPHA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"LINUX_ALPHA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"LINUX_ALPHA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LNXACPI_TRUE}" && test -z "${LNXACPI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"LNXACPI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"LNXACPI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"LNXACPI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SOLARIS_ASM_INLINE_TRUE}" && test -z "${SOLARIS_ASM_INLINE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_ASM_INLINE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOLARIS_ASM_INLINE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SOLARIS_ASM_INLINE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SOLARIS_VT_TRUE}" && test -z "${SOLARIS_VT_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"SOLARIS_VT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOLARIS_VT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SOLARIS_VT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DGA_TRUE}" && test -z "${DGA_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DGA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DGA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DGA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XF86VIDMODE_TRUE}" && test -z "${XF86VIDMODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XF86VIDMODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XF86VIDMODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XF86VIDMODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_TRUE}" && test -z "${XWIN_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_MULTIWINDOW_TRUE}" && test -z "${XWIN_MULTIWINDOW_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_MULTIWINDOW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_MULTIWINDOWEXTWM_TRUE}" && test -z "${XWIN_MULTIWINDOWEXTWM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_CLIPBOARD_TRUE}" && test -z "${XWIN_CLIPBOARD_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_CLIPBOARD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_CLIPBOARD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_CLIPBOARD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_GLX_WINDOWS_TRUE}" && test -z "${XWIN_GLX_WINDOWS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_GLX_WINDOWS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_GLX_WINDOWS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_GLX_WINDOWS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_NATIVEGDI_TRUE}" && test -z "${XWIN_NATIVEGDI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_NATIVEGDI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_NATIVEGDI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_NATIVEGDI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_PRIMARYFB_TRUE}" && test -z "${XWIN_PRIMARYFB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_PRIMARYFB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_PRIMARYFB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_PRIMARYFB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_RANDR_TRUE}" && test -z "${XWIN_RANDR_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_RANDR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_RANDR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_RANDR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XWIN_XV_TRUE}" && test -z "${XWIN_XV_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XWIN_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XWIN_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XWIN_XV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepOBJC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XQUARTZ_TRUE}" && test -z "${XQUARTZ_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XQUARTZ\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XQUARTZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XQUARTZ_SPARKLE_TRUE}" && test -z "${XQUARTZ_SPARKLE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XQUARTZ_SPARKLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XQUARTZ_SPARKLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XQUARTZ_SPARKLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${STANDALONE_XPBPROXY_TRUE}" && test -z "${STANDALONE_XPBPROXY_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"STANDALONE_XPBPROXY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"STANDALONE_XPBPROXY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"STANDALONE_XPBPROXY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DMX_TRUE}" && test -z "${DMX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DMX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DMX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DMX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
+  as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DMX_BUILD_LNX_TRUE}" && test -z "${DMX_BUILD_LNX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_LNX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DMX_BUILD_LNX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DMX_BUILD_LNX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DMX_BUILD_USB_TRUE}" && test -z "${DMX_BUILD_USB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"DMX_BUILD_USB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DMX_BUILD_USB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"DMX_BUILD_USB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${KDRIVE_TRUE}" && test -z "${KDRIVE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"KDRIVE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"KDRIVE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"KDRIVELINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"TSLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"TSLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"TSLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${KDRIVEVESA_TRUE}" && test -z "${KDRIVEVESA_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEVESA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"KDRIVEVESA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"KDRIVEVESA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${KDRIVEFBDEV_TRUE}" && test -z "${KDRIVEFBDEV_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"KDRIVEFBDEV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"KDRIVEFBDEV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XSDLSERVER_TRUE}" && test -z "${XSDLSERVER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XSDLSERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XSDLSERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"KDRIVEFBDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XEPHYR_TRUE}" && test -z "${XEPHYR_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XEPHYR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XEPHYR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XEPHYR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_KDRIVEFBDEVLIB_TRUE}" && test -z "${BUILD_KDRIVEFBDEVLIB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${XFAKESERVER_TRUE}" && test -z "${XFAKESERVER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"XFAKESERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"XFAKESERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"XFAKESERVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -31569,17 +22692,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -31587,23 +22711,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -31611,7 +22727,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -31622,7 +22744,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -31645,13 +22767,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -31661,15 +22776,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -31681,12 +22796,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -31698,7 +22817,89 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -31712,8 +22913,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -31733,76 +22938,25 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -31831,8 +22985,56 @@ fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -31851,10 +23053,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -31869,13 +23071,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 1.7.0.902, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by xorg-server $as_me 1.7.99.1, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -31907,10 +23115,11 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
@@ -31932,16 +23141,16 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xorg-server config.status 1.7.0.902
-configured by $0, generated by GNU Autoconf 2.63,
+xorg-server config.status 1.7.99.1
+configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -31984,20 +23193,19 @@ do
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -32005,11 +23213,10 @@ Try \`$0 --help' for more information." >&2
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -32316,8 +23523,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "shave") CONFIG_FILES="$CONFIG_FILES shave" ;;
-    "shave-libtool") CONFIG_FILES="$CONFIG_FILES shave-libtool" ;;
     "include/do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/do-not-use-config.h" ;;
     "include/xorg-server.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xorg-server.h" ;;
     "include/dix-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/dix-config.h" ;;
@@ -32413,15 +23618,12 @@ do
     "hw/kdrive/fake/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fake/Makefile" ;;
     "hw/kdrive/fbdev/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fbdev/Makefile" ;;
     "hw/kdrive/linux/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/linux/Makefile" ;;
-    "hw/kdrive/sdl/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/sdl/Makefile" ;;
     "hw/kdrive/src/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/src/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;;
     "xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -32448,7 +23650,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -32459,11 +23661,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -32471,10 +23669,16 @@ $debug ||
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -32488,24 +23692,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -32594,9 +23792,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -32637,9 +23833,7 @@ for ac_last_try in false false :; do
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -32724,9 +23918,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -32739,9 +23931,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -32769,12 +23959,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -32785,7 +23973,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -32798,9 +23986,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -32828,47 +24014,7 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -32925,7 +24071,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -32935,12 +24080,11 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -32950,7 +24094,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -32979,14 +24123,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
@@ -32996,9 +24138,7 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -33009,25 +24149,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -33065,7 +24199,7 @@ $as_echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -33160,47 +24294,7 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-      { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -33853,15 +24947,12 @@ _LT_EOF
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -33882,10 +24973,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 27701158f..463b7103f 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,21 +26,15 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2009-10-19"
+AC_INIT([xorg-server], 1.7.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2009-10-22)"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
-AC_CONFIG_FILES([
-	shave
-	shave-libtool
-])
-
-# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and
-# XORG_CWARNFLAGS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
@@ -79,6 +73,11 @@ AC_SYS_LARGEFILE
 XORG_PROG_RAWCPP
 AC_PATH_PROG(SED,sed)
 
+XORG_DEFAULT_OPTIONS
+# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
+# easier overrides at build time.
+XSERVER_CFLAGS='$(CWARNFLAGS)'
+
 dnl Check for dtrace program (needed to build Xserver dtrace probes)
 dnl Also checks for <sys/sdt.h>, since some Linux distros have an 
 dnl ISDN trace program named dtrace
@@ -424,7 +423,6 @@ case $host_os in
 	;;
 esac
 
-XORG_RELEASE_VERSION
 dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the
 dnl major number
 PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
@@ -444,8 +442,9 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRIN
 
 dnl Build options.
 AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],
-				  [Treat warnings as errors (default: disabled)]),
-			        [WERROR=$enableval], [WERROR=no])
+		  [Obsolete - use --enable-strict-compilation instead]),
+  AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))
+
 AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],
 				  [Enable debugging (default: disabled)]),
 			        [DEBUGGING=$enableval], [DEBUGGING=no])
@@ -617,7 +616,6 @@ AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server
 dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
-AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
 AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
 AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
 
@@ -654,7 +652,7 @@ dnl If you're seeing an error here, be sure you installed the lib/xtrans module
 dnl first and if it's not in the default location, that you set the ACLOCAL
 dnl environment variable to find it, such as:
 dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
-m4_pattern_forbid(XTRANS_CONNECTION_FLAGS)
+m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
 
 # Transport selection macro from xtrans.m4
 XTRANS_CONNECTION_FLAGS
@@ -1091,11 +1089,16 @@ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
 
 AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
+AC_ARG_WITH(xkb-bin-directory,
+				AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),
+				[XKB_BIN_DIRECTORY="$withval"],
+				[XKB_BIN_DIRECTORY="$bindir"])
+
+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
 
 dnl Make sure XKM_OUTPUT_DIR is an absolute path
 XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
+if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
    XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
 fi
 
@@ -1320,7 +1323,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
 # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
 # require.
 #
-XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
+XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
 XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
 AC_SUBST([XSERVER_LIBS])
@@ -1333,14 +1336,9 @@ AC_SUBST([UTILS_SYS_LIBS])
 # Some platforms require extra flags to do this.   gcc should set these flags
 # when -rdynamic is passed to it, other compilers/linkers may need to be added
 # here.
-XORG_CWARNFLAGS
 if test "x$GCC" = "xyes"; then
-       if test "x$WERROR" = "xyes"; then
-               CWARNFLAGS="${CWARNFLAGS} -Werror"
-       fi
        LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
 fi
-XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS"
 case $host_os in
        openbsd*)
        LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
@@ -1818,6 +1816,8 @@ fi
 AC_MSG_RESULT([$DMX])
 AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
 
+DOXYGEN="not_found"
+
 if test "x$DMX" = xyes; then
 	if test "x$have_dmx" = xno; then
 		AC_MSG_ERROR([Xdmx build explicitly requested, but required
@@ -1852,7 +1852,14 @@ dnl Linux sources in DMX require <linux/keyboard.h>
 	AC_SUBST(XRESEXAMPLES_DEP_LIBS)
 	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])
 	AC_SUBST(X11EXAMPLES_DEP_LIBS)
+
 fi
+AC_PATH_PROG(DOXYGEN,doxygen,[not_found])
+if test "x$DOXYGEN" = "xnot_found" ; then
+    AC_MSG_WARN([doxygen not found in $PATH. Cannot build dmx documentation])
+fi
+AC_SUBST(DOXYGEN)
+AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != "xnot_found"])
 AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
 AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
 
@@ -1860,9 +1867,6 @@ dnl kdrive DDX
 
 XEPHYR_LIBS=
 XEPHYR_INCS=
-XSDL_LIBS=
-XSDL_INCS=
-XSDL_DIRS=
 
 AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
 if test "$KDRIVE" = yes; then
@@ -1907,18 +1911,6 @@ if test "$KDRIVE" = yes; then
         fi
     fi
 
-    AC_CHECK_HEADERS([SDL/SDL.h])
-    if test x"$ac_cv_header_SDL_SDL_h" = xyes && test "x$XSDL" = xauto; then
-       XSDL=yes
-    fi
-
-    if test x"$XSDL" = xyes; then
-       # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
-       AC_DEFINE(XSDLSERVER,1,[Build Xsdl server])
-       XSDL_LIBS="`sdl-config --libs`"
-       XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
-    fi
-
     XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
@@ -1960,8 +1952,6 @@ if test "$KDRIVE" = yes; then
 
     AC_SUBST([XEPHYR_LIBS])
     AC_SUBST([XEPHYR_INCS])
-    AC_SUBST([XSDL_LIBS])
-    AC_SUBST([XSDL_INCS])
 fi
 AC_SUBST([KDRIVE_INCS])
 AC_SUBST([KDRIVE_PURE_INCS])
@@ -1973,7 +1963,6 @@ AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
 AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
 AM_CONDITIONAL(KDRIVEVESA, [test "x$KDRIVEVESA" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
-AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
 AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
@@ -2007,12 +1996,6 @@ AC_SUBST([libdir])
 AC_SUBST([exec_prefix])
 AC_SUBST([prefix])
 
-# Man page sections - used in config utils & generating man pages
-XORG_MANPAGE_SECTIONS
-XORG_CHANGELOG
-
-SHAVE_INIT([.], [enable])
-
 AC_OUTPUT([
 Makefile
 glx/Makefile
@@ -2099,7 +2082,6 @@ hw/kdrive/ephyr/Makefile
 hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile
-hw/kdrive/sdl/Makefile
 hw/kdrive/src/Makefile
 test/Makefile
 test/xi2/Makefile
diff --git a/xorg-server/cpprules.in b/xorg-server/cpprules.in
index 755620005..7fcb9bd6f 100644
--- a/xorg-server/cpprules.in
+++ b/xorg-server/cpprules.in
@@ -42,7 +42,7 @@ MANDEFS = \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/xorg-server/damageext/Makefile.in b/xorg-server/damageext/Makefile.in
index 76a6e8e22..5b0ef2380 100644
--- a/xorg-server/damageext/Makefile.in
+++ b/xorg-server/damageext/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -243,7 +240,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -257,7 +253,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -343,6 +336,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -374,7 +368,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/dbe/Makefile.in b/xorg-server/dbe/Makefile.in
index 7d2e3821c..e1af4098a 100644
--- a/xorg-server/dbe/Makefile.in
+++ b/xorg-server/dbe/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -269,7 +266,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -283,7 +279,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -369,6 +362,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -400,7 +394,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/dix/Makefile.am b/xorg-server/dix/Makefile.am
index 1caa5d024..b29f2e189 100644
--- a/xorg-server/dix/Makefile.am
+++ b/xorg-server/dix/Makefile.am
@@ -51,7 +51,7 @@ if XSERVER_DTRACE
 BUILT_SOURCES = Xserver-dtrace.h
 
 Xserver-dtrace.h: $(srcdir)/Xserver.d
-	$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
+	$(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
 		|| cp Xserver-dtrace.h.in $@
 
 endif
@@ -59,12 +59,12 @@ endif
 if SPECIAL_DTRACE_OBJECTS
 # Generate dtrace object code for probes in libdix
 dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
-	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
 
 noinst_PROGRAMS = dix.O
 
 dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
-	ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+	$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
 endif
 
 dix.c:
diff --git a/xorg-server/dix/Makefile.in b/xorg-server/dix/Makefile.in
index f4e983f3b..c302e845f 100644
--- a/xorg-server/dix/Makefile.in
+++ b/xorg-server/dix/Makefile.in
@@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -135,7 +135,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -160,7 +159,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -184,6 +182,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -201,8 +200,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -248,7 +245,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -274,6 +270,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -283,7 +280,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -297,7 +293,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -339,8 +334,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -383,6 +376,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -414,7 +408,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -830,15 +823,15 @@ uninstall-am: uninstall-dist_miscconfigDATA
 
 
 @XSERVER_DTRACE_TRUE@Xserver-dtrace.h: $(srcdir)/Xserver.d
-@XSERVER_DTRACE_TRUE@	$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
+@XSERVER_DTRACE_TRUE@	$(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
 @XSERVER_DTRACE_TRUE@		|| cp Xserver-dtrace.h.in $@
 
 # Generate dtrace object code for probes in libdix
 @SPECIAL_DTRACE_OBJECTS_TRUE@dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
-@SPECIAL_DTRACE_OBJECTS_TRUE@	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+@SPECIAL_DTRACE_OBJECTS_TRUE@	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
 
 @SPECIAL_DTRACE_OBJECTS_TRUE@dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
-@SPECIAL_DTRACE_OBJECTS_TRUE@	ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+@SPECIAL_DTRACE_OBJECTS_TRUE@	$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
 
 dix.c:
 	touch $@
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index e86e606c0..6a7907399 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -2221,12 +2221,15 @@ ProcQueryKeymap(ClientPtr client)
     rep.length = 2;
 
     rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess);
-    if (rc != Success)
+    if (rc != Success && rc != BadAccess)
 	return rc;
 
     for (i = 0; i<32; i++)
 	rep.map[i] = down[i];
 
+    if (rc == BadAccess)
+	memset(rep.map, 0, 32);
+
     WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
 
    return Success;
diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c
index 5cede5f43..8278d444b 100644
--- a/xorg-server/dix/dixutils.c
+++ b/xorg-server/dix/dixutils.c
@@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source)
 }
 
 
-void
-CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
-{
-    int i;
-
-    for (i = 0; i < length; i++, source++, dest++)
-	*dest = ISOLatin1ToLower (*source);
-    *dest = '\0';
-}
-
 int
 CompareISOLatin1Lowered(unsigned char *s1, int s1len, 
 			unsigned char *s2, int s2len)
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 8f63d3381..d070a4c6f 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -1462,7 +1462,7 @@ static DevPrivateKey GrabPrivateKey = &GrabPrivateKeyIndex;
 static void
 DetachFromMaster(DeviceIntPtr dev)
 {
-    int id;
+    intptr_t id;
     if (!dev->u.master)
         return;
 
@@ -1484,7 +1484,7 @@ ReattachToOldMaster(DeviceIntPtr dev)
 
 
     p = dixLookupPrivate(&dev->devPrivates, GrabPrivateKey);
-    id = (int)p; /* silence gcc warnings */
+    id = (intptr_t) p; /* silence gcc warnings */
     dixLookupDevice(&master, id, serverClient, DixUseAccess);
 
     if (master)
@@ -2507,9 +2507,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
                                                        filter, grab);
                     if (deliveries > 0)
                         goto unwind;
-                } else if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n",
-                            dev->name, event->any.type, rc);
+                }
             }
 
             /* Core event */
@@ -2525,9 +2523,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
                             filter, grab);
                     if (deliveries > 0)
                         goto unwind;
-                } else if (rc != BadMatch)
-                        ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n",
-                                dev->name, event->any.type, rc);
+                }
             }
 
             if ((deliveries < 0) || (pWin == stopAt) ||
@@ -3811,9 +3807,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
             deliveries = DeliverEventsToWindow(keybd, focus, &core, 1,
                                                GetEventFilter(keybd, &core),
                                                NullGrab);
-        } else if (rc != BadMatch)
-            ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n",
-                    keybd->name, event->any.type, rc);
+        }
     }
 
 unwind:
@@ -4974,7 +4968,7 @@ ProcQueryPointer(ClientPtr client)
     if (rc != Success)
 	return rc;
     rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);
-    if (rc != Success)
+    if (rc != Success && rc != BadAccess)
 	return rc;
 
     keyboard = GetPairedDevice(mouse);
@@ -5022,6 +5016,15 @@ ProcQueryPointer(ClientPtr client)
     }
 #endif
 
+    if (rc == BadAccess) {
+	rep.mask = 0;
+	rep.child = None;
+	rep.rootX = 0;
+	rep.rootY = 0;
+	rep.winX = 0;
+	rep.winY = 0;
+    }
+
     WriteReplyToClient(client, sizeof(xQueryPointerReply), &rep);
 
     return(Success);
diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c
index 3a2deb85c..e3e727462 100644
--- a/xorg-server/dix/privates.c
+++ b/xorg-server/dix/privates.c
@@ -303,6 +303,7 @@ dixResetPrivates(void)
     /* reset private descriptors */
     for (i = 1; i < nextPriv; i++) {
 	*items[i].key = 0;
+	items[i].size = 0;
 	DeleteCallbackList(&items[i].initfuncs);
 	DeleteCallbackList(&items[i].deletefuncs);
     }
diff --git a/xorg-server/doc/Makefile.in b/xorg-server/doc/Makefile.in
index 37b50f67c..8d6cb6e44 100644
--- a/xorg-server/doc/Makefile.in
+++ b/xorg-server/doc/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -246,7 +243,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -260,7 +256,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -346,6 +339,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -377,7 +371,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -679,10 +672,10 @@ uninstall-am: uninstall-appmanDATA uninstall-filemanDATA
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
 	cp $< $@
diff --git a/xorg-server/exa/Makefile.in b/xorg-server/exa/Makefile.in
index bc0a6c903..ac8351121 100644
--- a/xorg-server/exa/Makefile.in
+++ b/xorg-server/exa/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -271,7 +268,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -288,7 +284,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -330,8 +325,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -374,6 +367,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -405,7 +399,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index e264d440c..46e91820b 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -774,10 +774,18 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
     ScreenPtr pScreen = screenInfo.screens[screenNum];
     ExaScreenPriv(pScreen);
 
+    /* Move any deferred results from a software fallback to the driver pixmap */
+    if (pExaScr->deferred_mixed_pixmap)
+	exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
+
     unwrap(pExaScr, pScreen, BlockHandler);
     (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
     wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
 
+    /* The rest only applies to classic EXA */
+    if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS)
+	return;
+
     /* Try and keep the offscreen memory area tidy every now and then (at most 
      * once per second) when the server has been idle for at least 100ms.
      */
@@ -991,10 +999,12 @@ exaDriverInit (ScreenPtr		pScreen,
      * Replace various fb screen functions
      */
     if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) &&
-	!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
+	(!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) ||
+	 (pExaScr->info->flags & EXA_MIXED_PIXMAPS)))
 	wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
+    if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) &&
+	!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS))
 	wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
-    }
     wrap(pExaScr, pScreen, CreateGC, exaCreateGC);
     wrap(pExaScr, pScreen, CloseScreen, exaCloseScreen);
     wrap(pExaScr, pScreen, GetImage, exaGetImage);
diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c
index bf097c32f..5a370047e 100644
--- a/xorg-server/exa/exa_glyphs.c
+++ b/xorg-server/exa/exa_glyphs.c
@@ -62,15 +62,10 @@
  */
 #define CACHE_PICTURE_WIDTH 1024
 
-/* Maximum number of glyphs we buffer on the stack before flushing
- * rendering to the mask or destination surface.
- */
-#define GLYPH_BUFFER_SIZE 256
-
 typedef struct {
     PicturePtr mask;
-    ExaCompositeRectRec rects[GLYPH_BUFFER_SIZE];
     int count;
+    ExaCompositeRectRec rects[0];
 } ExaGlyphBuffer, *ExaGlyphBufferPtr;
 
 typedef enum {
@@ -364,7 +359,8 @@ exaGlyphCacheHashRemove(ExaGlyphCachePtr cache,
 static void
 exaGlyphCacheUploadGlyph(ScreenPtr         pScreen,
 			 ExaGlyphCachePtr  cache,
-			 int               pos,
+			 int               x,
+			 int               y,
 			 GlyphPtr          pGlyph)
 {
     ExaScreenPriv(pScreen);
@@ -399,10 +395,10 @@ exaGlyphCacheUploadGlyph(ScreenPtr         pScreen,
     if (!exaPixmapIsOffscreen(pCachePixmap))
 	goto composite;
 
-    /* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */
+    /* x,y are in pixmap coordinates, no need for cache{X,Y}off */
     if (pExaScr->info->UploadToScreen(pCachePixmap,
-				      CACHE_X(pos),
-				      CACHE_Y(pos),
+				      x,
+				      y,
 				      pGlyph->info.width,
 				      pGlyph->info.height,
 				      (char *)pExaPixmap->sys_ptr,
@@ -416,18 +412,18 @@ composite:
 		      cache->picture,
 		      0, 0,
 		      0, 0,
-		      CACHE_X(pos),
-		      CACHE_Y(pos),
+		      x,
+		      y,
 		      pGlyph->info.width,
 		      pGlyph->info.height);
 
 damage:
     /* The cache pixmap isn't a window, so no need to offset coordinates. */
     exaPixmapDirty (pCachePixmap,
-		    CACHE_X(pos),
-		    CACHE_Y(pos),
-		    CACHE_X(pos) + cache->glyphWidth,
-		    CACHE_Y(pos) + cache->glyphHeight);
+		    x,
+		    y,
+		    x + cache->glyphWidth,
+		    y + cache->glyphHeight);
 }
 
 static ExaGlyphCacheResult
@@ -446,6 +442,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr         pScreen,
 {
     ExaCompositeRectPtr rect;
     int pos;
+    int x, y;
     
     if (buffer->mask && buffer->mask != cache->picture)
 	return ExaGlyphNeedFlush;
@@ -462,10 +459,14 @@ exaGlyphCacheBufferGlyph(ScreenPtr         pScreen,
     pos = exaGlyphCacheHashLookup(cache, pGlyph);
     if (pos != -1) {
 	DBG_GLYPH_CACHE(("  found existing glyph at %d\n", pos));
+	x = CACHE_X(pos);
+	y = CACHE_Y(pos);
     } else {
 	if (cache->glyphCount < cache->size) {
 	    /* Space remaining; we fill from the start */
 	    pos = cache->glyphCount;
+	    x = CACHE_X(pos);
+	    y = CACHE_Y(pos);
 	    cache->glyphCount++;
 	    DBG_GLYPH_CACHE(("  storing glyph in free space at %d\n", pos));
 
@@ -477,14 +478,12 @@ exaGlyphCacheBufferGlyph(ScreenPtr         pScreen,
 	     * the cache
 	     */
 	    pos = cache->evictionPosition;
+	    x = CACHE_X(pos);
+	    y = CACHE_Y(pos);
 	    DBG_GLYPH_CACHE(("  evicting glyph at %d\n", pos));
 	    if (buffer->count) {
-		int x, y;
 		int i;
 
-		x = CACHE_X(pos);
-		y = CACHE_Y(pos);
-
 		for (i = 0; i < buffer->count; i++) {
 		    if (pSrc ?
 			(buffer->rects[i].xMask == x && buffer->rects[i].yMask == y) :
@@ -503,7 +502,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr         pScreen,
 	    cache->evictionPosition = rand() % cache->size;
 	}
 
-	exaGlyphCacheUploadGlyph(pScreen, cache, pos, pGlyph);
+	exaGlyphCacheUploadGlyph(pScreen, cache, x, y, pGlyph);
     }
 
     buffer->mask = cache->picture;
@@ -514,13 +513,13 @@ exaGlyphCacheBufferGlyph(ScreenPtr         pScreen,
     {
 	rect->xSrc = xSrc;
 	rect->ySrc = ySrc;
-	rect->xMask = CACHE_X(pos);
-	rect->yMask = CACHE_Y(pos);
+	rect->xMask = x;
+	rect->yMask = y;
     }
     else
     {
-	rect->xSrc = CACHE_X(pos);
-	rect->ySrc = CACHE_Y(pos);
+	rect->xSrc = x;
+	rect->ySrc = y;
 	rect->xMask = 0;
 	rect->yMask = 0;
     }
@@ -553,16 +552,13 @@ exaBufferGlyph(ScreenPtr         pScreen,
 	       INT16             yDst)
 {
     ExaScreenPriv(pScreen);
-    unsigned int format = (GlyphPicture(pGlyph)[pScreen->myNum])->format;
+    PicturePtr mask = GlyphPicture(pGlyph)[pScreen->myNum];
+    unsigned int format = mask->format;
     int width = pGlyph->info.width;
     int height = pGlyph->info.height;
     ExaCompositeRectPtr rect;
-    PicturePtr mask;
     int i;
 
-    if (buffer->count == GLYPH_BUFFER_SIZE)
-	return ExaGlyphNeedFlush;
-
     if (PICT_FORMAT_BPP(format) == 1)
 	format = PICT_a8;
     
@@ -593,7 +589,6 @@ exaBufferGlyph(ScreenPtr         pScreen,
 
     /* Couldn't find the glyph in the cache, use the glyph picture directly */
 
-    mask = GlyphPicture(pGlyph)[pScreen->myNum];
     if (buffer->mask && buffer->mask != mask)
 	return ExaGlyphNeedFlush;
 
@@ -707,12 +702,18 @@ exaGlyphs (CARD8 	 op,
     int		width = 0, height = 0;
     int		x, y;
     int		first_xOff = list->xOff, first_yOff = list->yOff;
-    int		n;
+    int		i, n;
     GlyphPtr	glyph;
     int		error;
     BoxRec	extents = {0, 0, 0, 0};
     CARD32	component_alpha;
-    ExaGlyphBuffer buffer;
+    ExaGlyphBufferPtr buffer;
+
+    for (i = 0, n = 0; i < nlist; i++)
+	n += list[i].len;
+    buffer = alloca(sizeof(ExaGlyphBuffer) + n * sizeof(ExaCompositeRectRec));
+    if (!buffer)
+	return;
 
     if (maskFormat)
     {
@@ -792,8 +793,8 @@ exaGlyphs (CARD8 	 op,
 	x = 0;
 	y = 0;
     }
-    buffer.count = 0;
-    buffer.mask = NULL;
+    buffer->count = 0;
+    buffer->mask = NULL;
     while (nlist--)
     {
 	x += list->xOff;
@@ -808,23 +809,23 @@ exaGlyphs (CARD8 	 op,
 		/* pGlyph->info.{x,y} compensate for empty space in the glyph. */
 		if (maskFormat)
 		{
-		    if (exaBufferGlyph(pScreen, &buffer, glyph, NULL, pMask,
+		    if (exaBufferGlyph(pScreen, buffer, glyph, NULL, pMask,
 				       0, 0, 0, 0, x - glyph->info.x, y - glyph->info.y) == ExaGlyphNeedFlush)
 		    {
-			exaGlyphsToMask(pMask, &buffer);
-			exaBufferGlyph(pScreen, &buffer, glyph, NULL, pMask,
+			exaGlyphsToMask(pMask, buffer);
+			exaBufferGlyph(pScreen, buffer, glyph, NULL, pMask,
 				       0, 0, 0, 0, x - glyph->info.x, y - glyph->info.y);
 		    }
 		}
 		else
 		{
-		    if (exaBufferGlyph(pScreen, &buffer, glyph, pSrc, pDst,
+		    if (exaBufferGlyph(pScreen, buffer, glyph, pSrc, pDst,
 				       xSrc + (x - glyph->info.x) - first_xOff, ySrc + (y - glyph->info.y) - first_yOff,
 				       0, 0, x - glyph->info.x, y - glyph->info.y)
 			== ExaGlyphNeedFlush)
 		    {
-			exaGlyphsToDst(pSrc, pDst, &buffer);
-			exaBufferGlyph(pScreen, &buffer, glyph, pSrc, pDst,
+			exaGlyphsToDst(pSrc, pDst, buffer);
+			exaBufferGlyph(pScreen, buffer, glyph, pSrc, pDst,
 				       xSrc + (x - glyph->info.x) - first_xOff, ySrc + (y - glyph->info.y) - first_yOff,
 				       0, 0, x - glyph->info.x, y - glyph->info.y);
 		    }
@@ -837,11 +838,11 @@ exaGlyphs (CARD8 	 op,
 	list++;
     }
     
-    if (buffer.count) {
+    if (buffer->count) {
         if (maskFormat)
-	    exaGlyphsToMask(pMask, &buffer);
+	    exaGlyphsToMask(pMask, buffer);
         else
-	    exaGlyphsToDst(pSrc, pDst, &buffer);
+	    exaGlyphsToDst(pSrc, pDst, buffer);
     }
 
     if (maskFormat)
diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c
index f42c9c233..6065d7577 100644
--- a/xorg-server/exa/exa_migration_mixed.c
+++ b/xorg-server/exa/exa_migration_mixed.c
@@ -99,8 +99,13 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
 	    exaCreateDriverPixmap_mixed(pPixmap);
 
 	if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
+	    ExaScreenPriv(pPixmap->drawable.pScreen);
+
 	    pPixmap->devKind = pExaPixmap->fb_pitch;
 	    exaCopyDirtyToFb(pixmaps + i);
+
+	    if (pExaScr->deferred_mixed_pixmap == pPixmap)
+		pExaScr->deferred_mixed_pixmap = NULL;
 	}
 
 	pExaPixmap->offscreen = exaPixmapIsOffscreen(pPixmap);
@@ -197,6 +202,9 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
 
 /* Move back results of software rendering on system memory copy of mixed driver
  * pixmap (see exaPrepareAccessReg_mixed).
+ *
+ * Defer moving the destination back into the driver pixmap, to try and save
+ * overhead on multiple consequent software fallbacks.
  */
 void exaFinishAccess_mixed(PixmapPtr pPixmap, int index)
 {
@@ -204,6 +212,16 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index)
 
     if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
 	DamageRegionProcessPending(&pPixmap->drawable);
-	exaMoveInPixmap_mixed(pPixmap);
+
+	if (index == EXA_PREPARE_DEST || index == EXA_PREPARE_AUX_DEST) {
+	    ExaScreenPriv(pPixmap->drawable.pScreen);
+
+	    if (pExaScr->deferred_mixed_pixmap &&
+		pExaScr->deferred_mixed_pixmap != pPixmap)
+		exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
+	    pExaScr->deferred_mixed_pixmap = pPixmap;
+	    pPixmap->devKind = pExaPixmap->fb_pitch;
+	} else
+	    exaMoveInPixmap_mixed(pPixmap);
     }
 }
diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c
index 167ffa9d5..bc393c772 100644
--- a/xorg-server/exa/exa_mixed.c
+++ b/xorg-server/exa/exa_mixed.c
@@ -192,6 +192,9 @@ exaDestroyPixmap_mixed(PixmapPtr pPixmap)
     {
 	ExaPixmapPriv (pPixmap);
 
+	if (pExaScr->deferred_mixed_pixmap == pPixmap)
+	    pExaScr->deferred_mixed_pixmap = NULL;
+
 	if (pExaPixmap->driverPriv)
 	    pExaScr->info->DestroyPixmap(pScreen, pExaPixmap->driverPriv);
 	pExaPixmap->driverPriv = NULL;
diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index 1aec8e966..5b056dab9 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -188,6 +188,7 @@ typedef struct {
     unsigned			 numOffscreenAvailable;
     CARD32			 lastDefragment;
     CARD32			 nextDefragment;
+    PixmapPtr			 deferred_mixed_pixmap;
 
     /* Reference counting for accessed pixmaps */
     struct {
diff --git a/xorg-server/fb/Makefile.in b/xorg-server/fb/Makefile.in
index 195e518f1..31f5f51c7 100644
--- a/xorg-server/fb/Makefile.in
+++ b/xorg-server/fb/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -151,7 +151,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -176,7 +175,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -200,6 +198,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -217,8 +216,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -264,7 +261,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -290,6 +286,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -299,7 +296,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -313,7 +309,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -355,8 +350,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -399,6 +392,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -430,7 +424,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/glx/Makefile.in b/xorg-server/glx/Makefile.in
index 439f8d17b..65db3fd38 100644
--- a/xorg-server/glx/Makefile.in
+++ b/xorg-server/glx/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -114,7 +114,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -139,7 +138,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -163,6 +161,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -180,8 +179,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -227,7 +224,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -253,6 +249,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -262,7 +259,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -276,7 +272,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -318,8 +313,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -362,6 +355,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -393,7 +387,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index b1061a8c2..eedab652f 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -50,7 +50,6 @@
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
-#include "protocol-versions.h"
 
 static int
 validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc)
     ** client if it wants to work with older clients; however, in this
     ** implementation the server just returns its version number.
     */
-    reply.majorVersion = SERVER_GLX_MAJOR_VERSION;
-    reply.minorVersion = SERVER_GLX_MINOR_VERSION;
+    reply.majorVersion = glxMajorVersion;
+    reply.minorVersion = glxMinorVersion;
     reply.length = 0;
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
@@ -2058,7 +2057,7 @@ int __glXDisp_BindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
             if (ret == Success) {
                 if (barrier)
                     /* add source for cleanup when drawable is gone */
-                    AddResource(drawable, __glXSwapBarrierRes, (pointer)screen);
+                    AddResource(drawable, __glXSwapBarrierRes, (pointer)(intptr_t)screen);
                 else
                     /* delete source */
                     FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE);
@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
     char *buf;
     __GLXscreen *pGlxScreen;
     int err;
+    char ver_str[16];
 
     if (!validGlxScreen(client, req->screen, &pGlxScreen, &err))
 	return err;
@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
 	    ptr = pGlxScreen->GLXvendor;
 	    break;
 	case GLX_VERSION:
-	    ptr = pGlxScreen->GLXversion;
+	    /* Return to the server version rather than the screen version
+	     * to prevent confusion when they do not match.
+	     */
+	    snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion);
+	    ptr = ver_str;
 	    break;
 	case GLX_EXTENSIONS:
 	    ptr = pGlxScreen->GLXextensions;
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c
index ed7fb4c4b..ed7dc80ba 100644
--- a/xorg-server/glx/glxdri2.c
+++ b/xorg-server/glx/glxdri2.c
@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 				       screen->base.GLXextensions);
     }
 
+    /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled
+     * drivers support the required extensions for GLX 1.4.  The extensions
+     * we're assuming are:
+     *
+     *    - GLX_SGI_make_current_read (1.3)
+     *    - GLX_SGIX_fbconfig (1.3)
+     *    - GLX_SGIX_pbuffer (1.3)
+     *    - GLX_ARB_multisample (1.4)
+     */
+    screen->base.GLXmajor = 1;
+    screen->base.GLXminor = 4;
+    
     screen->enterVT = pScrn->EnterVT;
     pScrn->EnterVT = glxDRIEnterVT; 
     screen->leaveVT = pScrn->LeaveVT;
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 19d70d495..9f9c0ed1f 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -360,12 +360,18 @@ void GlxExtensionInit(void)
 	pScreen = screenInfo.screens[i];
 
 	for (p = __glXProviderStack; p != NULL; p = p->next) {
-	    if (p->screenProbe(pScreen) != NULL) {
+	    __GLXscreen *glxScreen;
+
+	    glxScreen = p->screenProbe(pScreen);
+	    if (glxScreen != NULL) {
+	        if (glxScreen->GLXminor < glxMinorVersion)
+		    glxMinorVersion = glxScreen->GLXminor;
 		LogMessage(X_INFO,
 			   "GLX: Initialized %s GL provider for screen %d\n",
 			   p->name, i);
 		break;
 	    }
+
 	}
 
 	if (!p)
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index 7d29d31de..674e2c681 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -42,6 +42,7 @@
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
+#include "protocol-versions.h"
 
 static int glxScreenPrivateKeyIndex;
 static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex;
@@ -162,7 +163,8 @@ static const char GLServerExtensions[] =
 ** supported across all screens in a multi-screen system.
 */
 static char GLXServerVendorName[] = "SGI";
-static char GLXServerVersion[] = "1.2";
+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
 static char GLXServerExtensions[] =
 			"GLX_ARB_multisample "
 			"GLX_EXT_visual_info "
@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
     pGlxScreen->pScreen       = pScreen;
     pGlxScreen->GLextensions  = xstrdup(GLServerExtensions);
     pGlxScreen->GLXvendor     = xstrdup(GLXServerVendorName);
-    pGlxScreen->GLXversion    = xstrdup(GLXServerVersion);
     pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
 
+    /* All GLX providers must support all of the functionality required for at
+     * least GLX 1.2.  If the provider supports a higher version, the GLXminor
+     * version can be changed in the provider's screen-probe routine.  For
+     * most providers, the screen-probe routine is the caller of this
+     * function.
+     */
+    pGlxScreen->GLXmajor      = 1;
+    pGlxScreen->GLXminor      = 2;
+
     pGlxScreen->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = glxCloseScreen;
     pGlxScreen->DestroyWindow = pScreen->DestroyWindow;
@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
 void __glXScreenDestroy(__GLXscreen *screen)
 {
     xfree(screen->GLXvendor);
-    xfree(screen->GLXversion);
     xfree(screen->GLXextensions);
     xfree(screen->GLextensions);
 }
diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h
index 3c1bdd4ba..bff436307 100644
--- a/xorg-server/glx/glxscreens.h
+++ b/xorg-server/glx/glxscreens.h
@@ -161,6 +161,17 @@ struct __GLXscreen {
     char *GLXversion;
     char *GLXextensions;
 
+    /**
+     * \name GLX version supported by this screen.
+     *
+     * Since the GLX version advertised by the server is for the whole server,
+     * the GLX protocol code uses the minimum version supported on all screens.
+     */
+    /*@{*/
+    unsigned GLXmajor;
+    unsigned GLXminor;
+    /*@}*/
+
     Bool (*CloseScreen)(int index, ScreenPtr pScreen);
     Bool (*DestroyWindow)(WindowPtr pWindow);
 };
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index 4aa8c2eec..80f1b28f9 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type,
     GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows,
     GLint alignment);
 
+extern unsigned glxMajorVersion;
+extern unsigned glxMinorVersion;
+
 #endif /* !__GLX_server_h__ */
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 25c6eb30e..5f44d7b1a 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p
 	const GLenum target = *(GLenum *)(pc + 0);
 	const GLint  level  = *(GLint  *)(pc + 4);
 	GLint compsize = 0;
-	char *answer, answerBuffer[200];
+	char *answer = NULL, answerBuffer[200];
 
 	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
 
@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt
 	const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) );
 	const GLint  level =  (GLint ) bswap_32( *(int *)(pc + 4) );
 	GLint compsize = 0;
-	char *answer, answerBuffer[200];
+	char *answer = NULL, answerBuffer[200];
 
 	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
 
diff --git a/xorg-server/hw/Makefile.in b/xorg-server/hw/Makefile.in
index 4048e026c..67d0c8d80 100644
--- a/xorg-server/hw/Makefile.in
+++ b/xorg-server/hw/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -108,7 +108,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -133,7 +132,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -157,6 +155,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -174,8 +173,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -221,7 +218,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -247,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -256,7 +253,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -270,7 +266,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -312,8 +307,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -356,6 +349,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -387,7 +381,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/Makefile.in b/xorg-server/hw/dmx/Makefile.in
index accf378dd..84b6fec10 100644
--- a/xorg-server/hw/dmx/Makefile.in
+++ b/xorg-server/hw/dmx/Makefile.in
@@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -184,7 +184,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -209,7 +208,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -233,6 +231,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -250,8 +249,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -297,7 +294,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -323,6 +319,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -332,7 +329,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -346,7 +342,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -397,8 +392,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -441,6 +434,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -472,7 +466,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/config/Makefile.in b/xorg-server/hw/dmx/config/Makefile.in
index ff7d509e3..00a11b4b2 100644
--- a/xorg-server/hw/dmx/config/Makefile.in
+++ b/xorg-server/hw/dmx/config/Makefile.in
@@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -157,7 +157,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -182,7 +181,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -206,6 +204,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -223,8 +222,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -270,7 +267,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -296,6 +292,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -305,7 +302,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -319,7 +315,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -361,8 +356,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -405,6 +398,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -436,7 +430,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/config/dmxconfig.c b/xorg-server/hw/dmx/config/dmxconfig.c
index 225d89277..a31e5f7f7 100644
--- a/xorg-server/hw/dmx/config/dmxconfig.c
+++ b/xorg-server/hw/dmx/config/dmxconfig.c
@@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void)
      return (char *)(dmx##glob ? dmx##glob : def);                            \
  }
 
-GEN(rules,   XkbRules,   DMX_DEFAULT_XKB_RULES)
-GEN(model,   XkbModel,   DMX_DEFAULT_XKB_MODEL)
-GEN(layout,  XkbLayout,  DMX_DEFAULT_XKB_LAYOUT)
-GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT)
-GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS)
-    
+GEN(rules,   XkbRules,   XKB_DFLT_RULES)
+GEN(model,   XkbModel,   XKB_DFLT_MODEL)
+GEN(layout,  XkbLayout,  XKB_DFLT_LAYOUT)
+GEN(variant, XkbVariant, XKB_DFLT_VARIANT)
+GEN(options, XkbOptions, XKB_DFLT_OPTIONS)
diff --git a/xorg-server/hw/dmx/config/dmxconfig.h b/xorg-server/hw/dmx/config/dmxconfig.h
index 477db4a63..91a6662e3 100644
--- a/xorg-server/hw/dmx/config/dmxconfig.h
+++ b/xorg-server/hw/dmx/config/dmxconfig.h
@@ -36,11 +36,8 @@
 
 #ifndef _DMXCONFIG_H_
 #define _DMXCONFIG_H_
-#define DMX_DEFAULT_XKB_RULES  "base"
-#define DMX_DEFAULT_XKB_MODEL  "pc101"
-#define DMX_DEFAULT_XKB_LAYOUT "us"
-#define DMX_DEFAULT_XKB_VARIANT NULL
-#define DMX_DEFAULT_XKB_OPTIONS NULL
+
+#include <xkb-config.h>
 
 extern void dmxConfigStoreDisplay(const char *display);
 extern void dmxConfigStoreInput(const char *input); /* Core devices */
diff --git a/xorg-server/hw/dmx/config/scanner.c b/xorg-server/hw/dmx/config/scanner.c
index 4735aad54..7cbffab23 100644
--- a/xorg-server/hw/dmx/config/scanner.c
+++ b/xorg-server/hw/dmx/config/scanner.c
@@ -53,7 +53,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -140,7 +141,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -544,7 +553,7 @@ static int gettoken(int token, const char *text, int leng);
 static int getcomment(int token, const char *text, int leng);
 static int lineno = 1;
 
-#line 548 "scanner.c"
+#line 557 "scanner.c"
 
 #define INITIAL 0
 #define OTHER 1
@@ -626,7 +635,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -634,7 +648,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -645,7 +659,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -732,7 +746,7 @@ YY_DECL
     
 #line 62 "scanner.l"
 
-#line 736 "scanner.c"
+#line 750 "scanner.c"
 
 	if ( !(yy_init) )
 		{
@@ -922,7 +936,7 @@ YY_RULE_SETUP
 #line 83 "scanner.l"
 ECHO;
 	YY_BREAK
-#line 926 "scanner.c"
+#line 940 "scanner.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1681,8 +1695,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
diff --git a/xorg-server/hw/dmx/dmx-config.h b/xorg-server/hw/dmx/dmx-config.h
index 9791dc0bc..1fda69f45 100644
--- a/xorg-server/hw/dmx/dmx-config.h
+++ b/xorg-server/hw/dmx/dmx-config.h
@@ -32,7 +32,7 @@
  */
 
 /** \file
- * Provide configuration #define's and #undef's to build Xdmx in X.Org's
+ * Provide configuration define's and undef's to build Xdmx in X.Org's
  * modular source tree.
  */
 
diff --git a/xorg-server/hw/dmx/dmx.c b/xorg-server/hw/dmx/dmx.c
index 1a0c3fea8..b8fbf02f1 100644
--- a/xorg-server/hw/dmx/dmx.c
+++ b/xorg-server/hw/dmx/dmx.c
@@ -37,7 +37,7 @@
  * most all of the useful functions in this file are declared static and
  * do not appear in the doxygen documentation.
  *
- * Much of the low-level work is done by functions in #dmxextension.c
+ * Much of the low-level work is done by functions in \a dmxextension.c
  *
  * Please see the Client-to-Server DMX Extension to the X Protocol
  * document for details about the protocol.  */
diff --git a/xorg-server/hw/dmx/dmxcursor.c b/xorg-server/hw/dmx/dmxcursor.c
index cbadf6292..37e66d758 100644
--- a/xorg-server/hw/dmx/dmxcursor.c
+++ b/xorg-server/hw/dmx/dmxcursor.c
@@ -339,7 +339,7 @@ static void dmxComputeScreenOrigins(void)
 }
 
 /** Recompute origin information in the #dmxScreens list.  This is
- * either called from #dmxInitOrigins() or from #dmxReconfig(). */
+ * called from #dmxInitOrigins. */
 void dmxReInitOrigins(void)
 {
     int        i;
@@ -464,7 +464,7 @@ static int dmxDoesOverlap(DMXScreenInfo *a, DMXScreenInfo *b)
     return 0;
 }
 
-/** Used with #dmxInterateOverlap to print out a list of screens which
+/** Used with \a dmxInterateOverlap to print out a list of screens which
  * overlap each other. */
 static void *dmxPrintOverlap(DMXScreenInfo *dmxScreen, void *closure)
 {
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c
index d367f262c..22660419c 100644
--- a/xorg-server/hw/dmx/dmxextension.c
+++ b/xorg-server/hw/dmx/dmxextension.c
@@ -1516,7 +1516,7 @@ static void dmxBEDestroyScratchGCs(int scrnNum)
 /** Destroy window hierachy on back-end server.  To ensure that all
  *  XDestroyWindow() calls succeed, they must be performed in a bottom
  *  up order so that windows are not destroyed before their children.
- *  XDestroyWindow(), which is called from #dmxBEDestrowWindow(), will
+ *  XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will
  *  destroy a window as well as all of it's children. */
 static void dmxBEDestroyWindowTree(int idx)
 {
diff --git a/xorg-server/hw/dmx/dmxextension.h b/xorg-server/hw/dmx/dmxextension.h
index 342d8c593..5a6fd0e9f 100644
--- a/xorg-server/hw/dmx/dmxextension.h
+++ b/xorg-server/hw/dmx/dmxextension.h
@@ -40,7 +40,7 @@
 #define _DMXEXTENSION_H_
 
 /** Screen attributes.  Used by #ProcDMXGetScreenAttributes and
- * #ProcDMXChangeScreenAttributes. */
+ * \a ProcDMXChangeScreensAttributes. */
 typedef struct {
     const char   *displayName;
     int          logicalScreen;
@@ -59,7 +59,7 @@ typedef struct {
     int          rootWindowYorigin;    /* global coordinate system */
 } DMXScreenAttributesRec, *DMXScreenAttributesPtr;
 
-/** Window attributes.  Used by #ProcDMXGetWidowAttributes. */
+/** Window attributes.  Used by #ProcDMXGetWindowAttributes. */
 typedef struct {
     int          screen;
     Window       window;
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index e5598e331..f481cf5c9 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -846,6 +846,12 @@ void AbortDDX(void)
     }
 }
 
+#ifdef DDXBEFORERESET
+void ddxBeforeReset(void)
+{
+}
+#endif
+
 /** This function is called in Xserver/dix/main.c from \a main() when
  * dispatchException & DE_TERMINATE (which is the only way to exit the
  * main loop without an interruption. */
diff --git a/xorg-server/hw/dmx/dmxinput.c b/xorg-server/hw/dmx/dmxinput.c
index 5203e1a8f..d9118b6a0 100644
--- a/xorg-server/hw/dmx/dmxinput.c
+++ b/xorg-server/hw/dmx/dmxinput.c
@@ -88,7 +88,7 @@ void ProcessInputEvents(void)
             dmxInput->processInputEvents(dmxInput);
 }
 
-/** This routine is called from #dmxwindow.c whenever the layout of
+/** This routine is called from \a dmxwindow.c whenever the layout of
  * windows on the display might have changed.  This information is used
  * by input drivers (currently only the console driver) that provide
  * information about window layout to the user. */
diff --git a/xorg-server/hw/dmx/dmxinput.h b/xorg-server/hw/dmx/dmxinput.h
index c60ce958e..edfff9fa1 100644
--- a/xorg-server/hw/dmx/dmxinput.h
+++ b/xorg-server/hw/dmx/dmxinput.h
@@ -78,7 +78,7 @@ typedef enum {
     DMX_ACTIVESIGIO             /**< Device is currently using SIGIO. */
 } dmxSigioState;
 
-/** DMXInputInfo is typedef'd in #dmx.h so that all routines can have
+/** DMXInputInfo is typedef'd in \a dmx.h so that all routines can have
  * access to the global pointers.  However, the elements are only
  * available to input-related routines. */
 struct _DMXInputInfo {
diff --git a/xorg-server/hw/dmx/dmxstat.c b/xorg-server/hw/dmx/dmxstat.c
index e3c13a623..41b0eb27c 100644
--- a/xorg-server/hw/dmx/dmxstat.c
+++ b/xorg-server/hw/dmx/dmxstat.c
@@ -37,7 +37,7 @@
  * might be necessary.  However, since XSync() requires a two way
  * communication with the other X server, eliminating unnecessary
  * XSync() calls is a key performance optimization.  Support for this
- * optimization is provided in #dmxsync.c.  This file provides routines
+ * optimization is provided in \a dmxsync.c.  This file provides routines
  * that evaluate this optimization by counting the number of XSync()
  * calls and monitoring their latency.  This functionality can be turned
  * on using the -stat command-line parameter. */
@@ -102,7 +102,7 @@ static unsigned long avg(DMXStatAvg *data, unsigned long *max)
  * interval is NULL, 1 will be used.  If \a displays is NULL, 0 will be
  * used (meaning a line for every display will be printed).  Note that
  * this function takes string arguments because it will usually be
- * called from #ddxProcessArgument in #dmxinit.c. */
+ * called from #ddxProcessArgument in \a dmxinit.c. */
 void dmxStatActivate(const char *interval, const char *displays)
 {
     dmxStatInterval = (interval ? atoi(interval) : 1) * 1000;
@@ -135,7 +135,7 @@ static void dmxStatValue(DMXStatAvg *data, unsigned long value)
 /** Note that a XSync() was just done on \a dmxScreen with the \a start
  * and \a stop times (from gettimeofday()) and the number of
  * pending-but-not-yet-processed XSync requests.  This routine is called
- * from #dmxDoSync in #dmxsync.c */
+ * from #dmxDoSync in \a dmxsync.c */
 void dmxStatSync(DMXScreenInfo *dmxScreen,
                  struct timeval *stop, struct timeval *start,
                  unsigned long pending)
diff --git a/xorg-server/hw/dmx/dmxsync.c b/xorg-server/hw/dmx/dmxsync.c
index c1aa43107..2cec1b97c 100644
--- a/xorg-server/hw/dmx/dmxsync.c
+++ b/xorg-server/hw/dmx/dmxsync.c
@@ -38,7 +38,7 @@
  * communication with the other X server, eliminating unnecessary
  * XSync() calls is a key performance optimization.  Support for this
  * optimization is provided here.  Statistics about XSync() calls and
- * latency are gathered in #dmxstat.c.
+ * latency are gathered in \a dmxstat.c.
  *
  * During the initial conversion from calling XSync() immediately to the
  * XSync() batching method implemented in this file, it was noted that,
@@ -111,7 +111,7 @@ static void dmxSyncWakeupHandler(pointer blockData, int result,
  * turn off the default 100mS XSync() batching).
  *
  * Note that the parameter to this routine is a string, since it will
- * usually be called from #ddxProcessArgument in #dmxinit.c */
+ * usually be called from #ddxProcessArgument in \a dmxinit.c */
 void dmxSyncActivate(const char *interval)
 {
     dmxSyncInterval = (interval ? atoi(interval) : 100);
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c
index 24acc08e3..f9e46db1e 100644
--- a/xorg-server/hw/dmx/dmxwindow.c
+++ b/xorg-server/hw/dmx/dmxwindow.c
@@ -116,7 +116,7 @@ Window dmxCreateRootWindow(WindowPtr pWindow)
 }
 
 /** Change the location and size of the "screen" window.  Called from
- *  #dmxReconfigureScreenWindow(). */
+ *  #dmxConfigureScreenWindow(). */
 void dmxResizeScreenWindow(ScreenPtr pScreen,
 			   int x, int y, int w, int h)
 {
@@ -139,7 +139,7 @@ void dmxResizeScreenWindow(ScreenPtr pScreen,
 }
 
 /** Change the location and size of the "root" window.  Called from
- *  #dmxReconfigureRootWindow(). */
+ *  #dmxConfigureRootWindow. */
 void dmxResizeRootWindow(WindowPtr pRoot,
 			 int x, int y, int w, int h)
 {
@@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
 	pWinPriv->windowDestroyed(pWindow);
 #endif
 
-#if 0
     if (pScreen->DestroyWindow)
 	ret = pScreen->DestroyWindow(pWindow);
-#endif
+
     DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen);
 
     return ret;
diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 08a60b811..0fb6e8949 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -51,6 +51,21 @@ noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 endif
 
+if HAVE_DOXYGEN
+
+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
+
+all-local: html/annotated.html
+
+dist-local: html/annotated.html
+
+html/annotated.html: $(DOXYGEN_SRC)
+	$(DOXYGEN) $(srcdir)/doxygen.conf
+
+clean-local:
+	rm -rf html/
+endif
+
 EXTRA_DIST = \
 	$(SGML_FILES) \
 	DMXSpec.txt \
@@ -64,123 +79,116 @@ EXTRA_DIST = \
 	html/annotated.html \
 	html/ChkNotMaskEv_8c.html \
 	html/ChkNotMaskEv_8h.html \
-	html/ChkNotMaskEv_8h-source.html \
+	html/ChkNotMaskEv_8h_source.html \
 	html/classes.html \
 	html/dmx_8h.html \
-	html/dmx_8h-source.html \
+	html/dmx_8h_source.html \
 	html/dmxarg_8c.html \
 	html/dmxarg_8h.html \
-	html/dmxarg_8h-source.html \
+	html/dmxarg_8h_source.html \
 	html/dmxbackend_8c.html \
 	html/dmxbackend_8h.html \
-	html/dmxbackend_8h-source.html \
+	html/dmxbackend_8h_source.html \
 	html/dmxcb_8c.html \
 	html/dmxcb_8h.html \
-	html/dmxcb_8h-source.html \
+	html/dmxcb_8h_source.html \
 	html/dmxclient_8h.html \
-	html/dmxclient_8h-source.html \
+	html/dmxclient_8h_source.html \
 	html/dmxcmap_8c.html \
 	html/dmxcmap_8h.html \
-	html/dmxcmap_8h-source.html \
+	html/dmxcmap_8h_source.html \
 	html/dmxcommon_8c.html \
 	html/dmxcommon_8h.html \
-	html/dmxcommon_8h-source.html \
+	html/dmxcommon_8h_source.html \
 	html/dmxcompat_8c.html \
 	html/dmxcompat_8h.html \
-	html/dmxcompat_8h-source.html \
+	html/dmxcompat_8h_source.html \
 	html/dmxconfig_8c.html \
 	html/dmxconfig_8h.html \
-	html/dmxconfig_8h-source.html \
+	html/dmxconfig_8h_source.html \
 	html/dmxconsole_8c.html \
 	html/dmxconsole_8h.html \
-	html/dmxconsole_8h-source.html \
+	html/dmxconsole_8h_source.html \
 	html/dmxcursor_8c.html \
 	html/dmxcursor_8h.html \
-	html/dmxcursor_8h-source.html \
+	html/dmxcursor_8h_source.html \
 	html/dmxdetach_8c.html \
 	html/dmxdpms_8c.html \
 	html/dmxdpms_8h.html \
-	html/dmxdpms_8h-source.html \
+	html/dmxdpms_8h_source.html \
 	html/dmxdummy_8c.html \
 	html/dmxdummy_8h.html \
-	html/dmxdummy_8h-source.html \
-	html/dmxeq_8c.html \
-	html/dmxeq_8h.html \
-	html/dmxeq_8h-source.html \
+	html/dmxdummy_8h_source.html \
 	html/dmxevents_8c.html \
 	html/dmxevents_8h.html \
-	html/dmxevents_8h-source.html \
-	html/dmxext_8h.html \
-	html/dmxext_8h-source.html \
+	html/dmxevents_8h_source.html \
 	html/dmxextension_8c.html \
 	html/dmxextension_8h.html \
-	html/dmxextension_8h-source.html \
+	html/dmxextension_8h_source.html \
 	html/dmxfont_8c.html \
 	html/dmxfont_8h.html \
-	html/dmxfont_8h-source.html \
+	html/dmxfont_8h_source.html \
 	html/dmxgc_8c.html \
 	html/dmxgc_8h.html \
-	html/dmxgc_8h-source.html \
+	html/dmxgc_8h_source.html \
 	html/dmxgcops_8c.html \
 	html/dmxgcops_8h.html \
-	html/dmxgcops_8h-source.html \
-	html/dmx__glxvisuals_8h-source.html \
+	html/dmxgcops_8h_source.html \
+	html/dmx__glxvisuals_8h_source.html \
 	html/dmxinit_8c.html \
 	html/dmxinit_8h.html \
-	html/dmxinit_8h-source.html \
+	html/dmxinit_8h_source.html \
 	html/dmxinput_8c.html \
 	html/dmxinput_8h.html \
-	html/dmxinput_8h-source.html \
+	html/dmxinput_8h_source.html \
 	html/dmxinputinit_8c.html \
 	html/dmxinputinit_8h.html \
-	html/dmxinputinit_8h-source.html \
+	html/dmxinputinit_8h_source.html \
 	html/dmxlog_8c.html \
 	html/dmxlog_8h.html \
-	html/dmxlog_8h-source.html \
+	html/dmxlog_8h_source.html \
 	html/dmxmap_8c.html \
 	html/dmxmap_8h.html \
-	html/dmxmap_8h-source.html \
+	html/dmxmap_8h_source.html \
 	html/dmxmotion_8c.html \
 	html/dmxmotion_8h.html \
-	html/dmxmotion_8h-source.html \
+	html/dmxmotion_8h_source.html \
 	html/dmxparse_8c.html \
 	html/dmxparse_8h.html \
-	html/dmxparse_8h-source.html \
+	html/dmxparse_8h_source.html \
 	html/dmxpict_8c.html \
 	html/dmxpict_8h.html \
-	html/dmxpict_8h-source.html \
+	html/dmxpict_8h_source.html \
 	html/dmxpixmap_8c.html \
 	html/dmxpixmap_8h.html \
-	html/dmxpixmap_8h-source.html \
+	html/dmxpixmap_8h_source.html \
 	html/dmxprint_8c.html \
 	html/dmxprint_8h.html \
-	html/dmxprint_8h-source.html \
+	html/dmxprint_8h_source.html \
 	html/dmxprop_8c.html \
 	html/dmxprop_8h.html \
-	html/dmxprop_8h-source.html \
-	html/dmxproto_8h.html \
-	html/dmxproto_8h-source.html \
+	html/dmxprop_8h_source.html \
 	html/dmxscrinit_8c.html \
 	html/dmxscrinit_8h.html \
-	html/dmxscrinit_8h-source.html \
+	html/dmxscrinit_8h_source.html \
 	html/dmxshadow_8c.html \
 	html/dmxshadow_8h.html \
-	html/dmxshadow_8h-source.html \
+	html/dmxshadow_8h_source.html \
 	html/dmxsigio_8c.html \
 	html/dmxsigio_8h.html \
-	html/dmxsigio_8h-source.html \
+	html/dmxsigio_8h_source.html \
 	html/dmxstat_8c.html \
 	html/dmxstat_8h.html \
-	html/dmxstat_8h-source.html \
+	html/dmxstat_8h_source.html \
 	html/dmxsync_8c.html \
 	html/dmxsync_8h.html \
-	html/dmxsync_8h-source.html \
+	html/dmxsync_8h_source.html \
 	html/dmxvisual_8c.html \
 	html/dmxvisual_8h.html \
-	html/dmxvisual_8h-source.html \
+	html/dmxvisual_8h_source.html \
 	html/dmxwindow_8c.html \
 	html/dmxwindow_8h.html \
-	html/dmxwindow_8h-source.html \
+	html/dmxwindow_8h_source.html \
 	html/dmxxinput_8c.html \
 	html/doxygen.css \
 	html/doxygen.png \
@@ -207,18 +215,16 @@ EXTRA_DIST = \
 	html/globals_type.html \
 	html/globals_vars.html \
 	html/index.html \
-	html/lib_2dmx_2dmx_8c.html \
 	html/lnx-keyboard_8c.html \
 	html/lnx-keyboard_8h.html \
-	html/lnx-keyboard_8h-source.html \
+	html/lnx-keyboard_8h_source.html \
 	html/lnx-ms_8c.html \
 	html/lnx-ms_8h.html \
-	html/lnx-ms_8h-source.html \
+	html/lnx-ms_8h_source.html \
 	html/lnx-ps2_8c.html \
 	html/lnx-ps2_8h.html \
-	html/lnx-ps2_8h-source.html \
+	html/lnx-ps2_8h_source.html \
 	html/main.html \
-	html/programs_2Xserver_2Xext_2dmx_8c.html \
 	html/struct__dmxArg.html \
 	html/struct__dmxColormapPriv.html \
 	html/structDMXConfigCmdStruct.html \
@@ -238,73 +244,47 @@ EXTRA_DIST = \
 	html/struct__DMXConfigVirtual.html \
 	html/struct__DMXConfigWall.html \
 	html/struct__dmxCursorPriv.html \
-	html/structDMXDesktopAttributes.html \
 	html/structDMXDesktopAttributesRec.html \
 	html/struct__DMXEventMap.html \
 	html/struct__dmxFontPriv.html \
 	html/struct__dmxGCPriv.html \
 	html/structdmxGlxVisualPrivate.html \
 	html/struct__dmxGlyphPriv.html \
-	html/structDMXInputAttributes.html \
 	html/structDMXInputAttributesRec.html \
 	html/struct__DMXInputInfo.html \
 	html/struct__DMXLocalInitInfo.html \
 	html/struct__DMXLocalInputInfo.html \
 	html/struct__dmxPictPriv.html \
 	html/struct__dmxPixPriv.html \
-	html/structDMXScreenAttributes.html \
 	html/structDMXScreenAttributesRec.html \
 	html/struct__DMXScreenInfo.html \
 	html/struct__DMXStatAvg.html \
 	html/struct__DMXStatInfo.html \
-	html/structDMXWindowAttributes.html \
 	html/structDMXWindowAttributesRec.html \
 	html/struct__dmxWinPriv.html \
-	html/struct__Event.html \
-	html/struct__EventQueue.html \
 	html/struct__myPrivate.html \
-	html/structxDMXAddInputReply.html \
-	html/structxDMXAddInputReq.html \
-	html/structxDMXAddScreenReply.html \
-	html/structxDMXAddScreenReq.html \
-	html/structxDMXChangeDesktopAttributesReply.html \
-	html/structxDMXChangeDesktopAttributesReq.html \
-	html/structxDMXChangeScreensAttributesReply.html \
-	html/structxDMXChangeScreensAttributesReq.html \
-	html/structxDMXForceWindowCreationReply.html \
-	html/structxDMXForceWindowCreationReq.html \
-	html/structxDMXGetDesktopAttributesReply.html \
-	html/structxDMXGetDesktopAttributesReq.html \
-	html/structxDMXGetInputAttributesReply.html \
-	html/structxDMXGetInputAttributesReq.html \
-	html/structxDMXGetInputCountReply.html \
-	html/structxDMXGetInputCountReq.html \
-	html/structxDMXGetScreenAttributesReply.html \
-	html/structxDMXGetScreenAttributesReq.html \
-	html/structxDMXGetScreenCountReply.html \
-	html/structxDMXGetScreenCountReq.html \
-	html/structxDMXGetWindowAttributesReply.html \
-	html/structxDMXGetWindowAttributesReq.html \
-	html/structxDMXQueryVersionReply.html \
-	html/structxDMXQueryVersionReq.html \
-	html/structxDMXRemoveInputReply.html \
-	html/structxDMXRemoveInputReq.html \
-	html/structxDMXRemoveScreenReply.html \
-	html/structxDMXRemoveScreenReq.html \
-	html/structxDMXSyncReply.html \
-	html/structxDMXSyncReq.html \
 	html/tree.html \
 	html/usb-common_8c.html \
 	html/usb-common_8h.html \
-	html/usb-common_8h-source.html \
+	html/usb-common_8h_source.html \
 	html/usb-keyboard_8c.html \
 	html/usb-keyboard_8h.html \
-	html/usb-keyboard_8h-source.html \
+	html/usb-keyboard_8h_source.html \
 	html/usb-mouse_8c.html \
 	html/usb-mouse_8h.html \
-	html/usb-mouse_8h-source.html \
+	html/usb-mouse_8h_source.html \
 	html/usb-other_8c.html \
 	html/usb-other_8h.html \
-	html/usb-other_8h-source.html \
+	html/usb-other_8h_source.html \
 	html/usb-private_8h.html \
-	html/usb-private_8h-source.html
+	html/usb-private_8h_source.html
+
+$(builddir)/doxygen.head:
+	$(LN_S) $(srcdir)/doxygen.head $@
+
+$(builddir)/doxygen.foot:
+	$(LN_S) $(srcdir)/doxygen.foot $@
+
+$(builddir)doxygen.css:
+	$(LN_S) $(srcdir)/doxygen.css $@
+
diff --git a/xorg-server/hw/dmx/doc/Makefile.in b/xorg-server/hw/dmx/doc/Makefile.in
index 0fcef8ffa..95f7febd0 100644
--- a/xorg-server/hw/dmx/doc/Makefile.in
+++ b/xorg-server/hw/dmx/doc/Makefile.in
@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +92,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -117,7 +116,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -141,6 +139,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -158,8 +157,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -205,7 +202,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -231,6 +227,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -240,7 +237,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -254,7 +250,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -296,8 +291,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -340,6 +333,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -371,7 +365,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -387,6 +380,7 @@ SGML_FILES = dmx.sgml scaled.sgml
 @BUILD_LINUXDOC_TRUE@SUFFIXES = .sgml .txt .html .ps .pdf
 @BUILD_LINUXDOC_TRUE@noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 @BUILD_LINUXDOC_TRUE@CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
+@HAVE_DOXYGEN_TRUE@DOXYGEN_SRC = doxygen.head doxygen.foot doxygen.css doxygen.conf
 EXTRA_DIST = \
 	$(SGML_FILES) \
 	DMXSpec.txt \
@@ -400,123 +394,116 @@ EXTRA_DIST = \
 	html/annotated.html \
 	html/ChkNotMaskEv_8c.html \
 	html/ChkNotMaskEv_8h.html \
-	html/ChkNotMaskEv_8h-source.html \
+	html/ChkNotMaskEv_8h_source.html \
 	html/classes.html \
 	html/dmx_8h.html \
-	html/dmx_8h-source.html \
+	html/dmx_8h_source.html \
 	html/dmxarg_8c.html \
 	html/dmxarg_8h.html \
-	html/dmxarg_8h-source.html \
+	html/dmxarg_8h_source.html \
 	html/dmxbackend_8c.html \
 	html/dmxbackend_8h.html \
-	html/dmxbackend_8h-source.html \
+	html/dmxbackend_8h_source.html \
 	html/dmxcb_8c.html \
 	html/dmxcb_8h.html \
-	html/dmxcb_8h-source.html \
+	html/dmxcb_8h_source.html \
 	html/dmxclient_8h.html \
-	html/dmxclient_8h-source.html \
+	html/dmxclient_8h_source.html \
 	html/dmxcmap_8c.html \
 	html/dmxcmap_8h.html \
-	html/dmxcmap_8h-source.html \
+	html/dmxcmap_8h_source.html \
 	html/dmxcommon_8c.html \
 	html/dmxcommon_8h.html \
-	html/dmxcommon_8h-source.html \
+	html/dmxcommon_8h_source.html \
 	html/dmxcompat_8c.html \
 	html/dmxcompat_8h.html \
-	html/dmxcompat_8h-source.html \
+	html/dmxcompat_8h_source.html \
 	html/dmxconfig_8c.html \
 	html/dmxconfig_8h.html \
-	html/dmxconfig_8h-source.html \
+	html/dmxconfig_8h_source.html \
 	html/dmxconsole_8c.html \
 	html/dmxconsole_8h.html \
-	html/dmxconsole_8h-source.html \
+	html/dmxconsole_8h_source.html \
 	html/dmxcursor_8c.html \
 	html/dmxcursor_8h.html \
-	html/dmxcursor_8h-source.html \
+	html/dmxcursor_8h_source.html \
 	html/dmxdetach_8c.html \
 	html/dmxdpms_8c.html \
 	html/dmxdpms_8h.html \
-	html/dmxdpms_8h-source.html \
+	html/dmxdpms_8h_source.html \
 	html/dmxdummy_8c.html \
 	html/dmxdummy_8h.html \
-	html/dmxdummy_8h-source.html \
-	html/dmxeq_8c.html \
-	html/dmxeq_8h.html \
-	html/dmxeq_8h-source.html \
+	html/dmxdummy_8h_source.html \
 	html/dmxevents_8c.html \
 	html/dmxevents_8h.html \
-	html/dmxevents_8h-source.html \
-	html/dmxext_8h.html \
-	html/dmxext_8h-source.html \
+	html/dmxevents_8h_source.html \
 	html/dmxextension_8c.html \
 	html/dmxextension_8h.html \
-	html/dmxextension_8h-source.html \
+	html/dmxextension_8h_source.html \
 	html/dmxfont_8c.html \
 	html/dmxfont_8h.html \
-	html/dmxfont_8h-source.html \
+	html/dmxfont_8h_source.html \
 	html/dmxgc_8c.html \
 	html/dmxgc_8h.html \
-	html/dmxgc_8h-source.html \
+	html/dmxgc_8h_source.html \
 	html/dmxgcops_8c.html \
 	html/dmxgcops_8h.html \
-	html/dmxgcops_8h-source.html \
-	html/dmx__glxvisuals_8h-source.html \
+	html/dmxgcops_8h_source.html \
+	html/dmx__glxvisuals_8h_source.html \
 	html/dmxinit_8c.html \
 	html/dmxinit_8h.html \
-	html/dmxinit_8h-source.html \
+	html/dmxinit_8h_source.html \
 	html/dmxinput_8c.html \
 	html/dmxinput_8h.html \
-	html/dmxinput_8h-source.html \
+	html/dmxinput_8h_source.html \
 	html/dmxinputinit_8c.html \
 	html/dmxinputinit_8h.html \
-	html/dmxinputinit_8h-source.html \
+	html/dmxinputinit_8h_source.html \
 	html/dmxlog_8c.html \
 	html/dmxlog_8h.html \
-	html/dmxlog_8h-source.html \
+	html/dmxlog_8h_source.html \
 	html/dmxmap_8c.html \
 	html/dmxmap_8h.html \
-	html/dmxmap_8h-source.html \
+	html/dmxmap_8h_source.html \
 	html/dmxmotion_8c.html \
 	html/dmxmotion_8h.html \
-	html/dmxmotion_8h-source.html \
+	html/dmxmotion_8h_source.html \
 	html/dmxparse_8c.html \
 	html/dmxparse_8h.html \
-	html/dmxparse_8h-source.html \
+	html/dmxparse_8h_source.html \
 	html/dmxpict_8c.html \
 	html/dmxpict_8h.html \
-	html/dmxpict_8h-source.html \
+	html/dmxpict_8h_source.html \
 	html/dmxpixmap_8c.html \
 	html/dmxpixmap_8h.html \
-	html/dmxpixmap_8h-source.html \
+	html/dmxpixmap_8h_source.html \
 	html/dmxprint_8c.html \
 	html/dmxprint_8h.html \
-	html/dmxprint_8h-source.html \
+	html/dmxprint_8h_source.html \
 	html/dmxprop_8c.html \
 	html/dmxprop_8h.html \
-	html/dmxprop_8h-source.html \
-	html/dmxproto_8h.html \
-	html/dmxproto_8h-source.html \
+	html/dmxprop_8h_source.html \
 	html/dmxscrinit_8c.html \
 	html/dmxscrinit_8h.html \
-	html/dmxscrinit_8h-source.html \
+	html/dmxscrinit_8h_source.html \
 	html/dmxshadow_8c.html \
 	html/dmxshadow_8h.html \
-	html/dmxshadow_8h-source.html \
+	html/dmxshadow_8h_source.html \
 	html/dmxsigio_8c.html \
 	html/dmxsigio_8h.html \
-	html/dmxsigio_8h-source.html \
+	html/dmxsigio_8h_source.html \
 	html/dmxstat_8c.html \
 	html/dmxstat_8h.html \
-	html/dmxstat_8h-source.html \
+	html/dmxstat_8h_source.html \
 	html/dmxsync_8c.html \
 	html/dmxsync_8h.html \
-	html/dmxsync_8h-source.html \
+	html/dmxsync_8h_source.html \
 	html/dmxvisual_8c.html \
 	html/dmxvisual_8h.html \
-	html/dmxvisual_8h-source.html \
+	html/dmxvisual_8h_source.html \
 	html/dmxwindow_8c.html \
 	html/dmxwindow_8h.html \
-	html/dmxwindow_8h-source.html \
+	html/dmxwindow_8h_source.html \
 	html/dmxxinput_8c.html \
 	html/doxygen.css \
 	html/doxygen.png \
@@ -543,18 +530,16 @@ EXTRA_DIST = \
 	html/globals_type.html \
 	html/globals_vars.html \
 	html/index.html \
-	html/lib_2dmx_2dmx_8c.html \
 	html/lnx-keyboard_8c.html \
 	html/lnx-keyboard_8h.html \
-	html/lnx-keyboard_8h-source.html \
+	html/lnx-keyboard_8h_source.html \
 	html/lnx-ms_8c.html \
 	html/lnx-ms_8h.html \
-	html/lnx-ms_8h-source.html \
+	html/lnx-ms_8h_source.html \
 	html/lnx-ps2_8c.html \
 	html/lnx-ps2_8h.html \
-	html/lnx-ps2_8h-source.html \
+	html/lnx-ps2_8h_source.html \
 	html/main.html \
-	html/programs_2Xserver_2Xext_2dmx_8c.html \
 	html/struct__dmxArg.html \
 	html/struct__dmxColormapPriv.html \
 	html/structDMXConfigCmdStruct.html \
@@ -574,76 +559,40 @@ EXTRA_DIST = \
 	html/struct__DMXConfigVirtual.html \
 	html/struct__DMXConfigWall.html \
 	html/struct__dmxCursorPriv.html \
-	html/structDMXDesktopAttributes.html \
 	html/structDMXDesktopAttributesRec.html \
 	html/struct__DMXEventMap.html \
 	html/struct__dmxFontPriv.html \
 	html/struct__dmxGCPriv.html \
 	html/structdmxGlxVisualPrivate.html \
 	html/struct__dmxGlyphPriv.html \
-	html/structDMXInputAttributes.html \
 	html/structDMXInputAttributesRec.html \
 	html/struct__DMXInputInfo.html \
 	html/struct__DMXLocalInitInfo.html \
 	html/struct__DMXLocalInputInfo.html \
 	html/struct__dmxPictPriv.html \
 	html/struct__dmxPixPriv.html \
-	html/structDMXScreenAttributes.html \
 	html/structDMXScreenAttributesRec.html \
 	html/struct__DMXScreenInfo.html \
 	html/struct__DMXStatAvg.html \
 	html/struct__DMXStatInfo.html \
-	html/structDMXWindowAttributes.html \
 	html/structDMXWindowAttributesRec.html \
 	html/struct__dmxWinPriv.html \
-	html/struct__Event.html \
-	html/struct__EventQueue.html \
 	html/struct__myPrivate.html \
-	html/structxDMXAddInputReply.html \
-	html/structxDMXAddInputReq.html \
-	html/structxDMXAddScreenReply.html \
-	html/structxDMXAddScreenReq.html \
-	html/structxDMXChangeDesktopAttributesReply.html \
-	html/structxDMXChangeDesktopAttributesReq.html \
-	html/structxDMXChangeScreensAttributesReply.html \
-	html/structxDMXChangeScreensAttributesReq.html \
-	html/structxDMXForceWindowCreationReply.html \
-	html/structxDMXForceWindowCreationReq.html \
-	html/structxDMXGetDesktopAttributesReply.html \
-	html/structxDMXGetDesktopAttributesReq.html \
-	html/structxDMXGetInputAttributesReply.html \
-	html/structxDMXGetInputAttributesReq.html \
-	html/structxDMXGetInputCountReply.html \
-	html/structxDMXGetInputCountReq.html \
-	html/structxDMXGetScreenAttributesReply.html \
-	html/structxDMXGetScreenAttributesReq.html \
-	html/structxDMXGetScreenCountReply.html \
-	html/structxDMXGetScreenCountReq.html \
-	html/structxDMXGetWindowAttributesReply.html \
-	html/structxDMXGetWindowAttributesReq.html \
-	html/structxDMXQueryVersionReply.html \
-	html/structxDMXQueryVersionReq.html \
-	html/structxDMXRemoveInputReply.html \
-	html/structxDMXRemoveInputReq.html \
-	html/structxDMXRemoveScreenReply.html \
-	html/structxDMXRemoveScreenReq.html \
-	html/structxDMXSyncReply.html \
-	html/structxDMXSyncReq.html \
 	html/tree.html \
 	html/usb-common_8c.html \
 	html/usb-common_8h.html \
-	html/usb-common_8h-source.html \
+	html/usb-common_8h_source.html \
 	html/usb-keyboard_8c.html \
 	html/usb-keyboard_8h.html \
-	html/usb-keyboard_8h-source.html \
+	html/usb-keyboard_8h_source.html \
 	html/usb-mouse_8c.html \
 	html/usb-mouse_8h.html \
-	html/usb-mouse_8h-source.html \
+	html/usb-mouse_8h_source.html \
 	html/usb-other_8c.html \
 	html/usb-other_8h.html \
-	html/usb-other_8h-source.html \
+	html/usb-other_8h_source.html \
 	html/usb-private_8h.html \
-	html/usb-private_8h-source.html
+	html/usb-private_8h_source.html
 
 all: all-am
 
@@ -724,7 +673,8 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA)
+@HAVE_DOXYGEN_FALSE@all-local:
+all-am: Makefile $(DATA) all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -752,9 +702,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@HAVE_DOXYGEN_FALSE@clean-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -820,16 +771,17 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am
 
 
 @BUILD_LINUXDOC_TRUE@.sgml.txt:
@@ -848,6 +800,25 @@ uninstall-am:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
 @BUILD_LINUXDOC_TRUE@	$(MAKE_HTML) $<
 
+@HAVE_DOXYGEN_TRUE@all-local: html/annotated.html
+
+@HAVE_DOXYGEN_TRUE@dist-local: html/annotated.html
+
+@HAVE_DOXYGEN_TRUE@html/annotated.html: $(DOXYGEN_SRC)
+@HAVE_DOXYGEN_TRUE@	$(DOXYGEN) $(srcdir)/doxygen.conf
+
+@HAVE_DOXYGEN_TRUE@clean-local:
+@HAVE_DOXYGEN_TRUE@	rm -rf html/
+
+$(builddir)/doxygen.head:
+	$(LN_S) $(srcdir)/doxygen.head $@
+
+$(builddir)/doxygen.foot:
+	$(LN_S) $(srcdir)/doxygen.foot $@
+
+$(builddir)doxygen.css:
+	$(LN_S) $(srcdir)/doxygen.css $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/xorg-server/hw/dmx/doc/doxygen.conf b/xorg-server/hw/dmx/doc/doxygen.conf
index 5b706b6d6..f7a541f90 100644
--- a/xorg-server/hw/dmx/doc/doxygen.conf
+++ b/xorg-server/hw/dmx/doc/doxygen.conf
@@ -43,16 +43,6 @@ OUTPUT_DIRECTORY       =
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -115,13 +105,6 @@ JAVADOC_AUTOBRIEF      = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # reimplements.
@@ -180,7 +163,7 @@ SUBGROUPING            = YES
 # Private class members and static file members will be hidden unless 
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
@@ -190,7 +173,7 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
@@ -363,11 +346,7 @@ WARN_LOGFILE           =
 
 INPUT                  = .. \
                          ../input \
-                         ../config \
-                         ../../../Xext/dmx.c \
-                         ../../../../../include/extensions/dmxproto.h \
-                         ../../../../../include/extensions/dmxext.h \
-                         ../../../../../lib/dmx
+                         ../config
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -1041,22 +1020,6 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
 # from the root by following a path via at most 3 edges will be shown. Nodes that 
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html
index 29fc27d63..fffd19f23 100644
--- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html
+++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8c.html
@@ -6,62 +6,89 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>ChkNotMaskEv.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="ChkNotMaskEv_8h-source.html">ChkNotMaskEv.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="ChkNotMaskEv_8c.html#a2">XCheckNotMaskEvent</a> (Display *dpy, long mask, XEvent *event)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>ChkNotMaskEv.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="ChkNotMaskEv_8h_source.html">ChkNotMaskEv.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="ChkNotMaskEv_8c.html#a492aa70992c986ae525318a29678c4bb">XCheckNotMaskEvent</a> (Display *dpy, long mask, XEvent *event)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">long const&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">_Xevent_to_mask</a> []</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides a <a class="el" href="ChkNotMaskEv_8h.html#a0">XCheckNotMaskEvent</a> function that is derived from the standard Xlib XCheckMaskEvent function.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="ChkNotMaskEv.c::XCheckNotMaskEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides a <a class="el" href="ChkNotMaskEv_8h.html#a492aa70992c986ae525318a29678c4bb">XCheckNotMaskEvent</a> function that is derived from the standard Xlib XCheckMaskEvent function. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a492aa70992c986ae525318a29678c4bb"></a><!-- doxytag: member="ChkNotMaskEv.c::XCheckNotMaskEvent" ref="a492aa70992c986ae525318a29678c4bb" args="(Display *dpy, long mask, XEvent *event)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool XCheckNotMaskEvent </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
+          <td class="memname">Bool XCheckNotMaskEvent </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
+          <td class="paramtype">long&nbsp;</td>
+          <td class="paramname"> <em>mask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>XEvent *&nbsp;</td>
-          <td class="mdname" nowrap> <em>event</em></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>event</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found. </p>
+
+<p>References <a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">_Xevent_to_mask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00159">dmxBackendTestEvents()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a653c12c824c0297b32b16e69fdc6b1a5"></a><!-- doxytag: member="ChkNotMaskEv.c::_Xevent_to_mask" ref="a653c12c824c0297b32b16e69fdc6b1a5" args="[]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">long const <a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">_Xevent_to_mask</a>[]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="ChkNotMaskEv_8c_source.html#l00070">XCheckNotMaskEvent()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html
deleted file mode 100644
index 4a4fc4c52..000000000
--- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h-source.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>ChkNotMaskEv.h</h1><a href="ChkNotMaskEv_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _CHKNOTMASKEV_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _CHKNOTMASKEV_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> Bool <a class="code" href="ChkNotMaskEv_8c.html#a2">XCheckNotMaskEvent</a> (Display *dpy, <span class="keywordtype">long</span> mask, XEvent *event);
-00041 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html
index 658c94d9f..c06558216 100644
--- a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html
+++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h.html
@@ -6,63 +6,72 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>ChkNotMaskEv.h File Reference</h1>
-<p>
-<a href="ChkNotMaskEv_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="ChkNotMaskEv_8h.html#a0">XCheckNotMaskEvent</a> (Display *dpy, long mask, XEvent *event)</td></tr>
-
+<p><a href="ChkNotMaskEv_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="ChkNotMaskEv_8h.html#a492aa70992c986ae525318a29678c4bb">XCheckNotMaskEvent</a> (Display *dpy, long mask, XEvent *event)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for <a class="el" href="ChkNotMaskEv_8h.html#a0">XCheckNotMaskEvent</a> function. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="ChkNotMaskEv_8c.html">ChkNotMaskEv.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="ChkNotMaskEv.h::XCheckNotMaskEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for <a class="el" href="ChkNotMaskEv_8h.html#a492aa70992c986ae525318a29678c4bb">XCheckNotMaskEvent</a> function. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="ChkNotMaskEv_8c.html">ChkNotMaskEv.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a492aa70992c986ae525318a29678c4bb"></a><!-- doxytag: member="ChkNotMaskEv.h::XCheckNotMaskEvent" ref="a492aa70992c986ae525318a29678c4bb" args="(Display *dpy, long mask, XEvent *event)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool XCheckNotMaskEvent </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
+          <td class="memname">Bool XCheckNotMaskEvent </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
+          <td class="paramtype">long&nbsp;</td>
+          <td class="paramname"> <em>mask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>XEvent *&nbsp;</td>
-          <td class="mdname" nowrap> <em>event</em></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>event</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found. </p>
 
-<p>
-Check existing events in queue to find if any match. If so, return. If not, flush buffer and see if any more events are readable. If one matches, return. If all else fails, tell the user no events found.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">_Xevent_to_mask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00159">dmxBackendTestEvents()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html
new file mode 100644
index 000000000..d48888718
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/ChkNotMaskEv_8h_source.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>ChkNotMaskEv.h</h1><a href="ChkNotMaskEv_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _CHKNOTMASKEV_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _CHKNOTMASKEV_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> Bool <a class="code" href="ChkNotMaskEv_8c.html#a492aa70992c986ae525318a29678c4bb">XCheckNotMaskEvent</a> (Display *dpy, <span class="keywordtype">long</span> mask, XEvent *event);
+<a name="l00040"></a>00040 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/annotated.html b/xorg-server/hw/dmx/doc/html/annotated.html
index 0bd5e9c98..88ce7d6df 100644
--- a/xorg-server/hw/dmx/doc/html/annotated.html
+++ b/xorg-server/hw/dmx/doc/html/annotated.html
@@ -6,9 +6,25 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>Distributed Multihead X Data Structures</h1>Here are the data structures with brief descriptions:<table>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="struct__dmxArg.html">_dmxArg</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a></td><td class="indexvalue"></td></tr>
@@ -39,51 +55,17 @@
   <tr><td class="indexkey"><a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="struct__Event.html">_Event</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="struct__EventQueue.html">_EventQueue</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structdmxGlxVisualPrivate.html">dmxGlxVisualPrivate</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXAddInputReply.html">xDMXAddInputReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXAddInputReq.html">xDMXAddInputReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXAddScreenReply.html">xDMXAddScreenReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXAddScreenReq.html">xDMXAddScreenReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXChangeDesktopAttributesReply.html">xDMXChangeDesktopAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXChangeDesktopAttributesReq.html">xDMXChangeDesktopAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXChangeScreensAttributesReply.html">xDMXChangeScreensAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXChangeScreensAttributesReq.html">xDMXChangeScreensAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXForceWindowCreationReply.html">xDMXForceWindowCreationReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXForceWindowCreationReq.html">xDMXForceWindowCreationReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetDesktopAttributesReply.html">xDMXGetDesktopAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetDesktopAttributesReq.html">xDMXGetDesktopAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetInputAttributesReply.html">xDMXGetInputAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetInputAttributesReq.html">xDMXGetInputAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetInputCountReply.html">xDMXGetInputCountReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetInputCountReq.html">xDMXGetInputCountReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetScreenAttributesReply.html">xDMXGetScreenAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetScreenAttributesReq.html">xDMXGetScreenAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetScreenCountReply.html">xDMXGetScreenCountReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetScreenCountReq.html">xDMXGetScreenCountReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetWindowAttributesReply.html">xDMXGetWindowAttributesReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXGetWindowAttributesReq.html">xDMXGetWindowAttributesReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXQueryVersionReply.html">xDMXQueryVersionReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXQueryVersionReq.html">xDMXQueryVersionReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXRemoveInputReply.html">xDMXRemoveInputReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXRemoveInputReq.html">xDMXRemoveInputReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXRemoveScreenReply.html">xDMXRemoveScreenReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXRemoveScreenReq.html">xDMXRemoveScreenReq</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXSyncReply.html">xDMXSyncReply</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structxDMXSyncReq.html">xDMXSyncReq</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstack.html">stack</a></td><td class="indexvalue"></td></tr>
 </table>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/classes.html b/xorg-server/hw/dmx/doc/html/classes.html
index d6632fb09..b7b6b8d3b 100644
--- a/xorg-server/hw/dmx/doc/html/classes.html
+++ b/xorg-server/hw/dmx/doc/html/classes.html
@@ -6,13 +6,32 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindexHL" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>Distributed Multihead X Data Structure Index</h1><table align=center width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__EventQueue.html">_EventQueue</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXAddInputReply.html">xDMXAddInputReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetInputCountReq.html">xDMXGetInputCountReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__dmxArg.html">_dmxArg</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXAddInputReq.html">xDMXAddInputReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetScreenAttributesReply.html">xDMXGetScreenAttributesReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>&nbsp;&nbsp;&nbsp;</td><td><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="structxDMXAddScreenReply.html">xDMXAddScreenReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetScreenAttributesReq.html">xDMXGetScreenAttributesReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXAddScreenReq.html">xDMXAddScreenReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetScreenCountReply.html">xDMXGetScreenCountReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXChangeDesktopAttributesReply.html">xDMXChangeDesktopAttributesReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetScreenCountReq.html">xDMXGetScreenCountReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXChangeDesktopAttributesReq.html">xDMXChangeDesktopAttributesReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetWindowAttributesReply.html">xDMXGetWindowAttributesReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXChangeScreensAttributesReply.html">xDMXChangeScreensAttributesReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetWindowAttributesReq.html">xDMXGetWindowAttributesReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structdmxGlxVisualPrivate.html">dmxGlxVisualPrivate</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXChangeScreensAttributesReq.html">xDMXChangeScreensAttributesReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXQueryVersionReply.html">xDMXQueryVersionReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXForceWindowCreationReply.html">xDMXForceWindowCreationReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXQueryVersionReq.html">xDMXQueryVersionReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXForceWindowCreationReq.html">xDMXForceWindowCreationReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXRemoveInputReply.html">xDMXRemoveInputReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetDesktopAttributesReply.html">xDMXGetDesktopAttributesReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXRemoveInputReq.html">xDMXRemoveInputReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetDesktopAttributesReq.html">xDMXGetDesktopAttributesReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXRemoveScreenReply.html">xDMXRemoveScreenReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetInputAttributesReply.html">xDMXGetInputAttributesReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXRemoveScreenReq.html">xDMXRemoveScreenReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXGetInputAttributesReq.html">xDMXGetInputAttributesReq</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXSyncReply.html">xDMXSyncReply</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>&nbsp;&nbsp;&nbsp;</td><td><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;X&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="structxDMXGetInputCountReply.html">xDMXGetInputCountReply</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structxDMXSyncReq.html">xDMXSyncReq</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__Event.html">_Event</a>&nbsp;&nbsp;&nbsp;</td></tr></table>    <hr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>Data Structure Index</h1><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div>
+<table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
+<tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstack.html">stack</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxArg.html">_dmxArg</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdmxGlxVisualPrivate.html">dmxGlxVisualPrivate</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>&nbsp;&nbsp;&nbsp;</td></tr></table><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div>
+</div>
+    <hr>
     <address>
       <small>
         Generated June 29, 2004 for <a
diff --git a/xorg-server/hw/dmx/doc/html/dmx_8h-source.html b/xorg-server/hw/dmx/doc/html/dmx_8h-source.html
deleted file mode 100644
index 3dc9b85ac..000000000
--- a/xorg-server/hw/dmx/doc/html/dmx_8h-source.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmx.h</h1><a href="dmx_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
-00033 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00034 <span class="comment"> *</span>
-00035 <span class="comment"> */</span>
-00036 
-00051 <span class="preprocessor">#ifndef DMX_H</span>
-00052 <span class="preprocessor"></span><span class="preprocessor">#define DMX_H</span>
-00053 <span class="preprocessor"></span>
-00054 <span class="preprocessor">#include "gcstruct.h"</span>
-00055 
-00056 <span class="comment">/* Handle client-side include files in one place. */</span>
-00057 <span class="preprocessor">#include "<a class="code" href="dmxclient_8h.html">dmxclient.h</a>"</span>
-00058 
-00059 <span class="preprocessor">#include "globals.h"</span>
-00060 <span class="preprocessor">#include "scrnintstr.h"</span>
-00061 
-00062 <span class="preprocessor">#ifdef RENDER</span>
-00063 <span class="preprocessor"></span><span class="preprocessor">#include "picturestr.h"</span>
-00064 <span class="preprocessor">#endif</span>
-00065 <span class="preprocessor"></span>
-00066 <span class="preprocessor">#ifdef GLXEXT</span>
-00067 <span class="preprocessor"></span><span class="preprocessor">#include &lt;GL/glx.h&gt;</span>
-00068 <span class="preprocessor">#include &lt;GL/glxint.h&gt;</span>
-00069 <span class="preprocessor">#endif</span>
-00070 <span class="preprocessor"></span>
-00071 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00072     PosNone = -1,
-00073     PosAbsolute = 0,
-00074     PosRightOf,
-00075     PosLeftOf,
-00076     PosAbove,
-00077     PosBelow,
-00078     PosRelative
-00079 } PositionType;
-00080 
-<a name="l00083"></a><a class="code" href="dmx_8h.html#a2">00083</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> <a class="code" href="dmx_8h.html#a2">DMXInputInfo</a>;
-00084 
-<a name="l00087"></a><a class="code" href="dmx_8h.html#a3">00087</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXStatInfo.html">_DMXStatInfo</a> <a class="code" href="dmx_8h.html#a3">DMXStatInfo</a>;
-00088 
-<a name="l00090"></a><a class="code" href="struct__DMXScreenInfo.html">00090</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> {
-<a name="l00091"></a><a class="code" href="struct__DMXScreenInfo.html#o0">00091</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>   *<a class="code" href="struct__DMXScreenInfo.html#o0">name</a>;           
-<a name="l00092"></a><a class="code" href="struct__DMXScreenInfo.html#o1">00092</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o1">index</a>;          
-00094     <span class="comment">/*---------- Back-end X server information ----------*/</span>
-00095 
-<a name="l00096"></a><a class="code" href="struct__DMXScreenInfo.html#o2">00096</a>     Display      *<a class="code" href="struct__DMXScreenInfo.html#o2">beDisplay</a>;      
-<a name="l00097"></a><a class="code" href="struct__DMXScreenInfo.html#o3">00097</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o3">beWidth</a>;        
-<a name="l00098"></a><a class="code" href="struct__DMXScreenInfo.html#o4">00098</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o4">beHeight</a>;       
-<a name="l00099"></a><a class="code" href="struct__DMXScreenInfo.html#o5">00099</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o5">beDepth</a>;        
-<a name="l00100"></a><a class="code" href="struct__DMXScreenInfo.html#o6">00100</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o6">beBPP</a>;          
-<a name="l00101"></a><a class="code" href="struct__DMXScreenInfo.html#o7">00101</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o7">beXDPI</a>;         
-<a name="l00102"></a><a class="code" href="struct__DMXScreenInfo.html#o8">00102</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o8">beYDPI</a>;         
-<a name="l00104"></a><a class="code" href="struct__DMXScreenInfo.html#o9">00104</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o9">beNumDepths</a>;    
-<a name="l00105"></a><a class="code" href="struct__DMXScreenInfo.html#o10">00105</a>     <span class="keywordtype">int</span>          *<a class="code" href="struct__DMXScreenInfo.html#o10">beDepths</a>;       
-<a name="l00107"></a><a class="code" href="struct__DMXScreenInfo.html#o11">00107</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o11">beNumPixmapFormats</a>; 
-<a name="l00108"></a><a class="code" href="struct__DMXScreenInfo.html#o12">00108</a>     XPixmapFormatValues *<a class="code" href="struct__DMXScreenInfo.html#o12">bePixmapFormats</a>; 
-<a name="l00110"></a><a class="code" href="struct__DMXScreenInfo.html#o13">00110</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o13">beNumVisuals</a>;   
-<a name="l00111"></a><a class="code" href="struct__DMXScreenInfo.html#o14">00111</a>     XVisualInfo  *<a class="code" href="struct__DMXScreenInfo.html#o14">beVisuals</a>;      
-<a name="l00112"></a><a class="code" href="struct__DMXScreenInfo.html#o15">00112</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o15">beDefVisualIndex</a>; 
-<a name="l00114"></a><a class="code" href="struct__DMXScreenInfo.html#o16">00114</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o16">beNumDefColormaps</a>; 
-<a name="l00115"></a><a class="code" href="struct__DMXScreenInfo.html#o17">00115</a>     Colormap     *<a class="code" href="struct__DMXScreenInfo.html#o17">beDefColormaps</a>; 
-<a name="l00117"></a><a class="code" href="struct__DMXScreenInfo.html#o18">00117</a>     Pixel         <a class="code" href="struct__DMXScreenInfo.html#o18">beBlackPixel</a>;   
-<a name="l00118"></a><a class="code" href="struct__DMXScreenInfo.html#o19">00118</a>     Pixel         <a class="code" href="struct__DMXScreenInfo.html#o19">beWhitePixel</a>;   
-00120     <span class="comment">/*---------- Screen window information ----------*/</span>
-00121 
-<a name="l00122"></a><a class="code" href="struct__DMXScreenInfo.html#o20">00122</a>     Window        <a class="code" href="struct__DMXScreenInfo.html#o20">scrnWin</a>;        
-<a name="l00123"></a><a class="code" href="struct__DMXScreenInfo.html#o21">00123</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o21">scrnX</a>;          
-<a name="l00124"></a><a class="code" href="struct__DMXScreenInfo.html#o22">00124</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o22">scrnY</a>;          
-<a name="l00125"></a><a class="code" href="struct__DMXScreenInfo.html#o23">00125</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o23">scrnWidth</a>;      
-<a name="l00126"></a><a class="code" href="struct__DMXScreenInfo.html#o24">00126</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o24">scrnHeight</a>;     
-<a name="l00127"></a><a class="code" href="struct__DMXScreenInfo.html#o25">00127</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o25">scrnXSign</a>;      
-<a name="l00128"></a><a class="code" href="struct__DMXScreenInfo.html#o26">00128</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o26">scrnYSign</a>;      
-<a name="l00131"></a><a class="code" href="struct__DMXScreenInfo.html#o27">00131</a>     Drawable      <a class="code" href="struct__DMXScreenInfo.html#o27">scrnDefDrawables</a>[MAXFORMATS];
-00132 
-<a name="l00133"></a><a class="code" href="struct__DMXScreenInfo.html#o28">00133</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *<a class="code" href="struct__DMXScreenInfo.html#o28">next</a>;  
-<a name="l00134"></a><a class="code" href="struct__DMXScreenInfo.html#o29">00134</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *<a class="code" href="struct__DMXScreenInfo.html#o29">over</a>;  
-00136     <span class="comment">/*---------- Root window information ----------*/</span>
-00137 
-<a name="l00138"></a><a class="code" href="struct__DMXScreenInfo.html#o30">00138</a>     Window        <a class="code" href="struct__DMXScreenInfo.html#o30">rootWin</a>;        
-<a name="l00139"></a><a class="code" href="struct__DMXScreenInfo.html#o31">00139</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o31">rootX</a>;          
-<a name="l00140"></a><a class="code" href="struct__DMXScreenInfo.html#o32">00140</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o32">rootY</a>;          
-<a name="l00141"></a><a class="code" href="struct__DMXScreenInfo.html#o33">00141</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o33">rootWidth</a>;      
-<a name="l00142"></a><a class="code" href="struct__DMXScreenInfo.html#o34">00142</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o34">rootHeight</a>;     
-<a name="l00144"></a><a class="code" href="struct__DMXScreenInfo.html#o35">00144</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o35">rootXOrigin</a>;    
-<a name="l00145"></a><a class="code" href="struct__DMXScreenInfo.html#o36">00145</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o36">rootYOrigin</a>;    
-00147     <span class="comment">/*---------- Shadow framebuffer information ----------*/</span>
-00148 
-<a name="l00149"></a><a class="code" href="struct__DMXScreenInfo.html#o37">00149</a>     <span class="keywordtype">void</span>         *<a class="code" href="struct__DMXScreenInfo.html#o37">shadow</a>;         
-<a name="l00150"></a><a class="code" href="struct__DMXScreenInfo.html#o38">00150</a>     XlibGC        <a class="code" href="struct__DMXScreenInfo.html#o38">shadowGC</a>;       
-<a name="l00151"></a><a class="code" href="struct__DMXScreenInfo.html#o39">00151</a>     XImage       *<a class="code" href="struct__DMXScreenInfo.html#o39">shadowFBImage</a>;  
-00153     <span class="comment">/*---------- Other related information ----------*/</span>
-00154 
-<a name="l00155"></a><a class="code" href="struct__DMXScreenInfo.html#o40">00155</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o40">shared</a>;         
-00157     Bool          WMRunningOnBE;
-00158 
-00159     Cursor        noCursor;
-00160     Cursor        curCursor;
-00161                                 <span class="comment">/* Support for cursors on overlapped</span>
-00162 <span class="comment">                                 * backend displays. */</span>
-00163     CursorPtr     cursor;
-00164     <span class="keywordtype">int</span>           cursorVisible;
-00165     <span class="keywordtype">int</span>           cursorNotShared; <span class="comment">/* for overlapping screens on a backend */</span>
-00166 
-<a name="l00167"></a><a class="code" href="struct__DMXScreenInfo.html#o47">00167</a>     PositionType  <a class="code" href="struct__DMXScreenInfo.html#o47">where</a>;            
-<a name="l00168"></a><a class="code" href="struct__DMXScreenInfo.html#o48">00168</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o48">whereX</a>;           
-<a name="l00169"></a><a class="code" href="struct__DMXScreenInfo.html#o49">00169</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o49">whereY</a>;           
-<a name="l00170"></a><a class="code" href="struct__DMXScreenInfo.html#o50">00170</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o50">whereRefScreen</a>;   
-<a name="l00172"></a><a class="code" href="struct__DMXScreenInfo.html#o51">00172</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o51">savedTimeout</a>;     
-<a name="l00173"></a><a class="code" href="struct__DMXScreenInfo.html#o52">00173</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o52">dpmsCapable</a>;      
-<a name="l00174"></a><a class="code" href="struct__DMXScreenInfo.html#o53">00174</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o53">dpmsEnabled</a>;      
-<a name="l00175"></a><a class="code" href="struct__DMXScreenInfo.html#o54">00175</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o54">dpmsStandby</a>;      
-<a name="l00176"></a><a class="code" href="struct__DMXScreenInfo.html#o55">00176</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o55">dpmsSuspend</a>;      
-<a name="l00177"></a><a class="code" href="struct__DMXScreenInfo.html#o56">00177</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#o56">dpmsOff</a>;          
-<a name="l00179"></a><a class="code" href="struct__DMXScreenInfo.html#o57">00179</a>     <a class="code" href="dmx_8h.html#a3">DMXStatInfo</a>  *<a class="code" href="struct__DMXScreenInfo.html#o57">stat</a>;             
-<a name="l00180"></a><a class="code" href="struct__DMXScreenInfo.html#o58">00180</a>     Bool          <a class="code" href="struct__DMXScreenInfo.html#o58">needsSync</a>;        
-00182 <span class="preprocessor">#ifdef GLXEXT</span>
-00183 <span class="preprocessor"></span>
-00184     <span class="keywordtype">int</span>           numGlxVisuals;
-00185     __GLXvisualConfig *glxVisuals;
-00186     <span class="keywordtype">int</span>           glxMajorOpcode;
-00187     <span class="keywordtype">int</span>           glxErrorBase;
-00188 
-00190     __GLXFBConfig *fbconfigs;
-00191     <span class="keywordtype">int</span>           numFBConfigs;
-00192 <span class="preprocessor">#endif</span>
-00193 <span class="preprocessor"></span>
-<a name="l00196"></a><a class="code" href="struct__DMXScreenInfo.html#o59">00196</a>     CloseScreenProcPtr             <a class="code" href="struct__DMXScreenInfo.html#o59">CloseScreen</a>;
-00197     SaveScreenProcPtr              SaveScreen;
-00198 
-00199     CreateGCProcPtr                CreateGC;
-00200 
-00201     CreateWindowProcPtr            CreateWindow;
-00202     DestroyWindowProcPtr           DestroyWindow;
-00203     PositionWindowProcPtr          PositionWindow;
-00204     ChangeWindowAttributesProcPtr  ChangeWindowAttributes;
-00205     RealizeWindowProcPtr           RealizeWindow;
-00206     UnrealizeWindowProcPtr         UnrealizeWindow;
-00207     RestackWindowProcPtr           RestackWindow;
-00208     WindowExposuresProcPtr         WindowExposures;
-00209     PaintWindowBackgroundProcPtr   PaintWindowBackground;
-00210     PaintWindowBorderProcPtr       PaintWindowBorder;
-00211     CopyWindowProcPtr              CopyWindow;
-00212 
-00213     ResizeWindowProcPtr            ResizeWindow;
-00214     ReparentWindowProcPtr          ReparentWindow;
-00215 
-00216     ChangeBorderWidthProcPtr       ChangeBorderWidth;
-00217 
-00218     GetImageProcPtr                GetImage;
-00219     GetSpansProcPtr                GetSpans;
-00220 
-00221     CreatePixmapProcPtr            CreatePixmap;
-00222     DestroyPixmapProcPtr           DestroyPixmap;
-00223     BitmapToRegionProcPtr          BitmapToRegion;
-00224 
-00225     RealizeFontProcPtr             RealizeFont;
-00226     UnrealizeFontProcPtr           UnrealizeFont;
-00227 
-00228     CreateColormapProcPtr          CreateColormap;
-00229     DestroyColormapProcPtr         DestroyColormap;
-00230     InstallColormapProcPtr         InstallColormap;
-00231     StoreColorsProcPtr             StoreColors;
-00232 
-00233 <span class="preprocessor">#ifdef SHAPE</span>
-00234 <span class="preprocessor"></span>    SetShapeProcPtr                SetShape;
-00235 <span class="preprocessor">#endif</span>
-00236 <span class="preprocessor"></span>
-00237 <span class="preprocessor">#ifdef RENDER</span>
-00238 <span class="preprocessor"></span>    CreatePictureProcPtr           CreatePicture;
-00239     DestroyPictureProcPtr          DestroyPicture;
-00240     ChangePictureClipProcPtr       ChangePictureClip;
-00241     DestroyPictureClipProcPtr      DestroyPictureClip;
-00242     
-00243     ChangePictureProcPtr           ChangePicture;
-00244     ValidatePictureProcPtr         ValidatePicture;
-00245 
-00246     CompositeProcPtr               Composite;
-00247     GlyphsProcPtr                  Glyphs;
-00248     CompositeRectsProcPtr          CompositeRects;
-00249 
-00250     InitIndexedProcPtr             InitIndexed;
-00251     CloseIndexedProcPtr            CloseIndexed;
-00252     UpdateIndexedProcPtr           UpdateIndexed;
-00253 
-00254     TrapezoidsProcPtr              Trapezoids;
-00255     TrianglesProcPtr               Triangles;
-00256     TriStripProcPtr                TriStrip;
-00257     TriFanProcPtr                  TriFan;
-00258 <span class="preprocessor">#endif</span>
-00259 <span class="preprocessor"></span>} <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>;
-00260 
-00261 <span class="comment">/* Global variables available to all Xserver/hw/dmx routines. */</span>
-<a name="l00262"></a><a class="code" href="dmx_8h.html#a5">00262</a> <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#a5">dmxNumScreens</a>;          
-<a name="l00263"></a><a class="code" href="dmx_8h.html#a6">00263</a> <span class="keyword">extern</span> <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>   *<a class="code" href="dmx_8h.html#a6">dmxScreens</a>;             
-<a name="l00264"></a><a class="code" href="dmx_8h.html#a7">00264</a> <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#a7">dmxShadowFB</a>;            
-<a name="l00267"></a><a class="code" href="dmx_8h.html#a8">00267</a> <span class="keyword">extern</span> XErrorEvent      <a class="code" href="dmx_8h.html#a8">dmxLastErrorEvent</a>;      
-<a name="l00269"></a><a class="code" href="dmx_8h.html#a9">00269</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a9">dmxErrorOccurred</a>;       
-<a name="l00271"></a><a class="code" href="dmx_8h.html#a10">00271</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a10">dmxOffScreenOpt</a>;        
-<a name="l00274"></a><a class="code" href="dmx_8h.html#a11">00274</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a11">dmxSubdividePrimitives</a>; 
-<a name="l00277"></a><a class="code" href="dmx_8h.html#a12">00277</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a12">dmxLazyWindowCreation</a>;  
-<a name="l00280"></a><a class="code" href="dmx_8h.html#a13">00280</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a13">dmxUseXKB</a>;              
-<a name="l00284"></a><a class="code" href="dmx_8h.html#a14">00284</a> <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#a14">dmxDepth</a>;               
-<a name="l00286"></a><a class="code" href="dmx_8h.html#a15">00286</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a15">dmxNoRender</a>;            
-00289 <span class="preprocessor">#ifdef GLXEXT</span>
-00290 <span class="preprocessor"></span><span class="keyword">extern</span> Bool             dmxGLXProxy;            
-00292 <span class="keyword">extern</span> Bool             dmxGLXSwapGroupSupport; 
-00296 <span class="keyword">extern</span> Bool             dmxGLXSyncSwap;         
-00300 <span class="keyword">extern</span> Bool             dmxGLXFinishSwap;       
-00305 <span class="preprocessor">#endif</span>
-<a name="l00306"></a><a class="code" href="dmx_8h.html#a16">00306</a> <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">char</span>            *<a class="code" href="dmx_8h.html#a16">dmxFontPath</a>;            
-<a name="l00315"></a><a class="code" href="dmx_8h.html#a17">00315</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a17">dmxIgnoreBadFontPaths</a>;  
-<a name="l00319"></a><a class="code" href="dmx_8h.html#a18">00319</a> <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a18">dmxAddRemoveScreens</a>;    
-<a name="l00324"></a><a class="code" href="dmx_8h.html#a0">00324</a> <span class="preprocessor">#define DMX_WRAP(_entry, _newfunc, _saved, _actual)                     \</span>
-00325 <span class="preprocessor">do {                                                                    \</span>
-00326 <span class="preprocessor">    (_saved)-&gt;_entry  = (_actual)-&gt;_entry;                              \</span>
-00327 <span class="preprocessor">    (_actual)-&gt;_entry = (_newfunc);                                     \</span>
-00328 <span class="preprocessor">} while (0)</span>
-00329 <span class="preprocessor"></span>
-<a name="l00331"></a><a class="code" href="dmx_8h.html#a1">00331</a> <span class="preprocessor">#define DMX_UNWRAP(_entry, _saved, _actual)                             \</span>
-00332 <span class="preprocessor">do {                                                                    \</span>
-00333 <span class="preprocessor">    (_actual)-&gt;_entry = (_saved)-&gt;_entry;                               \</span>
-00334 <span class="preprocessor">} while (0)</span>
-00335 <span class="preprocessor"></span>
-00336 <span class="preprocessor">#endif </span><span class="comment">/* DMX_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmx_8h.html b/xorg-server/hw/dmx/doc/html/dmx_8h.html
index ecdde319d..1cb2f06ea 100644
--- a/xorg-server/hw/dmx/doc/html/dmx_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmx_8h.html
@@ -6,518 +6,431 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmx.h File Reference</h1><code>#include "gcstruct.h"</code><br>
-<code>#include "<a class="el" href="dmxclient_8h-source.html">dmxclient.h</a>"</code><br>
-<code>#include "globals.h"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-<code>#include "picturestr.h"</code><br>
-
-<p>
-<a href="dmx_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a0">DMX_WRAP</a>(_entry, _newfunc, _saved, _actual)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a1">DMX_UNWRAP</a>(_entry, _saved, _actual)</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a2">DMXInputInfo</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a3">DMXStatInfo</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a4">DMXScreenInfo</a></td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a5">dmxNumScreens</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a6">dmxScreens</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a7">dmxShadowFB</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XErrorEvent&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a8">dmxLastErrorEvent</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a9">dmxErrorOccurred</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a10">dmxOffScreenOpt</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a11">dmxSubdividePrimitives</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a12">dmxLazyWindowCreation</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a13">dmxUseXKB</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a14">dmxDepth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a15">dmxNoRender</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a16">dmxFontPath</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a17">dmxIgnoreBadFontPaths</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmx_8h.html#a18">dmxAddRemoveScreens</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Main header file included by all other DMX-related files.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmx.h::DMX_UNWRAP" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmx.h File Reference</h1><code>#include &quot;gcstruct.h&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxclient_8h_source.html">dmxclient.h</a>&quot;</code><br/>
+<code>#include &quot;globals.h&quot;</code><br/>
+<code>#include &quot;scrnintstr.h&quot;</code><br/>
+<code>#include &quot;picturestr.h&quot;</code><br/>
+
+<p><a href="dmx_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">DMX_WRAP</a>(_entry, _newfunc, _saved, _actual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">DMX_UNWRAP</a>(_entry, _saved, _actual)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a175903acd588f450ac6325e17355f8ca">DMXInputInfo</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#aac7b710f9533f3b984574f1403488673">DMXStatInfo</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a093c967353474b26640284f89d78e204">DMXScreenInfo</a></td></tr>
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a> { <br/>
+&nbsp;&nbsp;<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44">PosNone</a> =  -1, 
+<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351">PosAbsolute</a> =  0, 
+<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae">PosRightOf</a>, 
+<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f">PosLeftOf</a>, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414">PosAbove</a>, 
+<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e">PosBelow</a>, 
+<a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc">PosRelative</a>
+<br/>
+ }</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a97d09d0d46e9e7df451072def499e4fe">dmxShadowFB</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XErrorEvent&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxLastErrorEvent</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxErrorOccurred</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a8207510b34c9871015d1e9378c31c568">dmxSubdividePrimitives</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#af266e8dde07901ede60eaa822b3e945a">dmxLazyWindowCreation</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#ab5b999218612af4136983694943737aa">dmxUseXKB</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxDepth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a10581b0cb51e730e26cbc08913a76c5f">dmxFontPath</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxIgnoreBadFontPaths</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmx_8h.html#a8d53c22ed93cbef2684016d3c7638671">dmxAddRemoveScreens</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Main header file included by all other DMX-related files. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a94c3604e80b511877468dea0d8da7051"></a><!-- doxytag: member="dmx.h::DMX_UNWRAP" ref="a94c3604e80b511877468dea0d8da7051" args="(_entry, _saved, _actual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_UNWRAP</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_entry,         <tr>
-          <td></td>
+          <td class="memname">#define DMX_UNWRAP</td>
+          <td>(</td>
+          <td class="paramtype">_entry, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>_saved,         <tr>
+          <td class="paramtype">_saved, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">_actual&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>_actual&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Value:</b><div class="fragment"><pre><span class="keywordflow">do</span> {                                                                    \
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
     (_actual)-&gt;_entry = (_saved)-&gt;_entry;                               \
 } <span class="keywordflow">while</span> (0)
-</pre></div>Unwrap screen or GC function pointer     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmx.h::DMX_WRAP" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</pre></div><p>Unwrap screen or GC function pointer </p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a67000d9b6ab4428d002523c0ef981ed0"></a><!-- doxytag: member="dmx.h::DMX_WRAP" ref="a67000d9b6ab4428d002523c0ef981ed0" args="(_entry, _newfunc, _saved, _actual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_WRAP</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_entry,         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>_newfunc,         <tr>
+          <td class="memname">#define DMX_WRAP</td>
+          <td>(</td>
+          <td class="paramtype">_entry, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">_newfunc, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>_saved,         <tr>
+          <td class="paramtype">_saved, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">_actual&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>_actual&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Value:</b><div class="fragment"><pre><span class="keywordflow">do</span> {                                                                    \
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
     (_saved)-&gt;_entry  = (_actual)-&gt;_entry;                              \
     (_actual)-&gt;_entry = (_newfunc);                                     \
 } <span class="keywordflow">while</span> (0)
-</pre></div>Wrap screen or GC function pointer     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmx.h::DMXInputInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</pre></div><p>Wrap screen or GC function pointer </p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a175903acd588f450ac6325e17355f8ca"></a><!-- doxytag: member="dmx.h::DMXInputInfo" ref="a175903acd588f450ac6325e17355f8ca" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Provide the typedef globally, but keep the contents opaque outside of the input routines. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmx.h::DMXScreenInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Provide the typedef globally, but keep the contents opaque outside of the input routines. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> </dd></dl>
+
+</div>
+</div>
+<a class="anchor" id="a093c967353474b26640284f89d78e204"></a><!-- doxytag: member="dmx.h::DMXScreenInfo" ref="a093c967353474b26640284f89d78e204" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>  <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>  <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Global structure containing information about each backend screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmx.h::DMXStatInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Global structure containing information about each backend screen. </p>
+
+</div>
+</div>
+<a class="anchor" id="aac7b710f9533f3b984574f1403488673"></a><!-- doxytag: member="dmx.h::DMXStatInfo" ref="aac7b710f9533f3b984574f1403488673" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a> <a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a> <a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Provide the typedef globally, but keep the contents opaque outside of the XSync statistic routines. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxstat_8c.html">dmxstat.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a18" doxytag="dmx.h::dmxAddRemoveScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Provide the typedef globally, but keep the contents opaque outside of the XSync statistic routines. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxstat_8c.html">dmxstat.c</a> </dd></dl>
+
+</div>
+</div>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="aa80fe4e9a559009407475c9587214b48"></a><!-- doxytag: member="dmx.h::PositionType" ref="aa80fe4e9a559009407475c9587214b48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a17">dmxAddRemoveScreens</a>
+          <td class="memname">enum <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if add and remove screens support is enabled     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmx.h::dmxDepth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44"></a><!-- doxytag: member="PosNone" ref="aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44" args="" -->PosNone</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351"></a><!-- doxytag: member="PosAbsolute" ref="aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351" args="" -->PosAbsolute</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae"></a><!-- doxytag: member="PosRightOf" ref="aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae" args="" -->PosRightOf</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f"></a><!-- doxytag: member="PosLeftOf" ref="aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f" args="" -->PosLeftOf</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414"></a><!-- doxytag: member="PosAbove" ref="aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414" args="" -->PosAbove</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e"></a><!-- doxytag: member="PosBelow" ref="aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e" args="" -->PosBelow</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc"></a><!-- doxytag: member="PosRelative" ref="aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc" args="" -->PosRelative</em>&nbsp;</td><td>
+</td></tr>
+</table>
+</dd>
+</dl>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a8d53c22ed93cbef2684016d3c7638671"></a><!-- doxytag: member="dmx.h::dmxAddRemoveScreens" ref="a8d53c22ed93cbef2684016d3c7638671" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a13">dmxDepth</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a8d53c22ed93cbef2684016d3c7638671">dmxAddRemoveScreens</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Requested depth if non-zero     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmx.h::dmxErrorOccurred" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if add and remove screens support is enabled </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad2d0e8e1a260d9fdb7ea3a980d5fce8b"></a><!-- doxytag: member="dmx.h::dmxDepth" ref="ad2d0e8e1a260d9fdb7ea3a980d5fce8b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a7">dmxErrorOccurred</a>
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxDepth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if an error occurred     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmx.h::dmxFontPath" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Requested depth if non-zero </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9a817996c23e8669c5d9a8dc25e8cb51"></a><!-- doxytag: member="dmx.h::dmxErrorOccurred" ref="a9a817996c23e8669c5d9a8dc25e8cb51" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> char* <a class="el" href="dmxinit_8c.html#a8">dmxFontPath</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxErrorOccurred</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmx.h::dmxIgnoreBadFontPaths" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if an error occurred </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a10581b0cb51e730e26cbc08913a76c5f"></a><!-- doxytag: member="dmx.h::dmxFontPath" ref="a10581b0cb51e730e26cbc08913a76c5f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a16">dmxIgnoreBadFontPaths</a>
+          <td class="memname">char* <a class="el" href="dmxinit_8c.html#a10581b0cb51e730e26cbc08913a76c5f">dmxFontPath</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if bad font paths should be ignored during server init     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmx.h::dmxLastErrorEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths </p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, and <a class="el" href="dmxinit_8c_source.html#l00815">dmxSetDefaultFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2eb1403caea1e0c8ac3cb9d1edc8d3c6"></a><!-- doxytag: member="dmx.h::dmxIgnoreBadFontPaths" ref="a2eb1403caea1e0c8ac3cb9d1edc8d3c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XErrorEvent <a class="el" href="dmxinit_8c.html#a6">dmxLastErrorEvent</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxIgnoreBadFontPaths</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Last error that occurred     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmx.h::dmxLazyWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if bad font paths should be ignored during server init </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf5b80f46b3ba1e46d7f1f12cfb158f"></a><!-- doxytag: member="dmx.h::dmxLastErrorEvent" ref="aacf5b80f46b3ba1e46d7f1f12cfb158f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a11">dmxLazyWindowCreation</a>
+          <td class="memname">XErrorEvent <a class="el" href="dmxinit_8c.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxLastErrorEvent</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using the lazy window creation optimization     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmx.h::dmxNoRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Last error that occurred </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af266e8dde07901ede60eaa822b3e945a"></a><!-- doxytag: member="dmx.h::dmxLazyWindowCreation" ref="af266e8dde07901ede60eaa822b3e945a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a14">dmxNoRender</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#af266e8dde07901ede60eaa822b3e945a">dmxLazyWindowCreation</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if the RENDER extension should be disabled     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmx.h::dmxNumScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using the lazy window creation optimization </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5a881109fe1e32c74cda4a280b09a7c4"></a><!-- doxytag: member="dmx.h::dmxNumScreens" ref="a5a881109fe1e32c74cda4a280b09a7c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a>
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of dmxScreens     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmx.h::dmxOffScreenOpt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of dmxScreens </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00837">AbortDDX()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcommon_8c_source.html#l00524">dmxFindPointerScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00278">dmxGetNumScreens()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00204">dmxSLCreate()</a>, <a class="el" href="dmxcursor_8c_source.html#l00221">dmxSLFindNext()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa8987e6ecde1821c659e8fe22336fd20"></a><!-- doxytag: member="dmx.h::dmxOffScreenOpt" ref="aa8987e6ecde1821c659e8fe22336fd20" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a9">dmxOffScreenOpt</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using off screen optimizations     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmx.h::dmxScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using off screen optimizations </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3e242a6818df05e547a4776919e3827f"></a><!-- doxytag: member="dmx.h::dmxScreens" ref="a3e242a6818df05e547a4776919e3827f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* <a class="el" href="dmxinit_8c.html#a2">dmxScreens</a>
+          <td class="memname"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of outputs     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmx.h::dmxShadowFB" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of outputs </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a97d09d0d46e9e7df451072def499e4fe"></a><!-- doxytag: member="dmx.h::dmxShadowFB" ref="a97d09d0d46e9e7df451072def499e4fe" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a5">dmxShadowFB</a>
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#a97d09d0d46e9e7df451072def499e4fe">dmxShadowFB</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if using shadow frame-buffer (deprecated)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmx.h::dmxSubdividePrimitives" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if using shadow frame-buffer (deprecated) </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8207510b34c9871015d1e9378c31c568"></a><!-- doxytag: member="dmx.h::dmxSubdividePrimitives" ref="a8207510b34c9871015d1e9378c31c568" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a10">dmxSubdividePrimitives</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a8207510b34c9871015d1e9378c31c568">dmxSubdividePrimitives</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using the primitive subdivision optimization     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmx.h::dmxUseXKB" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using the primitive subdivision optimization </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab5b999218612af4136983694943737aa"></a><!-- doxytag: member="dmx.h::dmxUseXKB" ref="ab5b999218612af4136983694943737aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a12">dmxUseXKB</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#ab5b999218612af4136983694943737aa">dmxUseXKB</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if the XKB extension should be used with the backend servers     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>True if the XKB extension should be used with the backend servers </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmx_8h_source.html b/xorg-server/hw/dmx/doc/html/dmx_8h_source.html
new file mode 100644
index 000000000..ce2f78e50
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmx_8h_source.html
@@ -0,0 +1,327 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmx.h</h1><a href="dmx_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00033"></a>00033 <span class="comment"> *</span>
+<a name="l00034"></a>00034 <span class="comment"> */</span>
+<a name="l00035"></a>00035 
+<a name="l00050"></a>00050 <span class="preprocessor">#ifndef DMX_H</span>
+<a name="l00051"></a>00051 <span class="preprocessor"></span><span class="preprocessor">#define DMX_H</span>
+<a name="l00052"></a>00052 <span class="preprocessor"></span>
+<a name="l00053"></a>00053 <span class="preprocessor">#if HAVE_DMX_CONFIG_H</span>
+<a name="l00054"></a>00054 <span class="preprocessor"></span><span class="preprocessor">#include &lt;<a class="code" href="dmx-config_8h.html">dmx-config.h</a>&gt;</span>
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
+<a name="l00056"></a>00056 <span class="preprocessor"></span>
+<a name="l00057"></a>00057 <span class="preprocessor">#include &quot;gcstruct.h&quot;</span>
+<a name="l00058"></a>00058 
+<a name="l00059"></a>00059 <span class="comment">/* Handle client-side include files in one place. */</span>
+<a name="l00060"></a>00060 <span class="preprocessor">#include &quot;<a class="code" href="dmxclient_8h.html">dmxclient.h</a>&quot;</span>
+<a name="l00061"></a>00061 
+<a name="l00062"></a>00062 <span class="preprocessor">#include &quot;globals.h&quot;</span>
+<a name="l00063"></a>00063 <span class="preprocessor">#include &quot;scrnintstr.h&quot;</span>
+<a name="l00064"></a>00064 
+<a name="l00065"></a>00065 <span class="preprocessor">#ifdef RENDER</span>
+<a name="l00066"></a>00066 <span class="preprocessor"></span><span class="preprocessor">#include &quot;picturestr.h&quot;</span>
+<a name="l00067"></a>00067 <span class="preprocessor">#endif</span>
+<a name="l00068"></a>00068 <span class="preprocessor"></span>
+<a name="l00069"></a>00069 <span class="preprocessor">#ifdef GLXEXT</span>
+<a name="l00070"></a>00070 <span class="preprocessor"></span><span class="preprocessor">#include &lt;GL/glx.h&gt;</span>
+<a name="l00071"></a>00071 <span class="preprocessor">#include &lt;GL/glxint.h&gt;</span>
+<a name="l00072"></a>00072 <span class="preprocessor">#endif</span>
+<a name="l00073"></a>00073 <span class="preprocessor"></span>
+<a name="l00074"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">00074</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00075"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44">00075</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44">PosNone</a> = -1,
+<a name="l00076"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351">00076</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351">PosAbsolute</a> = 0,
+<a name="l00077"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae">00077</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae">PosRightOf</a>,
+<a name="l00078"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f">00078</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f">PosLeftOf</a>,
+<a name="l00079"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414">00079</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414">PosAbove</a>,
+<a name="l00080"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e">00080</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e">PosBelow</a>,
+<a name="l00081"></a><a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc">00081</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc">PosRelative</a>
+<a name="l00082"></a>00082 } <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a>;
+<a name="l00083"></a>00083 
+<a name="l00086"></a><a class="code" href="dmx_8h.html#a175903acd588f450ac6325e17355f8ca">00086</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>;
+<a name="l00087"></a>00087 
+<a name="l00090"></a><a class="code" href="dmx_8h.html#aac7b710f9533f3b984574f1403488673">00090</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXStatInfo.html">_DMXStatInfo</a> <a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a>;
+<a name="l00091"></a>00091 
+<a name="l00093"></a><a class="code" href="struct__DMXScreenInfo.html">00093</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> {
+<a name="l00094"></a><a class="code" href="struct__DMXScreenInfo.html#a5cfc14ffedaafcbe5b00302f972208cf">00094</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>   *<a class="code" href="struct__DMXScreenInfo.html#a5cfc14ffedaafcbe5b00302f972208cf">name</a>;           
+<a name="l00095"></a><a class="code" href="struct__DMXScreenInfo.html#a28849096f73f9bf14bb7e461dbb5cc94">00095</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a28849096f73f9bf14bb7e461dbb5cc94">index</a>;          
+<a name="l00097"></a>00097     <span class="comment">/*---------- Back-end X server information ----------*/</span>
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="struct__DMXScreenInfo.html#a756ade62a55a52f163a42db6de54c244">00099</a>     Display      *<a class="code" href="struct__DMXScreenInfo.html#a756ade62a55a52f163a42db6de54c244">beDisplay</a>;      
+<a name="l00100"></a><a class="code" href="struct__DMXScreenInfo.html#aaa160ae9fce9f7c58bb9f6c0a9709861">00100</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aaa160ae9fce9f7c58bb9f6c0a9709861">beWidth</a>;        
+<a name="l00101"></a><a class="code" href="struct__DMXScreenInfo.html#a713ca6d9bf7a4527f442519554e1fc94">00101</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a713ca6d9bf7a4527f442519554e1fc94">beHeight</a>;       
+<a name="l00102"></a><a class="code" href="struct__DMXScreenInfo.html#ac435223f6a5921beab567cc23b83f07f">00102</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#ac435223f6a5921beab567cc23b83f07f">beDepth</a>;        
+<a name="l00103"></a><a class="code" href="struct__DMXScreenInfo.html#a5e865cb99dd73ba18991912af275994f">00103</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a5e865cb99dd73ba18991912af275994f">beBPP</a>;          
+<a name="l00104"></a><a class="code" href="struct__DMXScreenInfo.html#aef4fb640cf089a1ebbf87a144f25cd80">00104</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aef4fb640cf089a1ebbf87a144f25cd80">beXDPI</a>;         
+<a name="l00105"></a><a class="code" href="struct__DMXScreenInfo.html#a7646aaa7101d53566be4506a2c3b75fb">00105</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a7646aaa7101d53566be4506a2c3b75fb">beYDPI</a>;         
+<a name="l00107"></a><a class="code" href="struct__DMXScreenInfo.html#a896eeff4d8c92af936bbb1c24b8ad081">00107</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a896eeff4d8c92af936bbb1c24b8ad081">beNumDepths</a>;    
+<a name="l00108"></a><a class="code" href="struct__DMXScreenInfo.html#a4e0c6ff0cf4b00ac0d7d1f3702343033">00108</a>     <span class="keywordtype">int</span>          *<a class="code" href="struct__DMXScreenInfo.html#a4e0c6ff0cf4b00ac0d7d1f3702343033">beDepths</a>;       
+<a name="l00110"></a><a class="code" href="struct__DMXScreenInfo.html#a6476a8960e2013a9502c326f8851071c">00110</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a6476a8960e2013a9502c326f8851071c">beNumPixmapFormats</a>; 
+<a name="l00111"></a><a class="code" href="struct__DMXScreenInfo.html#a1c13d3cbcad4da61fe677e96cb781543">00111</a>     XPixmapFormatValues *<a class="code" href="struct__DMXScreenInfo.html#a1c13d3cbcad4da61fe677e96cb781543">bePixmapFormats</a>; 
+<a name="l00113"></a><a class="code" href="struct__DMXScreenInfo.html#a4edb26469ac99eccb762f668615c4b83">00113</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a4edb26469ac99eccb762f668615c4b83">beNumVisuals</a>;   
+<a name="l00114"></a><a class="code" href="struct__DMXScreenInfo.html#a33651a812fe70c8229f395c2bb38b45c">00114</a>     XVisualInfo  *<a class="code" href="struct__DMXScreenInfo.html#a33651a812fe70c8229f395c2bb38b45c">beVisuals</a>;      
+<a name="l00115"></a><a class="code" href="struct__DMXScreenInfo.html#a1288c3902e2e1f871947e854269562e8">00115</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a1288c3902e2e1f871947e854269562e8">beDefVisualIndex</a>; 
+<a name="l00117"></a><a class="code" href="struct__DMXScreenInfo.html#a3a70f31b272f686b4df2bb98e25f0902">00117</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a3a70f31b272f686b4df2bb98e25f0902">beNumDefColormaps</a>; 
+<a name="l00118"></a><a class="code" href="struct__DMXScreenInfo.html#acd24913b53592c9a65bbc52f43f7409a">00118</a>     Colormap     *<a class="code" href="struct__DMXScreenInfo.html#acd24913b53592c9a65bbc52f43f7409a">beDefColormaps</a>; 
+<a name="l00120"></a><a class="code" href="struct__DMXScreenInfo.html#adc481961d93d200f67ca722b32d17608">00120</a>     Pixel         <a class="code" href="struct__DMXScreenInfo.html#adc481961d93d200f67ca722b32d17608">beBlackPixel</a>;   
+<a name="l00121"></a><a class="code" href="struct__DMXScreenInfo.html#aa57407aa11d2c07346bd6ad5b443a147">00121</a>     Pixel         <a class="code" href="struct__DMXScreenInfo.html#aa57407aa11d2c07346bd6ad5b443a147">beWhitePixel</a>;   
+<a name="l00123"></a>00123     <span class="comment">/*---------- Screen window information ----------*/</span>
+<a name="l00124"></a>00124 
+<a name="l00125"></a><a class="code" href="struct__DMXScreenInfo.html#a78c03cd265e1c64b0d4028f0b27f99c4">00125</a>     Window        <a class="code" href="struct__DMXScreenInfo.html#a78c03cd265e1c64b0d4028f0b27f99c4">scrnWin</a>;        
+<a name="l00126"></a><a class="code" href="struct__DMXScreenInfo.html#a25e823320e01d5c61c996a9e4f3c2920">00126</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a25e823320e01d5c61c996a9e4f3c2920">scrnX</a>;          
+<a name="l00127"></a><a class="code" href="struct__DMXScreenInfo.html#aec971ffcb8c7970610513deef57da9f0">00127</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aec971ffcb8c7970610513deef57da9f0">scrnY</a>;          
+<a name="l00128"></a><a class="code" href="struct__DMXScreenInfo.html#ac4c86f223d149ffda30a32ebaffee23a">00128</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#ac4c86f223d149ffda30a32ebaffee23a">scrnWidth</a>;      
+<a name="l00129"></a><a class="code" href="struct__DMXScreenInfo.html#a2a1733427433e53a0df2575168ad0713">00129</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a2a1733427433e53a0df2575168ad0713">scrnHeight</a>;     
+<a name="l00130"></a><a class="code" href="struct__DMXScreenInfo.html#a3035698819a0339095cd208595999aaf">00130</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a3035698819a0339095cd208595999aaf">scrnXSign</a>;      
+<a name="l00131"></a><a class="code" href="struct__DMXScreenInfo.html#aa4018bf5e24b7c3dd02bb8ccc808be2c">00131</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aa4018bf5e24b7c3dd02bb8ccc808be2c">scrnYSign</a>;      
+<a name="l00134"></a><a class="code" href="struct__DMXScreenInfo.html#a0fdddca70b67ca947e663001ac3e398f">00134</a>     Drawable      <a class="code" href="struct__DMXScreenInfo.html#a0fdddca70b67ca947e663001ac3e398f">scrnDefDrawables</a>[MAXFORMATS];
+<a name="l00135"></a>00135 
+<a name="l00136"></a><a class="code" href="struct__DMXScreenInfo.html#a24d4641dc02b750b88eb56ced27269d3">00136</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *<a class="code" href="struct__DMXScreenInfo.html#a24d4641dc02b750b88eb56ced27269d3">next</a>;  
+<a name="l00137"></a><a class="code" href="struct__DMXScreenInfo.html#ac55a37b29ce99474516995b09f794d9c">00137</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *<a class="code" href="struct__DMXScreenInfo.html#ac55a37b29ce99474516995b09f794d9c">over</a>;  
+<a name="l00139"></a>00139     <span class="comment">/*---------- Root window information ----------*/</span>
+<a name="l00140"></a>00140 
+<a name="l00141"></a><a class="code" href="struct__DMXScreenInfo.html#ae19c1b45f18c3880dac6fb101fc92127">00141</a>     Window        <a class="code" href="struct__DMXScreenInfo.html#ae19c1b45f18c3880dac6fb101fc92127">rootWin</a>;        
+<a name="l00142"></a><a class="code" href="struct__DMXScreenInfo.html#a94bafd201bf311e19fc17772e5ccdc28">00142</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a94bafd201bf311e19fc17772e5ccdc28">rootX</a>;          
+<a name="l00143"></a><a class="code" href="struct__DMXScreenInfo.html#acd81762e240cca8a57c90ab7f423ca8f">00143</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#acd81762e240cca8a57c90ab7f423ca8f">rootY</a>;          
+<a name="l00144"></a><a class="code" href="struct__DMXScreenInfo.html#a1edc0ff1f4afd8176c237248da677350">00144</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a1edc0ff1f4afd8176c237248da677350">rootWidth</a>;      
+<a name="l00145"></a><a class="code" href="struct__DMXScreenInfo.html#a021f9c1883ae7d96bd47c53bc0bab428">00145</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a021f9c1883ae7d96bd47c53bc0bab428">rootHeight</a>;     
+<a name="l00147"></a><a class="code" href="struct__DMXScreenInfo.html#aef812b4b6f76c93b8e800e9388330add">00147</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aef812b4b6f76c93b8e800e9388330add">rootXOrigin</a>;    
+<a name="l00148"></a><a class="code" href="struct__DMXScreenInfo.html#a89914c5858cebec13b2256ad02d787ac">00148</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a89914c5858cebec13b2256ad02d787ac">rootYOrigin</a>;    
+<a name="l00150"></a>00150     <span class="comment">/*---------- Shadow framebuffer information ----------*/</span>
+<a name="l00151"></a>00151 
+<a name="l00152"></a><a class="code" href="struct__DMXScreenInfo.html#a873f1776988a437bcf2357e166005c48">00152</a>     <span class="keywordtype">void</span>         *<a class="code" href="struct__DMXScreenInfo.html#a873f1776988a437bcf2357e166005c48">shadow</a>;         
+<a name="l00153"></a><a class="code" href="struct__DMXScreenInfo.html#a48314583a4bbbfaa66719330bdf4a91a">00153</a>     XlibGC        <a class="code" href="struct__DMXScreenInfo.html#a48314583a4bbbfaa66719330bdf4a91a">shadowGC</a>;       
+<a name="l00154"></a><a class="code" href="struct__DMXScreenInfo.html#ae21672a36b84f8268c5e29d82fa07667">00154</a>     XImage       *<a class="code" href="struct__DMXScreenInfo.html#ae21672a36b84f8268c5e29d82fa07667">shadowFBImage</a>;  
+<a name="l00156"></a>00156     <span class="comment">/*---------- Other related information ----------*/</span>
+<a name="l00157"></a>00157 
+<a name="l00158"></a><a class="code" href="struct__DMXScreenInfo.html#a1c960b58b8bb306b5fe14edc8d8c2b8d">00158</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a1c960b58b8bb306b5fe14edc8d8c2b8d">shared</a>;         
+<a name="l00160"></a><a class="code" href="struct__DMXScreenInfo.html#a1da213d4ad20ad28127f06632a8202aa">00160</a>     Bool          <a class="code" href="struct__DMXScreenInfo.html#a1da213d4ad20ad28127f06632a8202aa">WMRunningOnBE</a>;
+<a name="l00161"></a>00161 
+<a name="l00162"></a><a class="code" href="struct__DMXScreenInfo.html#a148c7073ff8a41bee48e6c375e622bd9">00162</a>     Cursor        <a class="code" href="struct__DMXScreenInfo.html#a148c7073ff8a41bee48e6c375e622bd9">noCursor</a>;
+<a name="l00163"></a><a class="code" href="struct__DMXScreenInfo.html#aec1712642a093f935194bfe49d0d4050">00163</a>     Cursor        <a class="code" href="struct__DMXScreenInfo.html#aec1712642a093f935194bfe49d0d4050">curCursor</a>;
+<a name="l00164"></a>00164                                 <span class="comment">/* Support for cursors on overlapped</span>
+<a name="l00165"></a>00165 <span class="comment">                                 * backend displays. */</span>
+<a name="l00166"></a><a class="code" href="struct__DMXScreenInfo.html#a7a61b71888a4d7c6eefa3cde29bbd677">00166</a>     CursorPtr     <a class="code" href="struct__DMXScreenInfo.html#a7a61b71888a4d7c6eefa3cde29bbd677">cursor</a>;
+<a name="l00167"></a><a class="code" href="struct__DMXScreenInfo.html#a68f4dfcb582f9470e09c10a6e21ec5e3">00167</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a68f4dfcb582f9470e09c10a6e21ec5e3">cursorVisible</a>;
+<a name="l00168"></a><a class="code" href="struct__DMXScreenInfo.html#a83dd882008eb7e54cc81987a23ab9fd5">00168</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a83dd882008eb7e54cc81987a23ab9fd5">cursorNotShared</a>; <span class="comment">/* for overlapping screens on a backend */</span>
+<a name="l00169"></a>00169 
+<a name="l00170"></a><a class="code" href="struct__DMXScreenInfo.html#a2cb225a5c08ae6ea0ce19d85616f143b">00170</a>     <a class="code" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a>  <a class="code" href="struct__DMXScreenInfo.html#a2cb225a5c08ae6ea0ce19d85616f143b">where</a>;            
+<a name="l00171"></a><a class="code" href="struct__DMXScreenInfo.html#a9d0572de80377c7ad7407dfb0cf22d8a">00171</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a9d0572de80377c7ad7407dfb0cf22d8a">whereX</a>;           
+<a name="l00172"></a><a class="code" href="struct__DMXScreenInfo.html#aeb391a900f17b41e18127b4b31026c96">00172</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#aeb391a900f17b41e18127b4b31026c96">whereY</a>;           
+<a name="l00173"></a><a class="code" href="struct__DMXScreenInfo.html#ae502ef7543f17556ea497ebbef157f41">00173</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#ae502ef7543f17556ea497ebbef157f41">whereRefScreen</a>;   
+<a name="l00175"></a><a class="code" href="struct__DMXScreenInfo.html#a187aa2158f3a1e7b021cf1ea6f693c2f">00175</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a187aa2158f3a1e7b021cf1ea6f693c2f">savedTimeout</a>;     
+<a name="l00176"></a><a class="code" href="struct__DMXScreenInfo.html#a3f540a0bcac0e813a4b7ad3f34a19277">00176</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a3f540a0bcac0e813a4b7ad3f34a19277">dpmsCapable</a>;      
+<a name="l00177"></a><a class="code" href="struct__DMXScreenInfo.html#a3ad975d6c25329c21456c1f880dc68f6">00177</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a3ad975d6c25329c21456c1f880dc68f6">dpmsEnabled</a>;      
+<a name="l00178"></a><a class="code" href="struct__DMXScreenInfo.html#abf64e2489557ef84c84c1e36b1fccb83">00178</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#abf64e2489557ef84c84c1e36b1fccb83">dpmsStandby</a>;      
+<a name="l00179"></a><a class="code" href="struct__DMXScreenInfo.html#a7dab70abf22a5ec34fced3ba2fbd25d0">00179</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a7dab70abf22a5ec34fced3ba2fbd25d0">dpmsSuspend</a>;      
+<a name="l00180"></a><a class="code" href="struct__DMXScreenInfo.html#a69a70ba630e23bab0141886f2d49eb31">00180</a>     <span class="keywordtype">int</span>           <a class="code" href="struct__DMXScreenInfo.html#a69a70ba630e23bab0141886f2d49eb31">dpmsOff</a>;          
+<a name="l00182"></a><a class="code" href="struct__DMXScreenInfo.html#a31fd04698ffcb2b53ffee82468cc2862">00182</a>     <a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a>  *<a class="code" href="struct__DMXScreenInfo.html#a31fd04698ffcb2b53ffee82468cc2862">stat</a>;             
+<a name="l00183"></a><a class="code" href="struct__DMXScreenInfo.html#a2c3aa46a8fafabc0a9af28948055fcb0">00183</a>     Bool          <a class="code" href="struct__DMXScreenInfo.html#a2c3aa46a8fafabc0a9af28948055fcb0">needsSync</a>;        
+<a name="l00185"></a>00185 <span class="preprocessor">#ifdef GLXEXT</span>
+<a name="l00186"></a>00186 <span class="preprocessor"></span>
+<a name="l00187"></a>00187     <span class="keywordtype">int</span>           numGlxVisuals;
+<a name="l00188"></a>00188     __GLXvisualConfig *glxVisuals;
+<a name="l00189"></a>00189     <span class="keywordtype">int</span>           glxMajorOpcode;
+<a name="l00190"></a>00190     <span class="keywordtype">int</span>           glxErrorBase;
+<a name="l00191"></a>00191 
+<a name="l00193"></a>00193     __GLXFBConfig *fbconfigs;
+<a name="l00194"></a>00194     <span class="keywordtype">int</span>           numFBConfigs;
+<a name="l00195"></a>00195 <span class="preprocessor">#endif</span>
+<a name="l00196"></a>00196 <span class="preprocessor"></span>
+<a name="l00199"></a><a class="code" href="struct__DMXScreenInfo.html#a94a4815bc20535c8946876d2113b109e">00199</a>     CloseScreenProcPtr             <a class="code" href="struct__DMXScreenInfo.html#a94a4815bc20535c8946876d2113b109e">CloseScreen</a>;
+<a name="l00200"></a><a class="code" href="struct__DMXScreenInfo.html#a357f02026fd7a4d50e682c87554b15a7">00200</a>     SaveScreenProcPtr              <a class="code" href="struct__DMXScreenInfo.html#a357f02026fd7a4d50e682c87554b15a7">SaveScreen</a>;
+<a name="l00201"></a>00201 
+<a name="l00202"></a><a class="code" href="struct__DMXScreenInfo.html#a0608031d93f0f78df41e66fc8e8107cf">00202</a>     CreateGCProcPtr                <a class="code" href="struct__DMXScreenInfo.html#a0608031d93f0f78df41e66fc8e8107cf">CreateGC</a>;
+<a name="l00203"></a>00203 
+<a name="l00204"></a><a class="code" href="struct__DMXScreenInfo.html#a19123a8915a37e821ef46bc63f646d8d">00204</a>     CreateWindowProcPtr            <a class="code" href="struct__DMXScreenInfo.html#a19123a8915a37e821ef46bc63f646d8d">CreateWindow</a>;
+<a name="l00205"></a><a class="code" href="struct__DMXScreenInfo.html#a0d204177b5df7dab4a89741439728a56">00205</a>     DestroyWindowProcPtr           <a class="code" href="struct__DMXScreenInfo.html#a0d204177b5df7dab4a89741439728a56">DestroyWindow</a>;
+<a name="l00206"></a><a class="code" href="struct__DMXScreenInfo.html#afad6bda7c2505a7fedabdf055f7838c5">00206</a>     PositionWindowProcPtr          <a class="code" href="struct__DMXScreenInfo.html#afad6bda7c2505a7fedabdf055f7838c5">PositionWindow</a>;
+<a name="l00207"></a><a class="code" href="struct__DMXScreenInfo.html#a35d0114e24f9eeff1f5649bcb0b00d71">00207</a>     ChangeWindowAttributesProcPtr  <a class="code" href="struct__DMXScreenInfo.html#a35d0114e24f9eeff1f5649bcb0b00d71">ChangeWindowAttributes</a>;
+<a name="l00208"></a><a class="code" href="struct__DMXScreenInfo.html#a2b3ed1977ce205b1bb518393e1b434f6">00208</a>     RealizeWindowProcPtr           <a class="code" href="struct__DMXScreenInfo.html#a2b3ed1977ce205b1bb518393e1b434f6">RealizeWindow</a>;
+<a name="l00209"></a><a class="code" href="struct__DMXScreenInfo.html#a7b72d30e072b0f1a5f1e89ae9c1155f0">00209</a>     UnrealizeWindowProcPtr         <a class="code" href="struct__DMXScreenInfo.html#a7b72d30e072b0f1a5f1e89ae9c1155f0">UnrealizeWindow</a>;
+<a name="l00210"></a><a class="code" href="struct__DMXScreenInfo.html#a8c16eedf083215c4076fcd8851cf6bc2">00210</a>     RestackWindowProcPtr           <a class="code" href="struct__DMXScreenInfo.html#a8c16eedf083215c4076fcd8851cf6bc2">RestackWindow</a>;
+<a name="l00211"></a><a class="code" href="struct__DMXScreenInfo.html#a526c7fea5a2a39d325eab3fd4efb503d">00211</a>     WindowExposuresProcPtr         <a class="code" href="struct__DMXScreenInfo.html#a526c7fea5a2a39d325eab3fd4efb503d">WindowExposures</a>;
+<a name="l00212"></a><a class="code" href="struct__DMXScreenInfo.html#a8f1472064bae45d6b59bee2580a185aa">00212</a>     CopyWindowProcPtr              <a class="code" href="struct__DMXScreenInfo.html#a8f1472064bae45d6b59bee2580a185aa">CopyWindow</a>;
+<a name="l00213"></a>00213 
+<a name="l00214"></a><a class="code" href="struct__DMXScreenInfo.html#a949c2799e41ad4f4384cc862df4022fd">00214</a>     ResizeWindowProcPtr            <a class="code" href="struct__DMXScreenInfo.html#a949c2799e41ad4f4384cc862df4022fd">ResizeWindow</a>;
+<a name="l00215"></a><a class="code" href="struct__DMXScreenInfo.html#a71362d4473da8793f624eaa6a9ac61af">00215</a>     ReparentWindowProcPtr          <a class="code" href="struct__DMXScreenInfo.html#a71362d4473da8793f624eaa6a9ac61af">ReparentWindow</a>;
+<a name="l00216"></a>00216 
+<a name="l00217"></a><a class="code" href="struct__DMXScreenInfo.html#a134b8b97ce93ef4601c972d0fb760e93">00217</a>     ChangeBorderWidthProcPtr       <a class="code" href="struct__DMXScreenInfo.html#a134b8b97ce93ef4601c972d0fb760e93">ChangeBorderWidth</a>;
+<a name="l00218"></a>00218 
+<a name="l00219"></a><a class="code" href="struct__DMXScreenInfo.html#ad622affb2a1524a15f9bad149fa88f30">00219</a>     GetImageProcPtr                <a class="code" href="struct__DMXScreenInfo.html#ad622affb2a1524a15f9bad149fa88f30">GetImage</a>;
+<a name="l00220"></a><a class="code" href="struct__DMXScreenInfo.html#ad399c770af1784544ede0253593b3700">00220</a>     GetSpansProcPtr                <a class="code" href="struct__DMXScreenInfo.html#ad399c770af1784544ede0253593b3700">GetSpans</a>;
+<a name="l00221"></a>00221 
+<a name="l00222"></a><a class="code" href="struct__DMXScreenInfo.html#a88d8c787b8e05b4d69fa3d91f6456542">00222</a>     CreatePixmapProcPtr            <a class="code" href="struct__DMXScreenInfo.html#a88d8c787b8e05b4d69fa3d91f6456542">CreatePixmap</a>;
+<a name="l00223"></a><a class="code" href="struct__DMXScreenInfo.html#adafeb1337d14d4f650098f3bd06214db">00223</a>     DestroyPixmapProcPtr           <a class="code" href="struct__DMXScreenInfo.html#adafeb1337d14d4f650098f3bd06214db">DestroyPixmap</a>;
+<a name="l00224"></a><a class="code" href="struct__DMXScreenInfo.html#a1d29c3ada0aab8fbcd88c5ceaa48cf2d">00224</a>     BitmapToRegionProcPtr          <a class="code" href="struct__DMXScreenInfo.html#a1d29c3ada0aab8fbcd88c5ceaa48cf2d">BitmapToRegion</a>;
+<a name="l00225"></a>00225 
+<a name="l00226"></a><a class="code" href="struct__DMXScreenInfo.html#a22e93c0020eab3f889c54093ad32348e">00226</a>     RealizeFontProcPtr             <a class="code" href="struct__DMXScreenInfo.html#a22e93c0020eab3f889c54093ad32348e">RealizeFont</a>;
+<a name="l00227"></a><a class="code" href="struct__DMXScreenInfo.html#af46646c951db10afab56244b5345a6d8">00227</a>     UnrealizeFontProcPtr           <a class="code" href="struct__DMXScreenInfo.html#af46646c951db10afab56244b5345a6d8">UnrealizeFont</a>;
+<a name="l00228"></a>00228 
+<a name="l00229"></a><a class="code" href="struct__DMXScreenInfo.html#a082a4bae927eb9bbbd87cebdfd4d9dfc">00229</a>     CreateColormapProcPtr          <a class="code" href="struct__DMXScreenInfo.html#a082a4bae927eb9bbbd87cebdfd4d9dfc">CreateColormap</a>;
+<a name="l00230"></a><a class="code" href="struct__DMXScreenInfo.html#a0a407c422f268db1da74672d572102bb">00230</a>     DestroyColormapProcPtr         <a class="code" href="struct__DMXScreenInfo.html#a0a407c422f268db1da74672d572102bb">DestroyColormap</a>;
+<a name="l00231"></a><a class="code" href="struct__DMXScreenInfo.html#ab5a18ace3bb18cbcc9e127f51c494006">00231</a>     InstallColormapProcPtr         <a class="code" href="struct__DMXScreenInfo.html#ab5a18ace3bb18cbcc9e127f51c494006">InstallColormap</a>;
+<a name="l00232"></a><a class="code" href="struct__DMXScreenInfo.html#addce695c56fcc40e89b5c5add6a09205">00232</a>     StoreColorsProcPtr             <a class="code" href="struct__DMXScreenInfo.html#addce695c56fcc40e89b5c5add6a09205">StoreColors</a>;
+<a name="l00233"></a>00233 
+<a name="l00234"></a><a class="code" href="struct__DMXScreenInfo.html#ad4273ba541b4d7e50c967c42d80733bb">00234</a>     SetShapeProcPtr                <a class="code" href="struct__DMXScreenInfo.html#ad4273ba541b4d7e50c967c42d80733bb">SetShape</a>;
+<a name="l00235"></a>00235 
+<a name="l00236"></a>00236 <span class="preprocessor">#ifdef RENDER</span>
+<a name="l00237"></a><a class="code" href="struct__DMXScreenInfo.html#adf17f1a03e6a5a127b02aaa9005d8089">00237</a> <span class="preprocessor"></span>    CreatePictureProcPtr           <a class="code" href="struct__DMXScreenInfo.html#adf17f1a03e6a5a127b02aaa9005d8089">CreatePicture</a>;
+<a name="l00238"></a><a class="code" href="struct__DMXScreenInfo.html#a31909a1072cd78345457bd6b0c81ac1c">00238</a>     DestroyPictureProcPtr          <a class="code" href="struct__DMXScreenInfo.html#a31909a1072cd78345457bd6b0c81ac1c">DestroyPicture</a>;
+<a name="l00239"></a><a class="code" href="struct__DMXScreenInfo.html#a62a21ad708a96cb1653e8d572895b1de">00239</a>     ChangePictureClipProcPtr       <a class="code" href="struct__DMXScreenInfo.html#a62a21ad708a96cb1653e8d572895b1de">ChangePictureClip</a>;
+<a name="l00240"></a><a class="code" href="struct__DMXScreenInfo.html#ab643ec0c295421859733b8f654ff8ce7">00240</a>     DestroyPictureClipProcPtr      <a class="code" href="struct__DMXScreenInfo.html#ab643ec0c295421859733b8f654ff8ce7">DestroyPictureClip</a>;
+<a name="l00241"></a>00241     
+<a name="l00242"></a><a class="code" href="struct__DMXScreenInfo.html#a933b5c32ef1671dae5acc1e96b7f34e3">00242</a>     ChangePictureProcPtr           <a class="code" href="struct__DMXScreenInfo.html#a933b5c32ef1671dae5acc1e96b7f34e3">ChangePicture</a>;
+<a name="l00243"></a><a class="code" href="struct__DMXScreenInfo.html#a627ae18aeaa92da0923ab49803470c71">00243</a>     ValidatePictureProcPtr         <a class="code" href="struct__DMXScreenInfo.html#a627ae18aeaa92da0923ab49803470c71">ValidatePicture</a>;
+<a name="l00244"></a>00244 
+<a name="l00245"></a><a class="code" href="struct__DMXScreenInfo.html#a5e70f79e08b658092d83d266686c9a67">00245</a>     CompositeProcPtr               <a class="code" href="struct__DMXScreenInfo.html#a5e70f79e08b658092d83d266686c9a67">Composite</a>;
+<a name="l00246"></a><a class="code" href="struct__DMXScreenInfo.html#ab2bf09e1d055cad3ecfb1b00ddadc89e">00246</a>     GlyphsProcPtr                  <a class="code" href="struct__DMXScreenInfo.html#ab2bf09e1d055cad3ecfb1b00ddadc89e">Glyphs</a>;
+<a name="l00247"></a><a class="code" href="struct__DMXScreenInfo.html#a2b5509668e39153253b7d7d945dddecb">00247</a>     CompositeRectsProcPtr          <a class="code" href="struct__DMXScreenInfo.html#a2b5509668e39153253b7d7d945dddecb">CompositeRects</a>;
+<a name="l00248"></a>00248 
+<a name="l00249"></a><a class="code" href="struct__DMXScreenInfo.html#adaae790d6f5dd1dec98e57e2e669e3fd">00249</a>     InitIndexedProcPtr             <a class="code" href="struct__DMXScreenInfo.html#adaae790d6f5dd1dec98e57e2e669e3fd">InitIndexed</a>;
+<a name="l00250"></a><a class="code" href="struct__DMXScreenInfo.html#a99c75513907782d2679bd9e2ed327621">00250</a>     CloseIndexedProcPtr            <a class="code" href="struct__DMXScreenInfo.html#a99c75513907782d2679bd9e2ed327621">CloseIndexed</a>;
+<a name="l00251"></a><a class="code" href="struct__DMXScreenInfo.html#afa11a2993fe14ec90db2de382cdeb25c">00251</a>     UpdateIndexedProcPtr           <a class="code" href="struct__DMXScreenInfo.html#afa11a2993fe14ec90db2de382cdeb25c">UpdateIndexed</a>;
+<a name="l00252"></a>00252 
+<a name="l00253"></a><a class="code" href="struct__DMXScreenInfo.html#a4008b17ac4eb89816a8c2d3ce2e14421">00253</a>     TrapezoidsProcPtr              <a class="code" href="struct__DMXScreenInfo.html#a4008b17ac4eb89816a8c2d3ce2e14421">Trapezoids</a>;
+<a name="l00254"></a><a class="code" href="struct__DMXScreenInfo.html#af37150652184c4865700576504ec9df9">00254</a>     TrianglesProcPtr               <a class="code" href="struct__DMXScreenInfo.html#af37150652184c4865700576504ec9df9">Triangles</a>;
+<a name="l00255"></a><a class="code" href="struct__DMXScreenInfo.html#a5918dec3813c47c24f52f076f1b05dc4">00255</a>     TriStripProcPtr                <a class="code" href="struct__DMXScreenInfo.html#a5918dec3813c47c24f52f076f1b05dc4">TriStrip</a>;
+<a name="l00256"></a><a class="code" href="struct__DMXScreenInfo.html#a0829ea4299b5afcb1d2f2894334fed69">00256</a>     TriFanProcPtr                  <a class="code" href="struct__DMXScreenInfo.html#a0829ea4299b5afcb1d2f2894334fed69">TriFan</a>;
+<a name="l00257"></a>00257 <span class="preprocessor">#endif</span>
+<a name="l00258"></a>00258 <span class="preprocessor"></span>} <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>;
+<a name="l00259"></a>00259 
+<a name="l00260"></a>00260 <span class="comment">/* Global variables available to all Xserver/hw/dmx routines. */</span>
+<a name="l00261"></a>00261 <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a>;          
+<a name="l00262"></a>00262 <span class="keyword">extern</span> <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>   *<a class="code" href="dmx_8h.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a>;             
+<a name="l00263"></a>00263 <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#a97d09d0d46e9e7df451072def499e4fe">dmxShadowFB</a>;            
+<a name="l00266"></a>00266 <span class="keyword">extern</span> XErrorEvent      <a class="code" href="dmx_8h.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxLastErrorEvent</a>;      
+<a name="l00268"></a>00268 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxErrorOccurred</a>;       
+<a name="l00270"></a>00270 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a>;        
+<a name="l00273"></a>00273 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a8207510b34c9871015d1e9378c31c568">dmxSubdividePrimitives</a>; 
+<a name="l00276"></a>00276 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#af266e8dde07901ede60eaa822b3e945a">dmxLazyWindowCreation</a>;  
+<a name="l00279"></a>00279 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#ab5b999218612af4136983694943737aa">dmxUseXKB</a>;              
+<a name="l00283"></a>00283 <span class="keyword">extern</span> <span class="keywordtype">int</span>              <a class="code" href="dmx_8h.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxDepth</a>;               
+<a name="l00285"></a>00285 <span class="preprocessor">#ifdef GLXEXT</span>
+<a name="l00286"></a>00286 <span class="preprocessor"></span><span class="keyword">extern</span> Bool             <a class="code" href="dmxinit_8c.html#ae0253d9b4aa523bbdee8aaafbe63c1a4">dmxGLXProxy</a>;            
+<a name="l00288"></a>00288 <span class="keyword">extern</span> Bool             dmxGLXSwapGroupSupport; 
+<a name="l00292"></a>00292 <span class="keyword">extern</span> Bool             dmxGLXSyncSwap;         
+<a name="l00296"></a>00296 <span class="keyword">extern</span> Bool             dmxGLXFinishSwap;       
+<a name="l00301"></a>00301 <span class="preprocessor">#endif</span>
+<a name="l00302"></a>00302 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">char</span>            *<a class="code" href="dmx_8h.html#a10581b0cb51e730e26cbc08913a76c5f">dmxFontPath</a>;            
+<a name="l00311"></a>00311 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxIgnoreBadFontPaths</a>;  
+<a name="l00315"></a>00315 <span class="keyword">extern</span> Bool             <a class="code" href="dmx_8h.html#a8d53c22ed93cbef2684016d3c7638671">dmxAddRemoveScreens</a>;    
+<a name="l00320"></a><a class="code" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">00320</a> <span class="preprocessor">#define DMX_WRAP(_entry, _newfunc, _saved, _actual)                     \</span>
+<a name="l00321"></a>00321 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00322"></a>00322 <span class="preprocessor">    (_saved)-&gt;_entry  = (_actual)-&gt;_entry;                              \</span>
+<a name="l00323"></a>00323 <span class="preprocessor">    (_actual)-&gt;_entry = (_newfunc);                                     \</span>
+<a name="l00324"></a>00324 <span class="preprocessor">} while (0)</span>
+<a name="l00325"></a>00325 <span class="preprocessor"></span>
+<a name="l00327"></a><a class="code" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">00327</a> <span class="preprocessor">#define DMX_UNWRAP(_entry, _saved, _actual)                             \</span>
+<a name="l00328"></a>00328 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00329"></a>00329 <span class="preprocessor">    (_actual)-&gt;_entry = (_saved)-&gt;_entry;                               \</span>
+<a name="l00330"></a>00330 <span class="preprocessor">} while (0)</span>
+<a name="l00331"></a>00331 <span class="preprocessor"></span>
+<a name="l00332"></a>00332 <span class="comment">/* Define the MAXSCREENSALLOC/FREE macros, when MAXSCREENS patch has not</span>
+<a name="l00333"></a>00333 <span class="comment"> * been applied to sources. */</span>
+<a name="l00334"></a>00334 <span class="preprocessor">#ifdef MAXSCREENS</span>
+<a name="l00335"></a>00335 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREEN_MAKECONSTSTR1(x) #x</span>
+<a name="l00336"></a>00336 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREEN_MAKECONSTSTR2(x) MAXSCREEN_MAKECONSTSTR1(x)</span>
+<a name="l00337"></a>00337 <span class="preprocessor"></span>
+<a name="l00338"></a>00338 <span class="preprocessor">#define MAXSCREEN_FAILED_TXT &quot;Failed at [&quot;                              \</span>
+<a name="l00339"></a>00339 <span class="preprocessor">   MAXSCREEN_MAKECONSTSTR2(__LINE__) &quot;:&quot; __FILE__ &quot;] to allocate object: &quot;</span>
+<a name="l00340"></a>00340 <span class="preprocessor"></span>
+<a name="l00341"></a>00341 <span class="preprocessor">#define _MAXSCREENSALLOCF(o,size,fatal)                                 \</span>
+<a name="l00342"></a>00342 <span class="preprocessor">    do {                                                                \</span>
+<a name="l00343"></a>00343 <span class="preprocessor">        if (!o) {                                                       \</span>
+<a name="l00344"></a>00344 <span class="preprocessor">            o = calloc((size), sizeof(*(o)));                          \</span>
+<a name="l00345"></a>00345 <span class="preprocessor">            if (!o &amp;&amp; fatal) FatalError(MAXSCREEN_FAILED_TXT #o);       \</span>
+<a name="l00346"></a>00346 <span class="preprocessor">        }                                                               \</span>
+<a name="l00347"></a>00347 <span class="preprocessor">    } while (0)</span>
+<a name="l00348"></a>00348 <span class="preprocessor"></span><span class="preprocessor">#define _MAXSCREENSALLOCR(o,size,retval)                                \</span>
+<a name="l00349"></a>00349 <span class="preprocessor">    do {                                                                \</span>
+<a name="l00350"></a>00350 <span class="preprocessor">        if (!o) {                                                       \</span>
+<a name="l00351"></a>00351 <span class="preprocessor">            o = calloc((size), sizeof(*(o)));                          \</span>
+<a name="l00352"></a>00352 <span class="preprocessor">            if (!o) return retval;                                      \</span>
+<a name="l00353"></a>00353 <span class="preprocessor">        }                                                               \</span>
+<a name="l00354"></a>00354 <span class="preprocessor">    } while (0)</span>
+<a name="l00355"></a>00355 <span class="preprocessor"></span>        
+<a name="l00356"></a>00356 <span class="preprocessor">#define MAXSCREENSFREE(o)                                               \</span>
+<a name="l00357"></a>00357 <span class="preprocessor">    do {                                                                \</span>
+<a name="l00358"></a>00358 <span class="preprocessor">        if (o) free(o);                                                \</span>
+<a name="l00359"></a>00359 <span class="preprocessor">        o = NULL;                                                       \</span>
+<a name="l00360"></a>00360 <span class="preprocessor">    } while (0)</span>
+<a name="l00361"></a>00361 <span class="preprocessor"></span>
+<a name="l00362"></a>00362 <span class="preprocessor">#define MAXSCREENSALLOC(o)              _MAXSCREENSALLOCF(o,MAXSCREENS,  0)</span>
+<a name="l00363"></a>00363 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSALLOC_FATAL(o)        _MAXSCREENSALLOCF(o,MAXSCREENS,  1)</span>
+<a name="l00364"></a>00364 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSALLOC_RETURN(o,r)     _MAXSCREENSALLOCR(o,MAXSCREENS, (r))</span>
+<a name="l00365"></a>00365 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSALLOCPLUSONE(o)       _MAXSCREENSALLOCF(o,MAXSCREENS+1,0)</span>
+<a name="l00366"></a>00366 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSALLOCPLUSONE_FATAL(o) _MAXSCREENSALLOCF(o,MAXSCREENS+1,1)</span>
+<a name="l00367"></a>00367 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSCALLOC(o,m)           _MAXSCREENSALLOCF(o,MAXSCREENS*(m),0)</span>
+<a name="l00368"></a>00368 <span class="preprocessor"></span><span class="preprocessor">#define MAXSCREENSCALLOC_FATAL(o,m)     _MAXSCREENSALLOCF(o,MAXSCREENS*(m),1)</span>
+<a name="l00369"></a>00369 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00370"></a>00370 <span class="preprocessor"></span>
+<a name="l00371"></a>00371 <span class="preprocessor">#endif </span><span class="comment">/* DMX_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html
deleted file mode 100644
index 1885e30d7..000000000
--- a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h-source.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmx_glxvisuals.h</h1><div class="fragment"><pre>00001 <span class="comment">/*</span>
-00002 <span class="comment">** License Applicability. Except to the extent portions of this file are</span>
-00003 <span class="comment">** made subject to an alternative license as permitted in the SGI Free</span>
-00004 <span class="comment">** Software License B, Version 1.1 (the "License"), the contents of this</span>
-00005 <span class="comment">** file are subject only to the provisions of the License. You may not use</span>
-00006 <span class="comment">** this file except in compliance with the License. You may obtain a copy</span>
-00007 <span class="comment">** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600</span>
-00008 <span class="comment">** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:</span>
-00009 <span class="comment">**</span>
-00010 <span class="comment">** http://oss.sgi.com/projects/FreeB</span>
-00011 <span class="comment">**</span>
-00012 <span class="comment">** Note that, as provided in the License, the Software is distributed on an</span>
-00013 <span class="comment">** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS</span>
-00014 <span class="comment">** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND</span>
-00015 <span class="comment">** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A</span>
-00016 <span class="comment">** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.</span>
-00017 <span class="comment">**</span>
-00018 <span class="comment">** Original Code. The Original Code is: OpenGL Sample Implementation,</span>
-00019 <span class="comment">** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,</span>
-00020 <span class="comment">** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.</span>
-00021 <span class="comment">** Copyright in any portions created by third parties is as indicated</span>
-00022 <span class="comment">** elsewhere herein. All Rights Reserved.</span>
-00023 <span class="comment">**</span>
-00024 <span class="comment">** Additional Notice Provisions: The application programming interfaces</span>
-00025 <span class="comment">** established by SGI in conjunction with the Original Code are The</span>
-00026 <span class="comment">** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released</span>
-00027 <span class="comment">** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version</span>
-00028 <span class="comment">** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X</span>
-00029 <span class="comment">** Window System(R) (Version 1.3), released October 19, 1998. This software</span>
-00030 <span class="comment">** was created using the OpenGL(R) version 1.2.1 Sample Implementation</span>
-00031 <span class="comment">** published by SGI, but has not been independently verified as being</span>
-00032 <span class="comment">** compliant with the OpenGL(R) version 1.2.1 Specification.</span>
-00033 <span class="comment">**</span>
-00034 <span class="comment">*/</span>
-00035 
-00036 <span class="preprocessor">#ifndef _GLXVISUALS_H</span>
-00037 <span class="preprocessor"></span><span class="preprocessor">#define _GLXVISUALS_H</span>
-00038 <span class="preprocessor"></span>
-00039 <span class="preprocessor">#include &lt;GL/glxint.h&gt;</span>
-00040 
-<a name="l00042"></a><a class="code" href="structdmxGlxVisualPrivate.html">00042</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00043     <span class="keywordtype">int</span> x_visual_depth;
-00044     <span class="keywordtype">int</span> x_visual_class;
-00045 } <a class="code" href="structdmxGlxVisualPrivate.html">dmxGlxVisualPrivate</a>;
-00046 
-00047 __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy,
-00048                                        <span class="keywordtype">int</span> screen,
-00049                                        <span class="keywordtype">int</span> *nconfigs);
-00050 
-00051 __GLXFBConfig *GetGLXFBConfigs(Display *dpy,
-00052                                <span class="keywordtype">int</span> glxMajorOpcode,
-00053                                <span class="keywordtype">int</span> *nconfigs);
-00054 
-00055 __GLXvisualConfig *GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, 
-00056                                                     <span class="keywordtype">int</span> nfbconfigs, 
-00057                                                     XVisualInfo *visuals,
-00058                                                     <span class="keywordtype">int</span> nvisuals,
-00059                                                     __GLXvisualConfig
-00060                                                     *glxConfigs,
-00061                                                     <span class="keywordtype">int</span> nGlxConfigs,
-00062                                                     <span class="keywordtype">int</span> *nconfigs);
-00063 
-00064 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html
new file mode 100644
index 000000000..cd0361f9b
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmx__glxvisuals_8h_source.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmx_glxvisuals.h</h1><a href="dmx__glxvisuals_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)</span>
+<a name="l00003"></a>00003 <span class="comment"> * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.</span>
+<a name="l00004"></a>00004 <span class="comment"> *</span>
+<a name="l00005"></a>00005 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining a</span>
+<a name="l00006"></a>00006 <span class="comment"> * copy of this software and associated documentation files (the &quot;Software&quot;),</span>
+<a name="l00007"></a>00007 <span class="comment"> * to deal in the Software without restriction, including without limitation</span>
+<a name="l00008"></a>00008 <span class="comment"> * the rights to use, copy, modify, merge, publish, distribute, sublicense,</span>
+<a name="l00009"></a>00009 <span class="comment"> * and/or sell copies of the Software, and to permit persons to whom the</span>
+<a name="l00010"></a>00010 <span class="comment"> * Software is furnished to do so, subject to the following conditions:</span>
+<a name="l00011"></a>00011 <span class="comment"> *</span>
+<a name="l00012"></a>00012 <span class="comment"> * The above copyright notice including the dates of first publication and</span>
+<a name="l00013"></a>00013 <span class="comment"> * either this permission notice or a reference to</span>
+<a name="l00014"></a>00014 <span class="comment"> * http://oss.sgi.com/projects/FreeB/</span>
+<a name="l00015"></a>00015 <span class="comment"> * shall be included in all copies or substantial portions of the Software.</span>
+<a name="l00016"></a>00016 <span class="comment"> *</span>
+<a name="l00017"></a>00017 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS</span>
+<a name="l00018"></a>00018 <span class="comment"> * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</span>
+<a name="l00019"></a>00019 <span class="comment"> * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL</span>
+<a name="l00020"></a>00020 <span class="comment"> * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,</span>
+<a name="l00021"></a>00021 <span class="comment"> * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF</span>
+<a name="l00022"></a>00022 <span class="comment"> * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00023"></a>00023 <span class="comment"> * SOFTWARE.</span>
+<a name="l00024"></a>00024 <span class="comment"> *</span>
+<a name="l00025"></a>00025 <span class="comment"> * Except as contained in this notice, the name of Silicon Graphics, Inc.</span>
+<a name="l00026"></a>00026 <span class="comment"> * shall not be used in advertising or otherwise to promote the sale, use or</span>
+<a name="l00027"></a>00027 <span class="comment"> * other dealings in this Software without prior written authorization from</span>
+<a name="l00028"></a>00028 <span class="comment"> * Silicon Graphics, Inc.</span>
+<a name="l00029"></a>00029 <span class="comment"> */</span>
+<a name="l00030"></a>00030 
+<a name="l00031"></a>00031 <span class="preprocessor">#ifndef _GLXVISUALS_H</span>
+<a name="l00032"></a>00032 <span class="preprocessor"></span><span class="preprocessor">#define _GLXVISUALS_H</span>
+<a name="l00033"></a>00033 <span class="preprocessor"></span>
+<a name="l00034"></a>00034 <span class="preprocessor">#include &lt;GL/glxint.h&gt;</span>
+<a name="l00035"></a>00035 
+<a name="l00037"></a><a class="code" href="structdmxGlxVisualPrivate.html">00037</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00038"></a><a class="code" href="structdmxGlxVisualPrivate.html#a22b2f774126458d7577f14bc5bdc40fb">00038</a>     <span class="keywordtype">int</span> x_visual_depth;
+<a name="l00039"></a><a class="code" href="structdmxGlxVisualPrivate.html#a33df80a1990066d8f5a98977efde76de">00039</a>     <span class="keywordtype">int</span> x_visual_class;
+<a name="l00040"></a>00040 } <a class="code" href="structdmxGlxVisualPrivate.html">dmxGlxVisualPrivate</a>;
+<a name="l00041"></a>00041 
+<a name="l00042"></a>00042 __GLXvisualConfig *<a class="code" href="dmx__glxvisuals_8c.html#abe57e7081e90397658ffe52225891023">GetGLXVisualConfigs</a>(Display *dpy,
+<a name="l00043"></a>00043                                        <span class="keywordtype">int</span> screen,
+<a name="l00044"></a>00044                                        <span class="keywordtype">int</span> *nconfigs);
+<a name="l00045"></a>00045 
+<a name="l00046"></a>00046 __GLXFBConfig *<a class="code" href="dmx__glxvisuals_8c.html#a0ec26db964e7f051b0c53fa80f0ca64f">GetGLXFBConfigs</a>(Display *dpy,
+<a name="l00047"></a>00047                                <span class="keywordtype">int</span> glxMajorOpcode,
+<a name="l00048"></a>00048                                <span class="keywordtype">int</span> *nconfigs);
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050 __GLXvisualConfig *<a class="code" href="dmx__glxvisuals_8c.html#a8c817583455230eb81b38c9fcdf3d363">GetGLXVisualConfigsFromFBConfigs</a>(__GLXFBConfig *fbconfigs, 
+<a name="l00051"></a>00051                                                     <span class="keywordtype">int</span> nfbconfigs, 
+<a name="l00052"></a>00052                                                     XVisualInfo *visuals,
+<a name="l00053"></a>00053                                                     <span class="keywordtype">int</span> nvisuals,
+<a name="l00054"></a>00054                                                     __GLXvisualConfig
+<a name="l00055"></a>00055                                                     *glxConfigs,
+<a name="l00056"></a>00056                                                     <span class="keywordtype">int</span> nGlxConfigs,
+<a name="l00057"></a>00057                                                     <span class="keywordtype">int</span> *nconfigs);
+<a name="l00058"></a>00058 
+<a name="l00059"></a>00059 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8c.html b/xorg-server/hw/dmx/doc/html/dmxarg_8c.html
index db05599a6..ae8912a7e 100644
--- a/xorg-server/hw/dmx/doc/html/dmxarg_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxarg_8c.html
@@ -6,225 +6,214 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxarg.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxarg_8h-source.html">dmxarg.h</a>"</code><br>
-<code>#include &lt;stdio.h&gt;</code><br>
-<code>#include &lt;string.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxArg.html">_dmxArg</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a1">dmxArgCreate</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a2">dmxArgFree</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a3">dmxArgAdd</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, const  char *string)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a4">dmxArgV</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, int item)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a5">dmxArgC</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8c.html#a6">dmxArgParse</a> (const  char *string)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxarg.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxarg_8h_source.html">dmxarg.h</a>&quot;</code><br/>
+<code>#include &lt;stdio.h&gt;</code><br/>
+<code>#include &lt;string.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxArg.html">_dmxArg</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#a6da7af093c10727644c84f2c0de19dae">DMX_ARG_TEST</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#af4ecb9595303a7fcac5eae840766b6fb">dmxArgCreate</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#aa6b362f314787cc0e0fd7ca55b53a5cc">dmxArgFree</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#a6d41e61a00975e123ed72a269d653d23">dmxArgAdd</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, const char *string)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#a7de14f607c61ecac05f9c45d002e36ab">dmxArgV</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, int item)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#a94e36fd228f49fb0a77c34709cbd3a69">dmxArgC</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8c.html#a7d872851e86ae8063cd13e85ed203d09">dmxArgParse</a> (const char *string)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Generic comma-delimited argument processing.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxarg.c::dmxArgAdd" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Generic comma-delimited argument processing. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a6da7af093c10727644c84f2c0de19dae"></a><!-- doxytag: member="dmxarg.c::DMX_ARG_TEST" ref="a6da7af093c10727644c84f2c0de19dae" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxArgAdd </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>a</em>, </td>
+          <td class="memname">#define DMX_ARG_TEST&nbsp;&nbsp;&nbsp;0</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6d41e61a00975e123ed72a269d653d23"></a><!-- doxytag: member="dmxarg.c::dmxArgAdd" ref="a6d41e61a00975e123ed72a269d653d23" args="(dmxArg a, const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxArgAdd </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>string</em></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add the <em>string</em> as the next argument in the <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxarg.c::dmxArgC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Add the <em>string</em> as the next argument in the <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, <a class="el" href="dmxarg_8c_source.html#l00055">_dmxArg::argm</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94e36fd228f49fb0a77c34709cbd3a69"></a><!-- doxytag: member="dmxarg.c::dmxArgC" ref="a94e36fd228f49fb0a77c34709cbd3a69" args="(dmxArg a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxArgC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>a</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxArgC </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the number of arguments in the <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxarg.c::dmxArgCreate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return the number of arguments in the <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af4ecb9595303a7fcac5eae840766b6fb"></a><!-- doxytag: member="dmxarg.c::dmxArgCreate" ref="af4ecb9595303a7fcac5eae840766b6fb" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgCreate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgCreate </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create an (externally opaque) <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxarg.c::dmxArgFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create an (externally opaque) <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, <a class="el" href="dmxarg_8c_source.html#l00055">_dmxArg::argm</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6b362f314787cc0e0fd7ca55b53a5cc"></a><!-- doxytag: member="dmxarg.c::dmxArgFree" ref="aa6b362f314787cc0e0fd7ca55b53a5cc" args="(dmxArg a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxArgFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>a</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxArgFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free the specified <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxarg.c::dmxArgParse" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free the specified <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7d872851e86ae8063cd13e85ed203d09"></a><!-- doxytag: member="dmxarg.c::dmxArgParse" ref="a7d872851e86ae8063cd13e85ed203d09" args="(const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgParse </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>string</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgParse </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Parse a string into arguments delimited by commas. Return a new <em>dmxArg</em> object containing the arguments.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxarg.c::dmxArgV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Parse a string into arguments delimited by commas. Return a new <em>dmxArg</em> object containing the arguments. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00081">dmxArgAdd()</a>, and <a class="el" href="dmxarg_8c_source.html#l00060">dmxArgCreate()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7de14f607c61ecac05f9c45d002e36ab"></a><!-- doxytag: member="dmxarg.c::dmxArgV" ref="a7de14f607c61ecac05f9c45d002e36ab" args="(dmxArg a, int item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxArgV </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>a</em>, </td>
+          <td class="memname">const char* dmxArgV </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>item</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the argument number <em>item</em> in the <em>dmxArg</em> object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Return the argument number <em>item</em> in the <em>dmxArg</em> object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html
deleted file mode 100644
index 1f2fbce39..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxarg_8h-source.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxarg.h</h1><a href="dmxarg_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXARG_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXARG_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxArg.html">_dmxArg</a> *<a class="code" href="struct__dmxArg.html">dmxArg</a>;
-00042 
-00043 <span class="keyword">extern</span> <a class="code" href="struct__dmxArg.html">dmxArg</a>     <a class="code" href="dmxarg_8c.html#a1">dmxArgCreate</a>(<span class="keywordtype">void</span>);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>       <a class="code" href="dmxarg_8c.html#a2">dmxArgFree</a>(<a class="code" href="struct__dmxArg.html">dmxArg</a> a);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>       <a class="code" href="dmxarg_8c.html#a3">dmxArgAdd</a>(<a class="code" href="struct__dmxArg.html">dmxArg</a> a, <span class="keyword">const</span> <span class="keywordtype">char</span> *string);
-00046 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="dmxarg_8c.html#a4">dmxArgV</a>(<a class="code" href="struct__dmxArg.html">dmxArg</a> a, <span class="keywordtype">int</span> item);
-00047 <span class="keyword">extern</span> <span class="keywordtype">int</span>        <a class="code" href="dmxarg_8c.html#a5">dmxArgC</a>(<a class="code" href="struct__dmxArg.html">dmxArg</a> a);
-00048 <span class="keyword">extern</span> <a class="code" href="struct__dmxArg.html">dmxArg</a>     <a class="code" href="dmxarg_8c.html#a6">dmxArgParse</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *string);
-00049 
-00050 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h.html
index 41fd707e9..6446dfb48 100644
--- a/xorg-server/hw/dmx/doc/html/dmxarg_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxarg_8h.html
@@ -6,221 +6,211 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxarg.h File Reference</h1>
-<p>
-<a href="dmxarg_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a1">dmxArgCreate</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a2">dmxArgFree</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a3">dmxArgAdd</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, const  char *string)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a4">dmxArgV</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, int item)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a5">dmxArgC</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxarg_8h.html#a6">dmxArgParse</a> (const  char *string)</td></tr>
-
+<p><a href="dmxarg_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxArg.html">_dmxArg</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#a7f310ec1f9d20311533a2a142a0b92b8">dmxArg</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#af4ecb9595303a7fcac5eae840766b6fb">dmxArgCreate</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#aa6b362f314787cc0e0fd7ca55b53a5cc">dmxArgFree</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#a6d41e61a00975e123ed72a269d653d23">dmxArgAdd</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, const char *string)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#a7de14f607c61ecac05f9c45d002e36ab">dmxArgV</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a, int item)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#a94e36fd228f49fb0a77c34709cbd3a69">dmxArgC</a> (<a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxarg_8h.html#a7d872851e86ae8063cd13e85ed203d09">dmxArgParse</a> (const char *string)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to argument handling functions. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxarg_8c.html">dmxarg.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxarg.h::dmxArgAdd" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to argument handling functions. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxarg_8c.html">dmxarg.c</a> </dd></dl>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a7f310ec1f9d20311533a2a142a0b92b8"></a><!-- doxytag: member="dmxarg.h::dmxArg" ref="a7f310ec1f9d20311533a2a142a0b92b8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxArgAdd </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>a</em>, </td>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxArg.html">_dmxArg</a>* <a class="el" href="struct__dmxArg.html">dmxArg</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6d41e61a00975e123ed72a269d653d23"></a><!-- doxytag: member="dmxarg.h::dmxArgAdd" ref="a6d41e61a00975e123ed72a269d653d23" args="(dmxArg a, const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxArgAdd </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>string</em></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add the <em>string</em> as the next argument in the <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxarg.h::dmxArgC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Add the <em>string</em> as the next argument in the <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, <a class="el" href="dmxarg_8c_source.html#l00055">_dmxArg::argm</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94e36fd228f49fb0a77c34709cbd3a69"></a><!-- doxytag: member="dmxarg.h::dmxArgC" ref="a94e36fd228f49fb0a77c34709cbd3a69" args="(dmxArg a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxArgC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>a</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxArgC </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the number of arguments in the <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxarg.h::dmxArgCreate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return the number of arguments in the <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af4ecb9595303a7fcac5eae840766b6fb"></a><!-- doxytag: member="dmxarg.h::dmxArgCreate" ref="af4ecb9595303a7fcac5eae840766b6fb" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgCreate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgCreate </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create an (externally opaque) <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxarg.h::dmxArgFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create an (externally opaque) <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, <a class="el" href="dmxarg_8c_source.html#l00055">_dmxArg::argm</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6b362f314787cc0e0fd7ca55b53a5cc"></a><!-- doxytag: member="dmxarg.h::dmxArgFree" ref="aa6b362f314787cc0e0fd7ca55b53a5cc" args="(dmxArg a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxArgFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>a</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxArgFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free the specified <em>dmxArg</em> object.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxarg.h::dmxArgParse" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free the specified <em>dmxArg</em> object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7d872851e86ae8063cd13e85ed203d09"></a><!-- doxytag: member="dmxarg.h::dmxArgParse" ref="a7d872851e86ae8063cd13e85ed203d09" args="(const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgParse </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>string</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__dmxArg.html">dmxArg</a> dmxArgParse </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Parse a string into arguments delimited by commas. Return a new <em>dmxArg</em> object containing the arguments.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxarg.h::dmxArgV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Parse a string into arguments delimited by commas. Return a new <em>dmxArg</em> object containing the arguments. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00081">dmxArgAdd()</a>, and <a class="el" href="dmxarg_8c_source.html#l00060">dmxArgCreate()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7de14f607c61ecac05f9c45d002e36ab"></a><!-- doxytag: member="dmxarg.h::dmxArgV" ref="a7de14f607c61ecac05f9c45d002e36ab" args="(dmxArg a, int item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxArgV </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>a</em>, </td>
+          <td class="memname">const char* dmxArgV </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>item</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the argument number <em>item</em> in the <em>dmxArg</em> object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Return the argument number <em>item</em> in the <em>dmxArg</em> object. Arguments are 0 based. NULL will be returned for values less than 0 or equal to or greater than the number of arguments in the object. </p>
+
+<p>References <a class="el" href="dmxarg_8c_source.html#l00054">_dmxArg::argc</a>, and <a class="el" href="dmxarg_8c_source.html#l00056">_dmxArg::argv</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html
new file mode 100644
index 000000000..c48d76d06
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxarg_8h_source.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxarg.h</h1><a href="dmxarg_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXARG_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXARG_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a><a class="code" href="dmxarg_8h.html#a7f310ec1f9d20311533a2a142a0b92b8">00040</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxArg.html">_dmxArg</a> *<a class="code" href="struct__dmxArg.html">dmxArg</a>;
+<a name="l00041"></a>00041 
+<a name="l00042"></a>00042 <span class="keyword">extern</span> dmxArg     <a class="code" href="dmxarg_8c.html#af4ecb9595303a7fcac5eae840766b6fb">dmxArgCreate</a>(<span class="keywordtype">void</span>);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>       <a class="code" href="dmxarg_8c.html#aa6b362f314787cc0e0fd7ca55b53a5cc">dmxArgFree</a>(dmxArg a);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>       <a class="code" href="dmxarg_8c.html#a6d41e61a00975e123ed72a269d653d23">dmxArgAdd</a>(dmxArg a, <span class="keyword">const</span> <span class="keywordtype">char</span> *<span class="keywordtype">string</span>);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="dmxarg_8c.html#a7de14f607c61ecac05f9c45d002e36ab">dmxArgV</a>(dmxArg a, <span class="keywordtype">int</span> item);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">int</span>        <a class="code" href="dmxarg_8c.html#a94e36fd228f49fb0a77c34709cbd3a69">dmxArgC</a>(dmxArg a);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> dmxArg     <a class="code" href="dmxarg_8c.html#a7d872851e86ae8063cd13e85ed203d09">dmxArgParse</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *<span class="keywordtype">string</span>);
+<a name="l00048"></a>00048 
+<a name="l00049"></a>00049 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html
index 1fde71a99..d2bf63f5f 100644
--- a/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8c.html
@@ -6,413 +6,1173 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxbackend.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxbackend_8h-source.html">dmxbackend.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconsole_8h-source.html">dmxconsole.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxevents_8h-source.html">dmxevents.h</a>"</code><br>
-<code>#include "<a class="el" href="ChkNotMaskEv_8h-source.html">ChkNotMaskEv.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "input.h"</code><br>
-<code>#include "keysym.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-<code>#include "windowstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxbackend.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxbackend_8h_source.html">dmxbackend.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconsole_8h_source.html">dmxconsole.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxevents_8h_source.html">dmxevents.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="ChkNotMaskEv_8h_source.html">ChkNotMaskEv.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;input.h&quot;</code><br/>
+<code>#include &lt;X11/keysym.h&gt;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;scrnintstr.h&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a93e9da9032ea981dd2543ec373eb964f">DMX_BACKEND_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#adf6865b0bc7ad370c94e3b8682262c13">DMXDBG0</a>(f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a302a2c9f84249eee79404eb601d085ab">DMXDBG1</a>(f, a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a1056d63499cee76ebe297c19637f2b79">DMXDBG2</a>(f, a, b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a6c6714b899194081b94edb722ca1c4bc">DMXDBG3</a>(f, a, b, c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a8ffd07ee80777c394a6ff32d1021347d">DMXDBG4</a>(f, a, b, c, d)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a753eef37715b6379d7d65e34a23d2e03">DMXDBG5</a>(f, a, b, c, d, e)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#af703e1a00a515e2507f7d2a354429a24">DMXDBG6</a>(f, a, b, c, d, e, g)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#ab45c7f6cc47b2c786215ca0276d37d91">DMXDBG7</a>(f, a, b, c, d, e, g, h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a57571aaa5d83f2f29a6bd0ad8379b4fa">DMXDBG8</a>(f, a, b, c, d, e, g, h, i)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a8342fb3f503f3f58f0f636a908292b14">DMXDBG9</a>(f, a, b, c, d, e, g, h, i, j)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#acd47377dd517a5494edae5920e3ae946">dmxBackendDestroyPrivate</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a86a56e6c6d23ef0f13d1d4ee8f84a162">dmxBackendTestScreen</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a110847ce3c1d359156a025cf0dfcd734">dmxBackendSameDisplay</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, long screen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a0122fce9552a793ecffc2a6f1e03b4fc">dmxBackendTestEvents</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a772eea70f63c028de57f6d9e5bb48fbe">dmxBackendTestMotionEvent</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a7744472c5c8aafb2dd63d047995aeef3">dmxBackendGetEvent</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, XEvent *X)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#ad6238c7e9b114585583ce9b2120ff9fa">dmxBackendPendingMotionEvent</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int save)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a25cd9424824427d35f7e1cdb6ae0ad61">dmxBackendTestWindow</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#aad68f30daf82995805de813568eb0087">dmxBackendFindWindow</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, Window win)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#ad19eff278a8cb7748201a1e654c4bf32">dmxBackendFindOverlapping</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int screen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a2cb121a910d12c89e65fe68d8acb203f">dmxBackendOffscreen</a> (int screen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a486d684411f79c459a1195e5c02f404c">dmxBackendUpdatePosition</a> (pointer private, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a6e9b6f0743636b93aeb6ae71a3517abf">dmxBackendCollectEvents</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a4ee65e2f1b86616b7898c273d78a5853">dmxBackendProcessInput</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a36fc142bcd1dcb22ee46fb68dd443ebc">dmxBackendComputeCenter</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a69990fbd029b2aff929c909fab8a9125">dmxBackendInitPrivate</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a6027901ceb2a93e4fea5acf9b8cb0059">dmxBackendLateReInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a941213c5a98d26e0f30391ee312e1436">dmxBackendInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a1afb0902ffb9019c943b0c4db6315209">dmxBackendMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a1c628b807f62aeeeb2093ad63941eff1">dmxBackendKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8c.html#a0c9ccf0733bd3a4615815fc404e30a9c">dmxBackendFunctions</a> (pointer private, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>These routines support taking input from devices on the backend (output) displays. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a>. </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a93e9da9032ea981dd2543ec373eb964f"></a><!-- doxytag: member="dmxbackend.c::DMX_BACKEND_DEBUG" ref="a93e9da9032ea981dd2543ec373eb964f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_BACKEND_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a12">dmxBackendCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+</div>
+</div>
+<a class="anchor" id="adf6865b0bc7ad370c94e3b8682262c13"></a><!-- doxytag: member="dmxbackend.c::DMXDBG0" ref="adf6865b0bc7ad370c94e3b8682262c13" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a13">dmxBackendDestroyPrivate</a> (pointer private)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a302a2c9f84249eee79404eb601d085ab"></a><!-- doxytag: member="dmxbackend.c::DMXDBG1" ref="a302a2c9f84249eee79404eb601d085ab" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a24">dmxBackendUpdatePosition</a> (pointer private, int x, int y)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a1056d63499cee76ebe297c19637f2b79"></a><!-- doxytag: member="dmxbackend.c::DMXDBG2" ref="a1056d63499cee76ebe297c19637f2b79" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a25">dmxBackendCollectEvents</a> (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6c6714b899194081b94edb722ca1c4bc"></a><!-- doxytag: member="dmxbackend.c::DMXDBG3" ref="a6c6714b899194081b94edb722ca1c4bc" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a26">dmxBackendProcessInput</a> (pointer private)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8ffd07ee80777c394a6ff32d1021347d"></a><!-- doxytag: member="dmxbackend.c::DMXDBG4" ref="a8ffd07ee80777c394a6ff32d1021347d" args="(f, a, b, c, d)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG4</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a29">dmxBackendLateReInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a753eef37715b6379d7d65e34a23d2e03"></a><!-- doxytag: member="dmxbackend.c::DMXDBG5" ref="a753eef37715b6379d7d65e34a23d2e03" args="(f, a, b, c, d, e)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG5</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a30">dmxBackendInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="af703e1a00a515e2507f7d2a354429a24"></a><!-- doxytag: member="dmxbackend.c::DMXDBG6" ref="af703e1a00a515e2507f7d2a354429a24" args="(f, a, b, c, d, e, g)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG6</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a31">dmxBackendMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ab45c7f6cc47b2c786215ca0276d37d91"></a><!-- doxytag: member="dmxbackend.c::DMXDBG7" ref="ab45c7f6cc47b2c786215ca0276d37d91" args="(f, a, b, c, d, e, g, h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG7</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">h&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a32">dmxBackendKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a57571aaa5d83f2f29a6bd0ad8379b4fa"></a><!-- doxytag: member="dmxbackend.c::DMXDBG8" ref="a57571aaa5d83f2f29a6bd0ad8379b4fa" args="(f, a, b, c, d, e, g, h, i)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG8</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">h, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">i&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8c.html#a33">dmxBackendFunctions</a> (pointer private, DMXFunctionType function)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-These routines support taking input from devices on the backend (output) displays. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a>.</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a25" doxytag="dmxbackend.c::dmxBackendCollectEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a8342fb3f503f3f58f0f636a908292b14"></a><!-- doxytag: member="dmxbackend.c::DMXDBG9" ref="a8342fb3f503f3f58f0f636a908292b14" args="(f, a, b, c, d, e, g, h, i, j)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendCollectEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define DMXDBG9</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>dmxMotionProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">b, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>dmxEnqueueProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td class="paramtype">d, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>dmxCheckSpecialProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">g, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">h, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">i, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">j&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="dmxbackend.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get events from the X queue on the backend servers and put the events into the DMX event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxbackend.c::dmxBackendCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6e9b6f0743636b93aeb6ae71a3517abf"></a><!-- doxytag: member="dmxbackend.c::dmxBackendCollectEvents" ref="a6e9b6f0743636b93aeb6ae71a3517abf" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBackendCollectEvents </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> pointer dmxBackendCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Get events from the X queue on the backend servers and put the events into the DMX event queue. </p>
 
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxbackend_8c_source.html#l00206">dmxBackendFindWindow()</a>, <a class="el" href="dmxbackend_8c_source.html#l00177">dmxBackendGetEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00112">DMXDBG7</a>, <a class="el" href="dmxbackend_8c_source.html#l00099">DMXDBG8</a>, <a class="el" href="dmxbackend_8c_source.html#l00100">DMXDBG9</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a36fc142bcd1dcb22ee46fb68dd443ebc"></a><!-- doxytag: member="dmxbackend.c::dmxBackendComputeCenter" ref="a36fc142bcd1dcb22ee46fb68dd443ebc" args="(myPrivate *priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBackendComputeCenter </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create and return a private data structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxbackend.c::dmxBackendDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00070">_myPrivate::centerX</a>, and <a class="el" href="dmxbackend_8c_source.html#l00070">_myPrivate::centerY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00552">dmxBackendInit()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a875125c1316c123e45c7e7a9251c2e"></a><!-- doxytag: member="dmxbackend.c::dmxBackendCreatePrivate" ref="a2a875125c1316c123e45c7e7a9251c2e" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer dmxBackendCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create and return a private data structure. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="acd47377dd517a5494edae5920e3ae946"></a><!-- doxytag: member="dmxbackend.c::dmxBackendDestroyPrivate" ref="acd47377dd517a5494edae5920e3ae946" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBackendDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the private data structure. No checking is performed to verify that the structure was actually created by <a class="el" href="dmxbackend_8h.html#a0">dmxBackendCreatePrivate</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="dmxbackend.c::dmxBackendFunctions" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the private data structure. No checking is performed to verify that the structure was actually created by <a class="el" href="dmxbackend_8h.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a>. </p>
+
+</div>
+</div>
+<a class="anchor" id="ad19eff278a8cb7748201a1e654c4bf32"></a><!-- doxytag: member="dmxbackend.c::dmxBackendFindOverlapping" ref="ad19eff278a8cb7748201a1e654c4bf32" args="(myPrivate *priv, int screen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxBackendFunctions </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">static int dmxBackendFindOverlapping </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>screen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DMXFunctionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>function</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Process #DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="dmxbackend.c::dmxBackendInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxbackend_8c_source.html#l00066">_myPrivate::myScreen</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aad68f30daf82995805de813568eb0087"></a><!-- doxytag: member="dmxbackend.c::dmxBackendFindWindow" ref="aad68f30daf82995805de813568eb0087" args="(myPrivate *priv, Window win)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxBackendFindWindow </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Window&nbsp;</td>
+          <td class="paramname"> <em>win</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00199">dmxBackendTestWindow()</a>, and <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a0c9ccf0733bd3a4615815fc404e30a9c"></a><!-- doxytag: member="dmxbackend.c::dmxBackendFunctions" ref="a0c9ccf0733bd3a4615815fc404e30a9c" args="(pointer private, DMXFunctionType function)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxBackendFunctions </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>&nbsp;</td>
+          <td class="paramname"> <em>function</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialized the backend device described by <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="dmxbackend.c::dmxBackendKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Process <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> functions. The only function handled here is to acknowledge a pending server shutdown. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00057">DMX_FUNCTION_TERMINATE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7744472c5c8aafb2dd63d047995aeef3"></a><!-- doxytag: member="dmxbackend.c::dmxBackendGetEvent" ref="a7744472c5c8aafb2dd63d047995aeef3" args="(myPrivate *priv, XEvent *X)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxBackendGetEvent </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>X</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00159">dmxBackendTestEvents()</a>, and <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a941213c5a98d26e0f30391ee312e1436"></a><!-- doxytag: member="dmxbackend.c::dmxBackendInit" ref="a941213c5a98d26e0f30391ee312e1436" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxBackendInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialized the backend device described by <em>pDev</em>. </p>
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, and <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a69990fbd029b2aff929c909fab8a9125"></a><!-- doxytag: member="dmxbackend.c::dmxBackendInitPrivate" ref="a69990fbd029b2aff929c909fab8a9125" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxBackendInitPrivate </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get information about the backend keyboard (for initialization).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxbackend.c::dmxBackendLateReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00552">dmxBackendInit()</a>, <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c628b807f62aeeeb2093ad63941eff1"></a><!-- doxytag: member="dmxbackend.c::dmxBackendKbdGetInfo" ref="a1c628b807f62aeeeb2093ad63941eff1" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendLateReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Get information about the backend keyboard (for initialization). </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00214">dmxCommonKbdGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a6027901ceb2a93e4fea5acf9b8cb0059"></a><!-- doxytag: member="dmxbackend.c::dmxBackendLateReInit" ref="a6027901ceb2a93e4fea5acf9b8cb0059" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBackendLateReInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialized the backend device described by <em>pDev</em> (after a reconfig).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a31" doxytag="dmxbackend.c::dmxBackendMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Re-initialized the backend device described by <em>pDev</em> (after a reconfig). </p>
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00106">DMXDBG1</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxevents_8c_source.html#l00541">dmxInvalidateGlobalPosition()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1afb0902ffb9019c943b0c4db6315209"></a><!-- doxytag: member="dmxbackend.c::dmxBackendMouGetInfo" ref="a1afb0902ffb9019c943b0c4db6315209" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxBackendMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Get information about the backend pointer (for initialization). </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2cb121a910d12c89e65fe68d8acb203f"></a><!-- doxytag: member="dmxbackend.c::dmxBackendOffscreen" ref="a2cb121a910d12c89e65fe68d8acb203f" args="(int screen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxBackendOffscreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>screen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ad6238c7e9b114585583ce9b2120ff9fa"></a><!-- doxytag: member="dmxbackend.c::dmxBackendPendingMotionEvent" ref="ad6238c7e9b114585583ce9b2120ff9fa" args="(myPrivate *priv, int save)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxBackendPendingMotionEvent </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>save</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get information about the backend pointer (for initialization).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxbackend.c::dmxBackendProcessInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxbackend_8c_source.html#l00168">dmxBackendTestMotionEvent()</a>, and <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4ee65e2f1b86616b7898c273d78a5853"></a><!-- doxytag: member="dmxbackend.c::dmxBackendProcessInput" ref="a4ee65e2f1b86616b7898c273d78a5853" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendProcessInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendProcessInput </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a110847ce3c1d359156a025cf0dfcd734"></a><!-- doxytag: member="dmxbackend.c::dmxBackendSameDisplay" ref="a110847ce3c1d359156a025cf0dfcd734" args="(myPrivate *priv, long screen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxBackendSameDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">long&nbsp;</td>
+          <td class="paramname"> <em>screen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxbackend.c::dmxBackendUpdatePosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00120">dmxBackendTestScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00066">_myPrivate::myScreen</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00552">dmxBackendInit()</a>, <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0122fce9552a793ecffc2a6f1e03b4fc"></a><!-- doxytag: member="dmxbackend.c::dmxBackendTestEvents" ref="a0122fce9552a793ecffc2a6f1e03b4fc" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxBackendTestEvents </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, and <a class="el" href="ChkNotMaskEv_8c_source.html#l00070">XCheckNotMaskEvent()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00177">dmxBackendGetEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a772eea70f63c028de57f6d9e5bb48fbe"></a><!-- doxytag: member="dmxbackend.c::dmxBackendTestMotionEvent" ref="a772eea70f63c028de57f6d9e5bb48fbe" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendUpdatePosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">static void* dmxBackendTestMotionEvent </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a86a56e6c6d23ef0f13d1d4ee8f84a162"></a><!-- doxytag: member="dmxbackend.c::dmxBackendTestScreen" ref="a86a56e6c6d23ef0f13d1d4ee8f84a162" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxBackendTestScreen </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25cd9424824427d35f7e1cdb6ae0ad61"></a><!-- doxytag: member="dmxbackend.c::dmxBackendTestWindow" ref="a25cd9424824427d35f7e1cdb6ae0ad61" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxBackendTestWindow </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00206">dmxBackendFindWindow()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a486d684411f79c459a1195e5c02f404c"></a><!-- doxytag: member="dmxbackend.c::dmxBackendUpdatePosition" ref="a486d684411f79c459a1195e5c02f404c" args="(pointer private, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBackendUpdatePosition </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is called from #dmxCoreMotion for each motion event. #x and #y are global coordinants.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>This routine is called from <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> for each motion event. <em>x</em> and <em>y</em> are global coordinants. </p>
+
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxbackend_8c_source.html#l00100">DMXDBG9</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html
deleted file mode 100644
index 9b58dac3e..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxbackend_8h-source.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxbackend.h</h1><a href="dmxbackend_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00039 <span class="preprocessor">#ifndef _DMXBACKEND_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define _DMXBACKEND_H_</span>
-00041 <span class="preprocessor"></span>
-00042 <span class="keyword">extern</span> pointer <a class="code" href="dmxbackend_8c.html#a12">dmxBackendCreatePrivate</a>(DeviceIntPtr pDevice);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a13">dmxBackendDestroyPrivate</a>(pointer <span class="keyword">private</span>);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a30">dmxBackendInit</a>(DevicePtr pDev);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a29">dmxBackendLateReInit</a>(DevicePtr pDev);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a31">dmxBackendMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a32">dmxBackendKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a25">dmxBackendCollectEvents</a>(DevicePtr pDev,
-00049                                        dmxMotionProcPtr motion,
-00050                                        dmxEnqueueProcPtr enqueue,
-00051                                        dmxCheckSpecialProcPtr checkspecial,
-00052                                        DMXBlockType block);
-00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a26">dmxBackendProcessInput</a>(pointer <span class="keyword">private</span>);
-00054 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxbackend_8c.html#a33">dmxBackendFunctions</a>(pointer <span class="keyword">private</span>, DMXFunctionType function);
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a24">dmxBackendUpdatePosition</a>(pointer <span class="keyword">private</span>, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00056 
-00057 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html
index 2a601be0c..ace4261c4 100644
--- a/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8h.html
@@ -6,397 +6,324 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxbackend.h File Reference</h1>
-<p>
-<a href="dmxbackend_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a0">dmxBackendCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a1">dmxBackendDestroyPrivate</a> (pointer private)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a2">dmxBackendInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a3">dmxBackendLateReInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a4">dmxBackendMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a5">dmxBackendKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a6">dmxBackendCollectEvents</a> (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a7">dmxBackendProcessInput</a> (pointer private)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a8">dmxBackendFunctions</a> (pointer private, DMXFunctionType function)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxbackend_8h.html#a9">dmxBackendUpdatePosition</a> (pointer private, int x, int y)</td></tr>
-
+<p><a href="dmxbackend_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#acd47377dd517a5494edae5920e3ae946">dmxBackendDestroyPrivate</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a941213c5a98d26e0f30391ee312e1436">dmxBackendInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a6027901ceb2a93e4fea5acf9b8cb0059">dmxBackendLateReInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a1afb0902ffb9019c943b0c4db6315209">dmxBackendMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a1c628b807f62aeeeb2093ad63941eff1">dmxBackendKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a6e9b6f0743636b93aeb6ae71a3517abf">dmxBackendCollectEvents</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a4ee65e2f1b86616b7898c273d78a5853">dmxBackendProcessInput</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a0c9ccf0733bd3a4615815fc404e30a9c">dmxBackendFunctions</a> (pointer private, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxbackend_8h.html#a486d684411f79c459a1195e5c02f404c">dmxBackendUpdatePosition</a> (pointer private, int x, int y)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to backend input device support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> <p>
-<a class="el" href="dmxcommon_8c.html">dmxcommon.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxbackend.h::dmxBackendCollectEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to backend input device support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd>
+<dd>
+<a class="el" href="dmxcommon_8c.html">dmxcommon.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6e9b6f0743636b93aeb6ae71a3517abf"></a><!-- doxytag: member="dmxbackend.h::dmxBackendCollectEvents" ref="a6e9b6f0743636b93aeb6ae71a3517abf" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendCollectEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxBackendCollectEvents </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxMotionProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxEnqueueProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxCheckSpecialProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get events from the X queue on the backend servers and put the events into the DMX event queue. </p>
 
-<p>
-Get events from the X queue on the backend servers and put the events into the DMX event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxbackend.h::dmxBackendCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxbackend_8c_source.html#l00206">dmxBackendFindWindow()</a>, <a class="el" href="dmxbackend_8c_source.html#l00177">dmxBackendGetEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00112">DMXDBG7</a>, <a class="el" href="dmxbackend_8c_source.html#l00099">DMXDBG8</a>, <a class="el" href="dmxbackend_8c_source.html#l00100">DMXDBG9</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a875125c1316c123e45c7e7a9251c2e"></a><!-- doxytag: member="dmxbackend.h::dmxBackendCreatePrivate" ref="a2a875125c1316c123e45c7e7a9251c2e" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer dmxBackendCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer dmxBackendCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create and return a private data structure. </p>
 
-<p>
-Create and return a private data structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxbackend.h::dmxBackendDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acd47377dd517a5494edae5920e3ae946"></a><!-- doxytag: member="dmxbackend.h::dmxBackendDestroyPrivate" ref="acd47377dd517a5494edae5920e3ae946" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy the private data structure. No checking is performed to verify that the structure was actually created by <a class="el" href="dmxbackend_8h.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a>. </p>
 
-<p>
-Destroy the private data structure. No checking is performed to verify that the structure was actually created by <a class="el" href="dmxbackend_8h.html#a0">dmxBackendCreatePrivate</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxbackend.h::dmxBackendFunctions" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a0c9ccf0733bd3a4615815fc404e30a9c"></a><!-- doxytag: member="dmxbackend.h::dmxBackendFunctions" ref="a0c9ccf0733bd3a4615815fc404e30a9c" args="(pointer private, DMXFunctionType function)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxBackendFunctions </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">int dmxBackendFunctions </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXFunctionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>function</em></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>&nbsp;</td>
+          <td class="paramname"> <em>function</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Process <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> functions. The only function handled here is to acknowledge a pending server shutdown. </p>
 
-<p>
-Process #DMXFunctionType functions. The only function handled here is to acknowledge a pending server shutdown.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxbackend.h::dmxBackendInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00057">DMX_FUNCTION_TERMINATE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a941213c5a98d26e0f30391ee312e1436"></a><!-- doxytag: member="dmxbackend.h::dmxBackendInit" ref="a941213c5a98d26e0f30391ee312e1436" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialized the backend device described by <em>pDev</em>. </p>
 
-<p>
-Initialized the backend device described by <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxbackend.h::dmxBackendKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, and <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c628b807f62aeeeb2093ad63941eff1"></a><!-- doxytag: member="dmxbackend.h::dmxBackendKbdGetInfo" ref="a1c628b807f62aeeeb2093ad63941eff1" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxBackendKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get information about the backend keyboard (for initialization). </p>
 
-<p>
-Get information about the backend keyboard (for initialization).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxbackend.h::dmxBackendLateReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00214">dmxCommonKbdGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6027901ceb2a93e4fea5acf9b8cb0059"></a><!-- doxytag: member="dmxbackend.h::dmxBackendLateReInit" ref="a6027901ceb2a93e4fea5acf9b8cb0059" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendLateReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendLateReInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Re-initialized the backend device described by <em>pDev</em> (after a reconfig). </p>
 
-<p>
-Re-initialized the backend device described by <em>pDev</em> (after a reconfig).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxbackend.h::dmxBackendMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00106">DMXDBG1</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxevents_8c_source.html#l00541">dmxInvalidateGlobalPosition()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1afb0902ffb9019c943b0c4db6315209"></a><!-- doxytag: member="dmxbackend.h::dmxBackendMouGetInfo" ref="a1afb0902ffb9019c943b0c4db6315209" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxBackendMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get information about the backend pointer (for initialization). </p>
 
-<p>
-Get information about the backend pointer (for initialization).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxbackend.h::dmxBackendProcessInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4ee65e2f1b86616b7898c273d78a5853"></a><!-- doxytag: member="dmxbackend.h::dmxBackendProcessInput" ref="a4ee65e2f1b86616b7898c273d78a5853" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendProcessInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBackendProcessInput </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer. </p>
 
-<p>
-Called after input events are processed from the DMX queue. No event processing actually takes place here, but this is a convenient place to update the pointer.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxbackend.h::dmxBackendUpdatePosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a486d684411f79c459a1195e5c02f404c"></a><!-- doxytag: member="dmxbackend.h::dmxBackendUpdatePosition" ref="a486d684411f79c459a1195e5c02f404c" args="(pointer private, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBackendUpdatePosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">void dmxBackendUpdatePosition </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine is called from <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> for each motion event. <em>x</em> and <em>y</em> are global coordinants. </p>
 
-<p>
-This routine is called from #dmxCoreMotion for each motion event. #x and #y are global coordinants.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxbackend_8c_source.html#l00100">DMXDBG9</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html
new file mode 100644
index 000000000..8e43b858f
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxbackend_8h_source.html
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxbackend.h</h1><a href="dmxbackend_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef _DMXBACKEND_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXBACKEND_H_</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00041"></a>00041 <span class="keyword">extern</span> pointer <a class="code" href="dmxbackend_8c.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a>(DeviceIntPtr pDevice);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#acd47377dd517a5494edae5920e3ae946">dmxBackendDestroyPrivate</a>(pointer <span class="keyword">private</span>);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a941213c5a98d26e0f30391ee312e1436">dmxBackendInit</a>(DevicePtr pDev);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a6027901ceb2a93e4fea5acf9b8cb0059">dmxBackendLateReInit</a>(DevicePtr pDev);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a1afb0902ffb9019c943b0c4db6315209">dmxBackendMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a1c628b807f62aeeeb2093ad63941eff1">dmxBackendKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a6e9b6f0743636b93aeb6ae71a3517abf">dmxBackendCollectEvents</a>(DevicePtr pDev,
+<a name="l00048"></a>00048                                        <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00049"></a>00049                                        <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00050"></a>00050                                        <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00051"></a>00051                                        <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a4ee65e2f1b86616b7898c273d78a5853">dmxBackendProcessInput</a>(pointer <span class="keyword">private</span>);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxbackend_8c.html#a0c9ccf0733bd3a4615815fc404e30a9c">dmxBackendFunctions</a>(pointer <span class="keyword">private</span>, <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxbackend_8c.html#a486d684411f79c459a1195e5c02f404c">dmxBackendUpdatePosition</a>(pointer <span class="keyword">private</span>, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00055"></a>00055 
+<a name="l00056"></a>00056 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8c.html b/xorg-server/hw/dmx/doc/html/dmxcb_8c.html
index 072c3ff06..99916930b 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcb_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcb_8c.html
@@ -6,170 +6,166 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcb.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8c.html#a7">dmxSetWidthHeight</a> (int width, int height)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8c.html#a8">dmxComputeWidthHeight</a> (<a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a> flag)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8c.html#a9">dmxConnectionBlockCallback</a> (void)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8c.html#a5">dmxGlobalWidth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8c.html#a6">dmxGlobalHeight</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcb.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#aaafedb53a138b81ebb62eeff391f1115">dmxSetWidthHeight</a> (int width, int height)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#a077a54c8577746426371b996c9aacefb">dmxComputeWidthHeight</a> (<a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a> flag)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#a39179d932cde34ab3c947fa017d2d78d">dmxConnectionBlockCallback</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#a21fd58c4d3a6b5bba84476c314a6d657">connBlockScreenStart</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#a738220b78d864fe9317683a1ff425c75">dmxGlobalWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8c.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxGlobalHeight</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code queries and modifies the connection block.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxcb.c::dmxComputeWidthHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code queries and modifies the connection block. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a077a54c8577746426371b996c9aacefb"></a><!-- doxytag: member="dmxcb.c::dmxComputeWidthHeight" ref="a077a54c8577746426371b996c9aacefb" args="(DMXRecomputeFlag flag)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxComputeWidthHeight </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>flag</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxComputeWidthHeight </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a>&nbsp;</td>
+          <td class="paramname"> <em>flag</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file. </p>
 
-<p>
-Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxcb.c::dmxConnectionBlockCallback" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcb_8h_source.html#l00047">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxcb_8h_source.html#l00046">DMX_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, and <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a39179d932cde34ab3c947fa017d2d78d"></a><!-- doxytag: member="dmxcb.c::dmxConnectionBlockCallback" ref="a39179d932cde34ab3c947fa017d2d78d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConnectionBlockCallback </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConnectionBlockCallback </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values. </p>
 
-<p>
-A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxcb.c::dmxSetWidthHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcb_8c.html#a21fd58c4d3a6b5bba84476c314a6d657">connBlockScreenStart</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaafedb53a138b81ebb62eeff391f1115"></a><!-- doxytag: member="dmxcb.c::dmxSetWidthHeight" ref="aaafedb53a138b81ebb62eeff391f1115" args="(int width, int height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetWidthHeight </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="memname">void dmxSetWidthHeight </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here. </p>
+
+<p>References <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, and <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a21fd58c4d3a6b5bba84476c314a6d657"></a><!-- doxytag: member="dmxcb.c::connBlockScreenStart" ref="a21fd58c4d3a6b5bba84476c314a6d657" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxcb_8c.html#a21fd58c4d3a6b5bba84476c314a6d657">connBlockScreenStart</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxcb.c::dmxGlobalHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c8270dd4b1ef6cd953a30cdcae548de"></a><!-- doxytag: member="dmxcb.c::dmxGlobalHeight" ref="a7c8270dd4b1ef6cd953a30cdcae548de" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxcb_8h.html#a1">dmxGlobalHeight</a>
+          <td class="memname">int <a class="el" href="dmxcb_8h.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxGlobalHeight</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-The cursor position, in global coordinates.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxcb.c::dmxGlobalWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, and <a class="el" href="dmxcb_8c_source.html#l00060">dmxSetWidthHeight()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a738220b78d864fe9317683a1ff425c75"></a><!-- doxytag: member="dmxcb.c::dmxGlobalWidth" ref="a738220b78d864fe9317683a1ff425c75" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxcb_8h.html#a0">dmxGlobalWidth</a>
+          <td class="memname">int <a class="el" href="dmxcb_8h.html#a738220b78d864fe9317683a1ff425c75">dmxGlobalWidth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>The cursor position, in global coordinates. </p>
 
-<p>
-The cursor position, in global coordinates.     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, and <a class="el" href="dmxcb_8c_source.html#l00060">dmxSetWidthHeight()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html
deleted file mode 100644
index ff57d4982..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxcb_8h-source.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcb.h</h1><a href="dmxcb_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00039 <span class="preprocessor">#ifndef _DMXCB_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCB_H_</span>
-00041 <span class="preprocessor"></span>
-<a name="l00042"></a><a class="code" href="dmxcb_8h.html#a0">00042</a> <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxcb_8c.html#a5">dmxGlobalWidth</a>, <a class="code" href="dmxcb_8c.html#a6">dmxGlobalHeight</a>;
-00043 
-<a name="l00046"></a><a class="code" href="dmxcb_8h.html#a7">00046</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00047     DMX_RECOMPUTE_BOUNDING_BOX,
-00048     DMX_NO_RECOMPUTE_BOUNDING_BOX
-00049 } <a class="code" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a>;
-00050 
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#a7">dmxSetWidthHeight</a>(<span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#a8">dmxComputeWidthHeight</a>(DMXRecomputeFlag flag);
-00053 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#a9">dmxConnectionBlockCallback</a>(<span class="keywordtype">void</span>);
-00054 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h.html
index 78eaf4f3a..cac6d4303 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcb_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcb_8h.html
@@ -6,195 +6,176 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxcb.h File Reference</h1>
-<p>
-<a href="dmxcb_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a> </td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a4">dmxSetWidthHeight</a> (int width, int height)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a5">dmxComputeWidthHeight</a> (<a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a> flag)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a6">dmxConnectionBlockCallback</a> (void)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a0">dmxGlobalWidth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcb_8h.html#a1">dmxGlobalHeight</a></td></tr>
-
+<p><a href="dmxcb_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a> { <a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a">DMX_RECOMPUTE_BOUNDING_BOX</a>, 
+<a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>
+ }</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#aaafedb53a138b81ebb62eeff391f1115">dmxSetWidthHeight</a> (int width, int height)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#a077a54c8577746426371b996c9aacefb">dmxComputeWidthHeight</a> (<a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a> flag)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#a39179d932cde34ab3c947fa017d2d78d">dmxConnectionBlockCallback</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#a738220b78d864fe9317683a1ff425c75">dmxGlobalWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcb_8h.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxGlobalHeight</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Header file for connection block functions. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcb_8c.html">dmxcb.c</a>.</dd></dl>
-<hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a7" doxytag="dmxcb.h::DMXRecomputeFlag" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Header file for connection block functions. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcb_8c.html">dmxcb.c</a>. </dd></dl>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="ab00a2ebacc2ad1ec1b8ad02800ff63ee"></a><!-- doxytag: member="dmxcb.h::DMXRecomputeFlag" ref="ab00a2ebacc2ad1ec1b8ad02800ff63ee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> enum <a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a>
+          <td class="memname">enum <a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
+</div>
+<div class="memdoc">
+<p><a class="el" href="dmxcb_8h.html#a077a54c8577746426371b996c9aacefb">dmxComputeWidthHeight</a> can either recompute the global bounding box or not. </p>
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a"></a><!-- doxytag: member="DMX_RECOMPUTE_BOUNDING_BOX" ref="ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a" args="" -->DMX_RECOMPUTE_BOUNDING_BOX</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b"></a><!-- doxytag: member="DMX_NO_RECOMPUTE_BOUNDING_BOX" ref="ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b" args="" -->DMX_NO_RECOMPUTE_BOUNDING_BOX</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</dd>
+</dl>
 
-<p>
-<a class="el" href="dmxcb_8h.html#a5">dmxComputeWidthHeight</a> can either recompute the global bounding box or not.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxcb.h::dmxComputeWidthHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a077a54c8577746426371b996c9aacefb"></a><!-- doxytag: member="dmxcb.h::dmxComputeWidthHeight" ref="a077a54c8577746426371b996c9aacefb" args="(DMXRecomputeFlag flag)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxComputeWidthHeight </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxcb_8h.html#a7">DMXRecomputeFlag</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>flag</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxComputeWidthHeight </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a>&nbsp;</td>
+          <td class="paramname"> <em>flag</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file. </p>
 
-<p>
-Computes the global bounding box for DMX. This may be larger than the one computed by Xinerama because of the DMX configuration file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxcb.h::dmxConnectionBlockCallback" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcb_8h_source.html#l00047">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxcb_8h_source.html#l00046">DMX_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, and <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a39179d932cde34ab3c947fa017d2d78d"></a><!-- doxytag: member="dmxcb.h::dmxConnectionBlockCallback" ref="a39179d932cde34ab3c947fa017d2d78d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConnectionBlockCallback </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConnectionBlockCallback </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values. </p>
 
-<p>
-A callback routine that hooks into Xinerama and provides a convenient place to print summary log information during server startup. This routine does not modify any values.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxcb.h::dmxSetWidthHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcb_8c.html#a21fd58c4d3a6b5bba84476c314a6d657">connBlockScreenStart</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaafedb53a138b81ebb62eeff391f1115"></a><!-- doxytag: member="dmxcb.h::dmxSetWidthHeight" ref="aaafedb53a138b81ebb62eeff391f1115" args="(int width, int height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetWidthHeight </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="memname">void dmxSetWidthHeight </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here. </p>
 
-<p>
-We may want the wall dimensions to be different from the bounding box dimensions that Xinerama computes, so save those and update them here.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxcb.h::dmxGlobalHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, and <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a7c8270dd4b1ef6cd953a30cdcae548de"></a><!-- doxytag: member="dmxcb.h::dmxGlobalHeight" ref="a7c8270dd4b1ef6cd953a30cdcae548de" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxcb_8h.html#a1">dmxGlobalHeight</a>
+          <td class="memname">int <a class="el" href="dmxcb_8h.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxGlobalHeight</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-The cursor position, in global coordinates.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxcb.h::dmxGlobalWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, and <a class="el" href="dmxcb_8c_source.html#l00060">dmxSetWidthHeight()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a738220b78d864fe9317683a1ff425c75"></a><!-- doxytag: member="dmxcb.h::dmxGlobalWidth" ref="a738220b78d864fe9317683a1ff425c75" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxcb_8h.html#a0">dmxGlobalWidth</a>
+          <td class="memname">int <a class="el" href="dmxcb_8h.html#a738220b78d864fe9317683a1ff425c75">dmxGlobalWidth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>The cursor position, in global coordinates. </p>
 
-<p>
-The cursor position, in global coordinates.     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, and <a class="el" href="dmxcb_8c_source.html#l00060">dmxSetWidthHeight()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html
new file mode 100644
index 000000000..37d1380d2
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxcb_8h_source.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxcb.h</h1><a href="dmxcb_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef _DMXCB_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCB_H_</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxcb_8c.html#a738220b78d864fe9317683a1ff425c75">dmxGlobalWidth</a>, <a class="code" href="dmxcb_8c.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxGlobalHeight</a>;
+<a name="l00042"></a>00042 
+<a name="l00045"></a><a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">00045</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00046"></a><a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a">00046</a>     <a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a">DMX_RECOMPUTE_BOUNDING_BOX</a>,
+<a name="l00047"></a><a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b">00047</a>     <a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>
+<a name="l00048"></a>00048 } <a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a>;
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#aaafedb53a138b81ebb62eeff391f1115">dmxSetWidthHeight</a>(<span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#a077a54c8577746426371b996c9aacefb">dmxComputeWidthHeight</a>(<a class="code" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">DMXRecomputeFlag</a> flag);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcb_8c.html#a39179d932cde34ab3c947fa017d2d78d">dmxConnectionBlockCallback</a>(<span class="keywordtype">void</span>);
+<a name="l00053"></a>00053 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html
deleted file mode 100644
index 39d1b3bc0..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxclient_8h-source.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxclient.h</h1><a href="dmxclient_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright (c) 1995  X Consortium</span>
-00004 <span class="comment"> * Copyright 2004 Red Hat Inc., Durham, North Carolina.</span>
-00005 <span class="comment"> *</span>
-00006 <span class="comment"> * All Rights Reserved.</span>
-00007 <span class="comment"> *</span>
-00008 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00009 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00010 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00011 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00012 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00013 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00014 <span class="comment"> * subject to the following conditions:</span>
-00015 <span class="comment"> *</span>
-00016 <span class="comment"> * The above copyright notice and this permission notice shall be</span>
-00017 <span class="comment"> * included in all copies or substantial portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,</span>
-00023 <span class="comment"> * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</span>
-00024 <span class="comment"> * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</span>
-00025 <span class="comment"> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</span>
-00026 <span class="comment"> * OTHER DEALINGS IN THE SOFTWARE.</span>
-00027 <span class="comment"> *</span>
-00028 <span class="comment"> * Except as contained in this notice, the name of the X Consortium</span>
-00029 <span class="comment"> * shall not be used in advertising or otherwise to promote the sale,</span>
-00030 <span class="comment"> * use or other dealings in this Software without prior written</span>
-00031 <span class="comment"> * authorization from the X Consortium.</span>
-00032 <span class="comment"> */</span>
-00033 
-00034 <span class="comment">/*</span>
-00035 <span class="comment"> * Derived from hw/xnest/Xnest.h by Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00036 <span class="comment"> */</span>
-00037 
-00042 <span class="preprocessor">#ifndef _DMXCLIENT_H_</span>
-00043 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCLIENT_H_</span>
-00044 <span class="preprocessor"></span>
-00045 <span class="preprocessor">#define GC XlibGC</span>
-00046 <span class="preprocessor"></span>
-00047 <span class="preprocessor">#ifdef _XSERVER64</span>
-00048 <span class="preprocessor"></span><span class="preprocessor">#define DMX64</span>
-00049 <span class="preprocessor"></span><span class="preprocessor">#undef _XSERVER64</span>
-00050 <span class="preprocessor"></span><span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> XID64;
-00051 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Mask64;
-00052 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Atom64;
-00053 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> VisualID64;
-00054 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Time64;
-00055 <span class="preprocessor">#define XID           XID64</span>
-00056 <span class="preprocessor"></span><span class="preprocessor">#define Mask          Mask64</span>
-00057 <span class="preprocessor"></span><span class="preprocessor">#define Atom          Atom64</span>
-00058 <span class="preprocessor"></span><span class="preprocessor">#define VisualID      VisualID64</span>
-00059 <span class="preprocessor"></span><span class="preprocessor">#define Time          Time64</span>
-00060 <span class="preprocessor"></span><span class="keyword">typedef</span> XID           Window64;
-00061 <span class="keyword">typedef</span> XID           Drawable64;
-00062 <span class="keyword">typedef</span> XID           Font64;
-00063 <span class="keyword">typedef</span> XID           Pixmap64;
-00064 <span class="keyword">typedef</span> XID           Cursor64;
-00065 <span class="keyword">typedef</span> XID           Colormap64;
-00066 <span class="keyword">typedef</span> XID           GContext64;
-00067 <span class="keyword">typedef</span> XID           KeySym64;
-00068 <span class="preprocessor">#define Window        Window64</span>
-00069 <span class="preprocessor"></span><span class="preprocessor">#define Drawable      Drawable64</span>
-00070 <span class="preprocessor"></span><span class="preprocessor">#define Font          Font64</span>
-00071 <span class="preprocessor"></span><span class="preprocessor">#define Pixmap        Pixmap64</span>
-00072 <span class="preprocessor"></span><span class="preprocessor">#define Cursor        Cursor64</span>
-00073 <span class="preprocessor"></span><span class="preprocessor">#define Colormap      Colormap64</span>
-00074 <span class="preprocessor"></span><span class="preprocessor">#define GContext      GContext64</span>
-00075 <span class="preprocessor"></span><span class="preprocessor">#define KeySym        KeySym64</span>
-00076 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00077 <span class="preprocessor"></span>
-00078 <span class="preprocessor">#include &lt;X11/Xlib.h&gt;</span>
-00079 <span class="preprocessor">#include &lt;X11/Xlibint.h&gt;</span>        <span class="comment">/* For _XExtension */</span>
-00080 <span class="preprocessor">#include &lt;X11/X.h&gt;</span>              <span class="comment">/* from glxserver.h */</span>
-00081 <span class="preprocessor">#include &lt;X11/Xmd.h&gt;</span>            <span class="comment">/* from glxserver.h */</span>
-00082 <span class="preprocessor">#include &lt;X11/Xproto.h&gt;</span>
-00083 <span class="preprocessor">#include &lt;X11/Xutil.h&gt;</span>
-00084 <span class="preprocessor">#include &lt;X11/Xatom.h&gt;</span>
-00085 <span class="preprocessor">#include &lt;X11/cursorfont.h&gt;</span>
-00086 <span class="preprocessor">#include &lt;X11/Xmu/SysUtil.h&gt;</span>    <span class="comment">/* For XmuSnprintf */</span>
-00087 
-00088 <span class="preprocessor">#ifdef SHAPE</span>
-00089 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/shape.h&gt;</span>
-00090 <span class="preprocessor">#endif</span>
-00091 <span class="preprocessor"></span>
-00092 <span class="preprocessor">#ifdef RENDER</span>
-00093 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/Xrender.h&gt;</span>
-00094 <span class="preprocessor">#undef PictFormatType</span>
-00095 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00096 <span class="preprocessor"></span>
-00097 <span class="preprocessor">#ifdef XKB</span>
-00098 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XKB.h&gt;</span>
-00099 <span class="preprocessor">#include &lt;X11/extensions/XKBstr.h&gt;</span>
-00100 <span class="preprocessor">#endif</span>
-00101 <span class="preprocessor"></span>
-00102 <span class="preprocessor">#ifdef XINPUT</span>
-00103 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XI.h&gt;</span>
-00104 <span class="preprocessor">#endif</span>
-00105 <span class="preprocessor"></span>
-00106 <span class="comment">/* Always include these, since we query them even if we don't export XINPUT. */</span>
-00107 <span class="preprocessor">#include &lt;X11/extensions/XInput.h&gt;</span> <span class="comment">/* For XDevice */</span>
-00108 <span class="preprocessor">#include &lt;X11/extensions/Xext.h&gt;</span>
-00109 
-00110 <span class="preprocessor">#undef GC</span>
-00111 <span class="preprocessor"></span>
-00112 <span class="preprocessor">#ifdef DMX64</span>
-00113 <span class="preprocessor"></span><span class="preprocessor">#define _XSERVER64</span>
-00114 <span class="preprocessor"></span><span class="preprocessor">#undef XID</span>
-00115 <span class="preprocessor"></span><span class="preprocessor">#undef Mask</span>
-00116 <span class="preprocessor"></span><span class="preprocessor">#undef Atom</span>
-00117 <span class="preprocessor"></span><span class="preprocessor">#undef VisualID</span>
-00118 <span class="preprocessor"></span><span class="preprocessor">#undef Time</span>
-00119 <span class="preprocessor"></span><span class="preprocessor">#undef Window</span>
-00120 <span class="preprocessor"></span><span class="preprocessor">#undef Drawable</span>
-00121 <span class="preprocessor"></span><span class="preprocessor">#undef Font</span>
-00122 <span class="preprocessor"></span><span class="preprocessor">#undef Pixmap</span>
-00123 <span class="preprocessor"></span><span class="preprocessor">#undef Cursor</span>
-00124 <span class="preprocessor"></span><span class="preprocessor">#undef Colormap</span>
-00125 <span class="preprocessor"></span><span class="preprocessor">#undef GContext</span>
-00126 <span class="preprocessor"></span><span class="preprocessor">#undef KeySym</span>
-00127 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00128 <span class="preprocessor"></span>
-00129 <span class="comment">/* These are in exglobals.h, but that conflicts with X11/extensions/XKBsrv.h */</span>
-00130 <span class="keyword">extern</span> <span class="keywordtype">int</span> ProximityIn;
-00131 <span class="keyword">extern</span> <span class="keywordtype">int</span> ProximityOut;
-00132 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceValuator;
-00133 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceMotionNotify;
-00134 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceFocusIn;
-00135 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceFocusOut;
-00136 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceStateNotify;
-00137 <span class="keyword">extern</span> <span class="keywordtype">int</span> DeviceMappingNotify;
-00138 <span class="keyword">extern</span> <span class="keywordtype">int</span> ChangeDeviceNotify;
-00139 
-00140 <span class="comment">/* Some protocol gets included last, after undefines. */</span>
-00141 <span class="preprocessor">#include &lt;X11/XKBlib.h&gt;</span>
-00142 <span class="preprocessor">#ifdef XKB</span>
-00143 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XKBproto.h&gt;</span>
-00144 <span class="preprocessor">#define XKB_IN_SERVER</span>
-00145 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XKBsrv.h&gt;</span>
-00146 <span class="preprocessor">#undef XPointer</span>
-00147 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00148 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XIproto.h&gt;</span>
-00149 
-00150 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxclient_8h.html b/xorg-server/hw/dmx/doc/html/dmxclient_8h.html
index f5e62f572..cb22c41c6 100644
--- a/xorg-server/hw/dmx/doc/html/dmxclient_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxclient_8h.html
@@ -6,35 +6,214 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxclient.h File Reference</h1><code>#include &lt;X11/Xlib.h&gt;</code><br>
-<code>#include &lt;X11/Xlibint.h&gt;</code><br>
-<code>#include &lt;X11/X.h&gt;</code><br>
-<code>#include &lt;X11/Xmd.h&gt;</code><br>
-<code>#include &lt;X11/Xproto.h&gt;</code><br>
-<code>#include &lt;X11/Xutil.h&gt;</code><br>
-<code>#include &lt;X11/Xatom.h&gt;</code><br>
-<code>#include &lt;X11/cursorfont.h&gt;</code><br>
-<code>#include &lt;X11/Xmu/SysUtil.h&gt;</code><br>
-<code>#include &lt;X11/extensions/shape.h&gt;</code><br>
-<code>#include &lt;X11/extensions/Xrender.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XKB.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XKBstr.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XI.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XInput.h&gt;</code><br>
-<code>#include &lt;X11/extensions/Xext.h&gt;</code><br>
-<code>#include &lt;X11/XKBlib.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XKBproto.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XKBsrv.h&gt;</code><br>
-<code>#include &lt;X11/extensions/XIproto.h&gt;</code><br>
-
-<p>
-<a href="dmxclient_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxclient.h File Reference</h1><code>#include &lt;X11/Xlib.h&gt;</code><br/>
+<code>#include &lt;X11/Xlibint.h&gt;</code><br/>
+<code>#include &lt;X11/X.h&gt;</code><br/>
+<code>#include &lt;X11/Xmd.h&gt;</code><br/>
+<code>#include &lt;X11/Xproto.h&gt;</code><br/>
+<code>#include &lt;X11/Xutil.h&gt;</code><br/>
+<code>#include &lt;X11/Xatom.h&gt;</code><br/>
+<code>#include &lt;X11/cursorfont.h&gt;</code><br/>
+<code>#include &lt;X11/Xmu/SysUtil.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/shape.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/Xrender.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XKB.h&gt;</code><br/>
+<code>#include &quot;xkbstr.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/XI.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XInput.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/Xext.h&gt;</code><br/>
+<code>#include &lt;X11/XKBlib.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XKBproto.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XIproto.h&gt;</code><br/>
+
+<p><a href="dmxclient_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a17dcc767f86e6823829de8f847a5d2d4">GC</a>&nbsp;&nbsp;&nbsp;XlibGC</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">DeviceValuator</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file includes all client-side include files with proper wrapping.    <hr>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file includes all client-side include files with proper wrapping. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a17dcc767f86e6823829de8f847a5d2d4"></a><!-- doxytag: member="dmxclient.h::GC" ref="a17dcc767f86e6823829de8f847a5d2d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GC&nbsp;&nbsp;&nbsp;XlibGC</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a9cdf1d1f5958572f162e6c5d5c19d4a4"></a><!-- doxytag: member="dmxclient.h::ChangeDeviceNotify" ref="a9cdf1d1f5958572f162e6c5d5c19d4a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a83d9bb79d3ddadf36469794bf2563482"></a><!-- doxytag: member="dmxclient.h::DeviceFocusIn" ref="a83d9bb79d3ddadf36469794bf2563482" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5da5340a54a4f158c507ee002c4b3824"></a><!-- doxytag: member="dmxclient.h::DeviceFocusOut" ref="a5da5340a54a4f158c507ee002c4b3824" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a232c73ad30bfc3116842076bd6fc1151"></a><!-- doxytag: member="dmxclient.h::DeviceMappingNotify" ref="a232c73ad30bfc3116842076bd6fc1151" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a989f862a42e735c00e8c23a239920772"></a><!-- doxytag: member="dmxclient.h::DeviceMotionNotify" ref="a989f862a42e735c00e8c23a239920772" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7212800e5b127f95425fb860bb2dcbdf"></a><!-- doxytag: member="dmxclient.h::DeviceStateNotify" ref="a7212800e5b127f95425fb860bb2dcbdf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7008cfdcc3748585492b12a9658278b9"></a><!-- doxytag: member="dmxclient.h::DeviceValuator" ref="a7008cfdcc3748585492b12a9658278b9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">DeviceValuator</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac1fa54a853b3edb8cbf6378dfaa962a6"></a><!-- doxytag: member="dmxclient.h::ProximityIn" ref="ac1fa54a853b3edb8cbf6378dfaa962a6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a606f455d31c949b7f57a51a0e0b5f351"></a><!-- doxytag: member="dmxclient.h::ProximityOut" ref="a606f455d31c949b7f57a51a0e0b5f351" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+</div>
+    <hr>
     <address>
       <small>
         Generated June 29, 2004 for <a
diff --git a/xorg-server/hw/dmx/doc/html/dmxclient_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxclient_8h_source.html
new file mode 100644
index 000000000..1f976b74a
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxclient_8h_source.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxclient.h</h1><a href="dmxclient_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright (c) 1995  X Consortium</span>
+<a name="l00003"></a>00003 <span class="comment"> * Copyright 2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00004"></a>00004 <span class="comment"> *</span>
+<a name="l00005"></a>00005 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00006"></a>00006 <span class="comment"> *</span>
+<a name="l00007"></a>00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00008"></a>00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00009"></a>00009 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00010"></a>00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00011"></a>00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00012"></a>00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00013"></a>00013 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00014"></a>00014 <span class="comment"> *</span>
+<a name="l00015"></a>00015 <span class="comment"> * The above copyright notice and this permission notice shall be</span>
+<a name="l00016"></a>00016 <span class="comment"> * included in all copies or substantial portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,</span>
+<a name="l00022"></a>00022 <span class="comment"> * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</span>
+<a name="l00023"></a>00023 <span class="comment"> * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</span>
+<a name="l00024"></a>00024 <span class="comment"> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</span>
+<a name="l00025"></a>00025 <span class="comment"> * OTHER DEALINGS IN THE SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> *</span>
+<a name="l00027"></a>00027 <span class="comment"> * Except as contained in this notice, the name of the X Consortium</span>
+<a name="l00028"></a>00028 <span class="comment"> * shall not be used in advertising or otherwise to promote the sale,</span>
+<a name="l00029"></a>00029 <span class="comment"> * use or other dealings in this Software without prior written</span>
+<a name="l00030"></a>00030 <span class="comment"> * authorization from the X Consortium.</span>
+<a name="l00031"></a>00031 <span class="comment"> */</span>
+<a name="l00032"></a>00032 
+<a name="l00033"></a>00033 <span class="comment">/*</span>
+<a name="l00034"></a>00034 <span class="comment"> * Derived from hw/xnest/Xnest.h by Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00035"></a>00035 <span class="comment"> */</span>
+<a name="l00036"></a>00036 
+<a name="l00041"></a>00041 <span class="preprocessor">#ifndef _DMXCLIENT_H_</span>
+<a name="l00042"></a>00042 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCLIENT_H_</span>
+<a name="l00043"></a>00043 <span class="preprocessor"></span>
+<a name="l00044"></a><a class="code" href="dmxclient_8h.html#a17dcc767f86e6823829de8f847a5d2d4">00044</a> <span class="preprocessor">#define GC XlibGC</span>
+<a name="l00045"></a>00045 <span class="preprocessor"></span>
+<a name="l00046"></a>00046 <span class="preprocessor">#ifdef _XSERVER64</span>
+<a name="l00047"></a>00047 <span class="preprocessor"></span><span class="preprocessor">#define DMX64</span>
+<a name="l00048"></a>00048 <span class="preprocessor"></span><span class="preprocessor">#undef _XSERVER64</span>
+<a name="l00049"></a>00049 <span class="preprocessor"></span><span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> XID64;
+<a name="l00050"></a>00050 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Mask64;
+<a name="l00051"></a>00051 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Atom64;
+<a name="l00052"></a>00052 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> VisualID64;
+<a name="l00053"></a>00053 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> Time64;
+<a name="l00054"></a>00054 <span class="preprocessor">#define XID           XID64</span>
+<a name="l00055"></a>00055 <span class="preprocessor"></span><span class="preprocessor">#define Mask          Mask64</span>
+<a name="l00056"></a>00056 <span class="preprocessor"></span><span class="preprocessor">#define Atom          Atom64</span>
+<a name="l00057"></a>00057 <span class="preprocessor"></span><span class="preprocessor">#define VisualID      VisualID64</span>
+<a name="l00058"></a>00058 <span class="preprocessor"></span><span class="preprocessor">#define Time          Time64</span>
+<a name="l00059"></a>00059 <span class="preprocessor"></span><span class="keyword">typedef</span> XID           Window64;
+<a name="l00060"></a>00060 <span class="keyword">typedef</span> XID           Drawable64;
+<a name="l00061"></a>00061 <span class="keyword">typedef</span> XID           Font64;
+<a name="l00062"></a>00062 <span class="keyword">typedef</span> XID           Pixmap64;
+<a name="l00063"></a>00063 <span class="keyword">typedef</span> XID           Cursor64;
+<a name="l00064"></a>00064 <span class="keyword">typedef</span> XID           Colormap64;
+<a name="l00065"></a>00065 <span class="keyword">typedef</span> XID           GContext64;
+<a name="l00066"></a>00066 <span class="keyword">typedef</span> XID           KeySym64;
+<a name="l00067"></a>00067 <span class="preprocessor">#define Window        Window64</span>
+<a name="l00068"></a>00068 <span class="preprocessor"></span><span class="preprocessor">#define Drawable      Drawable64</span>
+<a name="l00069"></a>00069 <span class="preprocessor"></span><span class="preprocessor">#define Font          Font64</span>
+<a name="l00070"></a>00070 <span class="preprocessor"></span><span class="preprocessor">#define Pixmap        Pixmap64</span>
+<a name="l00071"></a>00071 <span class="preprocessor"></span><span class="preprocessor">#define Cursor        Cursor64</span>
+<a name="l00072"></a>00072 <span class="preprocessor"></span><span class="preprocessor">#define Colormap      Colormap64</span>
+<a name="l00073"></a>00073 <span class="preprocessor"></span><span class="preprocessor">#define GContext      GContext64</span>
+<a name="l00074"></a>00074 <span class="preprocessor"></span><span class="preprocessor">#define KeySym        KeySym64</span>
+<a name="l00075"></a>00075 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00076"></a>00076 <span class="preprocessor"></span>
+<a name="l00077"></a>00077 <span class="preprocessor">#include &lt;X11/Xlib.h&gt;</span>
+<a name="l00078"></a>00078 <span class="preprocessor">#include &lt;X11/Xlibint.h&gt;</span>        <span class="comment">/* For _XExtension */</span>
+<a name="l00079"></a>00079 <span class="preprocessor">#include &lt;X11/X.h&gt;</span>              <span class="comment">/* from glxserver.h */</span>
+<a name="l00080"></a>00080 <span class="preprocessor">#include &lt;X11/Xmd.h&gt;</span>            <span class="comment">/* from glxserver.h */</span>
+<a name="l00081"></a>00081 <span class="preprocessor">#include &lt;X11/Xproto.h&gt;</span>
+<a name="l00082"></a>00082 <span class="preprocessor">#include &lt;X11/Xutil.h&gt;</span>
+<a name="l00083"></a>00083 <span class="preprocessor">#include &lt;X11/Xatom.h&gt;</span>
+<a name="l00084"></a>00084 <span class="preprocessor">#include &lt;X11/cursorfont.h&gt;</span>
+<a name="l00085"></a>00085 <span class="preprocessor">#include &lt;X11/Xmu/SysUtil.h&gt;</span>    <span class="comment">/* For XmuSnprintf */</span>
+<a name="l00086"></a>00086 
+<a name="l00087"></a>00087 <span class="preprocessor">#include &lt;X11/extensions/shape.h&gt;</span>
+<a name="l00088"></a>00088 
+<a name="l00089"></a>00089 <span class="preprocessor">#ifdef RENDER</span>
+<a name="l00090"></a>00090 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/Xrender.h&gt;</span>
+<a name="l00091"></a>00091 <span class="preprocessor">#undef PictFormatType</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00093"></a>00093 <span class="preprocessor"></span>
+<a name="l00094"></a>00094 <span class="preprocessor">#include &lt;X11/extensions/XKB.h&gt;</span>
+<a name="l00095"></a>00095 <span class="preprocessor">#include &quot;xkbstr.h&quot;</span>
+<a name="l00096"></a>00096 
+<a name="l00097"></a>00097 <span class="preprocessor">#include &lt;X11/extensions/XI.h&gt;</span>
+<a name="l00098"></a>00098 
+<a name="l00099"></a>00099 <span class="comment">/* Always include these, since we query them even if we don&apos;t export XINPUT. */</span>
+<a name="l00100"></a>00100 <span class="preprocessor">#include &lt;X11/extensions/XInput.h&gt;</span> <span class="comment">/* For XDevice */</span>
+<a name="l00101"></a>00101 <span class="preprocessor">#include &lt;X11/extensions/Xext.h&gt;</span>
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103 <span class="preprocessor">#undef GC</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>
+<a name="l00105"></a>00105 <span class="preprocessor">#ifdef DMX64</span>
+<a name="l00106"></a>00106 <span class="preprocessor"></span><span class="preprocessor">#define _XSERVER64</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span><span class="preprocessor">#undef XID</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span><span class="preprocessor">#undef Mask</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span><span class="preprocessor">#undef Atom</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span><span class="preprocessor">#undef VisualID</span>
+<a name="l00111"></a>00111 <span class="preprocessor"></span><span class="preprocessor">#undef Time</span>
+<a name="l00112"></a>00112 <span class="preprocessor"></span><span class="preprocessor">#undef Window</span>
+<a name="l00113"></a>00113 <span class="preprocessor"></span><span class="preprocessor">#undef Drawable</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span><span class="preprocessor">#undef Font</span>
+<a name="l00115"></a>00115 <span class="preprocessor"></span><span class="preprocessor">#undef Pixmap</span>
+<a name="l00116"></a>00116 <span class="preprocessor"></span><span class="preprocessor">#undef Cursor</span>
+<a name="l00117"></a>00117 <span class="preprocessor"></span><span class="preprocessor">#undef Colormap</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span><span class="preprocessor">#undef GContext</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span><span class="preprocessor">#undef KeySym</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00121"></a>00121 <span class="preprocessor"></span>
+<a name="l00122"></a>00122 <span class="comment">/* These are in exglobals.h, but that conflicts with xkbsrv.h */</span>
+<a name="l00123"></a>00123 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>;
+<a name="l00124"></a>00124 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>;
+<a name="l00125"></a>00125 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">DeviceValuator</a>;
+<a name="l00126"></a>00126 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a>;
+<a name="l00127"></a>00127 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a>;
+<a name="l00128"></a>00128 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a>;
+<a name="l00129"></a>00129 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a>;
+<a name="l00130"></a>00130 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a>;
+<a name="l00131"></a>00131 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a>;
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133 <span class="comment">/* Some protocol gets included last, after undefines. */</span>
+<a name="l00134"></a>00134 <span class="preprocessor">#include &lt;X11/XKBlib.h&gt;</span>
+<a name="l00135"></a>00135 <span class="preprocessor">#include &lt;X11/extensions/XKBproto.h&gt;</span>
+<a name="l00136"></a>00136 <span class="preprocessor">#include &quot;xkbstr.h&quot;</span>
+<a name="l00137"></a>00137 <span class="preprocessor">#undef XPointer</span>
+<a name="l00138"></a>00138 <span class="preprocessor"></span><span class="preprocessor">#include &lt;X11/extensions/XIproto.h&gt;</span>
+<a name="l00139"></a>00139 
+<a name="l00140"></a>00140 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html
index 40f62a633..adbef732d 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8c.html
@@ -6,251 +6,240 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcmap.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxvisual_8h-source.html">dmxvisual.h</a>"</code><br>
-<code>#include "micmap.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a2">dmxBECreateColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a3">dmxCreateColormap</a> (ColormapPtr pColormap)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcmap.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxvisual_8h_source.html">dmxvisual.h</a>&quot;</code><br/>
+<code>#include &quot;micmap.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a0ad36af95555b052bd64595a6b7d7af0">dmxAllocateColormapPrivates</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a6986e997430cf665904ad9149e39a50b">dmxBECreateColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a07f6c7d8523b669b5fa614cbe5c0e1ad">dmxCreateColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a432d82d6335a8bc17292440baded360c">dmxBEFreeColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#ab12dcafef41b3dc821dc1ecd220735c3">dmxDestroyColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a13a0bbf846ac7b3dcb41ae9bc4e64a3e">dmxInstallColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a38bddf73cfed2aec203c62fc5be4ae97">dmxStoreColors</a> (ColormapPtr pColormap, int ndef, xColorItem *pdef)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8c.html#a5481a08a1030ecac42ff809a1c7d2139">dmxCreateDefColormap</a> (ScreenPtr pScreen)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Colormap support. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a0ad36af95555b052bd64595a6b7d7af0"></a><!-- doxytag: member="dmxcmap.c::dmxAllocateColormapPrivates" ref="a0ad36af95555b052bd64595a6b7d7af0" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool dmxAllocateColormapPrivates </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a4">dmxBEFreeColormap</a> (ColormapPtr pColormap)</td></tr>
+<p>References <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, and <a class="el" href="dmxcmap_8h_source.html#l00062">DMX_SET_COLORMAP_PRIV</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a5">dmxDestroyColormap</a> (ColormapPtr pColormap)</td></tr>
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a6">dmxInstallColormap</a> (ColormapPtr pColormap)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6986e997430cf665904ad9149e39a50b"></a><!-- doxytag: member="dmxcmap.c::dmxBECreateColormap" ref="a6986e997430cf665904ad9149e39a50b" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBECreateColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>pColormap</em> on the back-end server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a7">dmxStoreColors</a> (ColormapPtr pColormap, int ndef, xColorItem *pdef)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8c.html#a8">dmxCreateDefColormap</a> (ScreenPtr pScreen)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Colormap support.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxcmap.c::dmxBECreateColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a432d82d6335a8bc17292440baded360c"></a><!-- doxytag: member="dmxcmap.c::dmxBEFreeColormap" ref="a432d82d6335a8bc17292440baded360c" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBECreateColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreeColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy <em>pColormap</em> on the back-end server. </p>
 
-<p>
-Create <em>pColormap</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxcmap.c::dmxBEFreeColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>.</p>
 
-<p>
-Destroy <em>pColormap</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxcmap.c::dmxCreateColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a07f6c7d8523b669b5fa614cbe5c0e1ad"></a><!-- doxytag: member="dmxcmap.c::dmxCreateColormap" ref="a07f6c7d8523b669b5fa614cbe5c0e1ad" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Create colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxcmap.c::dmxCreateDefColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00049">dmxAllocateColormapPrivates()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5481a08a1030ecac42ff809a1c7d2139"></a><!-- doxytag: member="dmxcmap.c::dmxCreateDefColormap" ref="a5481a08a1030ecac42ff809a1c7d2139" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateDefColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateDefColormap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create the DMX server's default colormap.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxcmap.c::dmxDestroyColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create the DMX server's default colormap. </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab12dcafef41b3dc821dc1ecd220735c3"></a><!-- doxytag: member="dmxcmap.c::dmxDestroyColormap" ref="ab12dcafef41b3dc821dc1ecd220735c3" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Destroy colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxcmap.c::dmxInstallColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxcmap_8h_source.html#l00062">DMX_SET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a13a0bbf846ac7b3dcb41ae9bc4e64a3e"></a><!-- doxytag: member="dmxcmap.c::dmxInstallColormap" ref="a13a0bbf846ac7b3dcb41ae9bc4e64a3e" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInstallColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInstallColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Install colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Install colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxcmap.c::dmxStoreColors" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a38bddf73cfed2aec203c62fc5be4ae97"></a><!-- doxytag: member="dmxcmap.c::dmxStoreColors" ref="a38bddf73cfed2aec203c62fc5be4ae97" args="(ColormapPtr pColormap, int ndef, xColorItem *pdef)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStoreColors </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pColormap</em>, </td>
+          <td class="memname">void dmxStoreColors </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ndef</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ndef</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xColorItem *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdef</em></td>
+          <td class="paramtype">xColorItem *&nbsp;</td>
+          <td class="paramname"> <em>pdef</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Store colors in <em>pColormap</em> on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Store colors in <em>pColormap</em> on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html
deleted file mode 100644
index b3a9b291a..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxcmap_8h-source.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcmap.h</h1><a href="dmxcmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXCMAP_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXCMAP_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "colormapst.h"</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__dmxColormapPriv.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> {
-00045     Colormap  cmap;
-00046 } <a class="code" href="struct__dmxColormapPriv.html">dmxColormapPrivRec</a>, *<a class="code" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>;
-00047 
-00048 
-00049 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a3">dmxCreateColormap</a>(ColormapPtr pColormap);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#a5">dmxDestroyColormap</a>(ColormapPtr pColormap);
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#a6">dmxInstallColormap</a>(ColormapPtr pColormap);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#a7">dmxStoreColors</a>(ColormapPtr pColormap, <span class="keywordtype">int</span> ndef, xColorItem *pdef);
-00053 
-00054 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a8">dmxCreateDefColormap</a>(ScreenPtr pScreen);
-00055 
-00056 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a2">dmxBECreateColormap</a>(ColormapPtr pColormap);
-00057 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a4">dmxBEFreeColormap</a>(ColormapPtr pColormap);
-00058 
-<a name="l00060"></a><a class="code" href="dmxcmap_8h.html#a4">00060</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxcmap_8h.html#a4">dmxColormapPrivateIndex</a>;
-00061 
-<a name="l00063"></a><a class="code" href="dmxcmap_8h.html#a0">00063</a> <span class="preprocessor">#define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)                       \</span>
-00064 <span class="preprocessor">    (_pCMap)-&gt;devPrivates[dmxColormapPrivateIndex].ptr                  \</span>
-00065 <span class="preprocessor">        = (pointer)(_pCMapPriv);</span>
-00066 <span class="preprocessor"></span>
-<a name="l00068"></a><a class="code" href="dmxcmap_8h.html#a1">00068</a> <span class="preprocessor">#define DMX_GET_COLORMAP_PRIV(_pCMap)                                   \</span>
-00069 <span class="preprocessor">    (dmxColormapPrivPtr)(_pCMap)-&gt;devPrivates[dmxColormapPrivateIndex].ptr</span>
-00070 <span class="preprocessor"></span>
-00071 <span class="preprocessor">#endif </span><span class="comment">/* DMXCMAP_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html
index f22a97b0e..d07836d7a 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8h.html
@@ -6,394 +6,324 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcmap.h File Reference</h1><code>#include "colormapst.h"</code><br>
-
-<p>
-<a href="dmxcmap_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a0">DMX_SET_COLORMAP_PRIV</a>(_pCMap, _pCMapPriv)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a1">DMX_GET_COLORMAP_PRIV</a>(_pCMap)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>)(_pCMap)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a6">dmxColormapPrivateIndex</a>].ptr</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a2">dmxColormapPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a3">dmxColormapPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a5">dmxCreateColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a6">dmxDestroyColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a7">dmxInstallColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a8">dmxStoreColors</a> (ColormapPtr pColormap, int ndef, xColorItem *pdef)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a9">dmxCreateDefColormap</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a10">dmxBECreateColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a11">dmxBEFreeColormap</a> (ColormapPtr pColormap)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcmap_8h.html#a4">dmxColormapPrivateIndex</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcmap.h File Reference</h1><code>#include &quot;colormapst.h&quot;</code><br/>
+
+<p><a href="dmxcmap_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a713cec2a0442303cafdb59183a686d28">DMX_SET_COLORMAP_PRIV</a>(_pCMap, _pCMapPriv)&nbsp;&nbsp;&nbsp;dixSetPrivate(&amp;(_pCMap)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a>, _pCMapPriv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#aee4652aa0ac07182583f0cb18ed8557b">DMX_GET_COLORMAP_PRIV</a>(_pCMap)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a9b220494b52f982d4dcfa437d34d628b">dmxColormapPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#aec71fbb492f3a3ce7e6b2b083a8b0978">dmxColormapPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a07f6c7d8523b669b5fa614cbe5c0e1ad">dmxCreateColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#ab12dcafef41b3dc821dc1ecd220735c3">dmxDestroyColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a13a0bbf846ac7b3dcb41ae9bc4e64a3e">dmxInstallColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a38bddf73cfed2aec203c62fc5be4ae97">dmxStoreColors</a> (ColormapPtr pColormap, int ndef, xColorItem *pdef)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a5481a08a1030ecac42ff809a1c7d2139">dmxCreateDefColormap</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a6986e997430cf665904ad9149e39a50b">dmxBECreateColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#a432d82d6335a8bc17292440baded360c">dmxBEFreeColormap</a> (ColormapPtr pColormap)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcmap_8h.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Header file for colormap support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcmap_8c.html">dmxcmap.c</a>.</dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxcmap.h::DMX_GET_COLORMAP_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Header file for colormap support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcmap_8c.html">dmxcmap.c</a>. </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="aee4652aa0ac07182583f0cb18ed8557b"></a><!-- doxytag: member="dmxcmap.h::DMX_GET_COLORMAP_PRIV" ref="aee4652aa0ac07182583f0cb18ed8557b" args="(_pCMap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_COLORMAP_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pCMap&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>)(_pCMap)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a6">dmxColormapPrivateIndex</a>].ptr
+          <td class="memname">#define DMX_GET_COLORMAP_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pCMap&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get colormap private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxcmap.h::DMX_SET_COLORMAP_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>)            \
+    dixLookupPrivate(&amp;(_pCMap)-&gt;devPrivates, <a class="code" href="dmxcmap_8h.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a>)
+</pre></div><p>Get colormap private structure. </p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a713cec2a0442303cafdb59183a686d28"></a><!-- doxytag: member="dmxcmap.h::DMX_SET_COLORMAP_PRIV" ref="a713cec2a0442303cafdb59183a686d28" args="(_pCMap, _pCMapPriv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_SET_COLORMAP_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pCMap,         <tr>
-          <td></td>
+          <td class="memname">#define DMX_SET_COLORMAP_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pCMap, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>_pCMapPriv&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>
+          <td class="paramtype">_pCMapPriv&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dixSetPrivate(&amp;(_pCMap)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a>, _pCMapPriv)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Value:</b><div class="fragment"><pre>(_pCMap)-&gt;devPrivates[<a class="code" href="dmxcmap_8h.html#a4">dmxColormapPrivateIndex</a>].ptr                      \
-        = (pointer)(_pCMapPriv);
-</pre></div>Set colormap private structure.     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxcmap.h::dmxColormapPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set colormap private structure. </p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00049">dmxAllocateColormapPrivates()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="aec71fbb492f3a3ce7e6b2b083a8b0978"></a><!-- doxytag: member="dmxcmap.h::dmxColormapPrivPtr" ref="aec71fbb492f3a3ce7e6b2b083a8b0978" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> * <a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> * <a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Colormap private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxcmap.h::dmxColormapPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a9b220494b52f982d4dcfa437d34d628b"></a><!-- doxytag: member="dmxcmap.h::dmxColormapPrivRec" ref="a9b220494b52f982d4dcfa437d34d628b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>  <a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a>  <a class="el" href="struct__dmxColormapPriv.html">dmxColormapPrivRec</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Colormap private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a10" doxytag="dmxcmap.h::dmxBECreateColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Colormap private area. </p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6986e997430cf665904ad9149e39a50b"></a><!-- doxytag: member="dmxcmap.h::dmxBECreateColormap" ref="a6986e997430cf665904ad9149e39a50b" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBECreateColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBECreateColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create <em>pColormap</em> on the back-end server. </p>
 
-<p>
-Create <em>pColormap</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxcmap.h::dmxBEFreeColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a432d82d6335a8bc17292440baded360c"></a><!-- doxytag: member="dmxcmap.h::dmxBEFreeColormap" ref="a432d82d6335a8bc17292440baded360c" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreeColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy <em>pColormap</em> on the back-end server. </p>
 
-<p>
-Destroy <em>pColormap</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxcmap.h::dmxCreateColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a07f6c7d8523b669b5fa614cbe5c0e1ad"></a><!-- doxytag: member="dmxcmap.h::dmxCreateColormap" ref="a07f6c7d8523b669b5fa614cbe5c0e1ad" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Create colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxcmap.h::dmxCreateDefColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00049">dmxAllocateColormapPrivates()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5481a08a1030ecac42ff809a1c7d2139"></a><!-- doxytag: member="dmxcmap.h::dmxCreateDefColormap" ref="a5481a08a1030ecac42ff809a1c7d2139" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateDefColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateDefColormap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create the DMX server's default colormap.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxcmap.h::dmxDestroyColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create the DMX server's default colormap. </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab12dcafef41b3dc821dc1ecd220735c3"></a><!-- doxytag: member="dmxcmap.h::dmxDestroyColormap" ref="ab12dcafef41b3dc821dc1ecd220735c3" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Destroy colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxcmap.h::dmxInstallColormap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxcmap_8h_source.html#l00062">DMX_SET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a13a0bbf846ac7b3dcb41ae9bc4e64a3e"></a><!-- doxytag: member="dmxcmap.h::dmxInstallColormap" ref="a13a0bbf846ac7b3dcb41ae9bc4e64a3e" args="(ColormapPtr pColormap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInstallColormap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pColormap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInstallColormap </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Install colormap on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Install colormap on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxcmap.h::dmxStoreColors" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a38bddf73cfed2aec203c62fc5be4ae97"></a><!-- doxytag: member="dmxcmap.h::dmxStoreColors" ref="a38bddf73cfed2aec203c62fc5be4ae97" args="(ColormapPtr pColormap, int ndef, xColorItem *pdef)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStoreColors </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ColormapPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pColormap</em>, </td>
+          <td class="memname">void dmxStoreColors </td>
+          <td>(</td>
+          <td class="paramtype">ColormapPtr&nbsp;</td>
+          <td class="paramname"> <em>pColormap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ndef</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ndef</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xColorItem *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdef</em></td>
+          <td class="paramtype">xColorItem *&nbsp;</td>
+          <td class="paramname"> <em>pdef</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Store colors in <em>pColormap</em> on back-end server associated with <em>pColormap's</em> screen. </p>
 
-<p>
-Store colors in <em>pColormap</em> on back-end server associated with <em>pColormap's</em> screen.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxcmap.h::dmxColormapPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ac851002ecdb3ee41847403048e47cc8d"></a><!-- doxytag: member="dmxcmap.h::dmxColormapPrivateKey" ref="ac851002ecdb3ee41847403048e47cc8d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a6">dmxColormapPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Colormaps     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Private index. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcmap_8c.html">dmxcmap.c</a> </dd>
+<dd>
+<a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd>
+<dd>
+<a class="el" href="dmxwindow_8c.html">dmxwindow.c</a></dd></dl>
+<p>Private index for Colormaps </p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html
new file mode 100644
index 000000000..e9e0ed041
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxcmap_8h_source.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxcmap.h</h1><a href="dmxcmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXCMAP_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXCMAP_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;colormapst.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__dmxColormapPriv.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxColormapPriv.html">_dmxColormapPriv</a> {
+<a name="l00044"></a><a class="code" href="struct__dmxColormapPriv.html#ac310002aa04b2455910defd155dadad4">00044</a>     Colormap  <a class="code" href="struct__dmxColormapPriv.html#ac310002aa04b2455910defd155dadad4">cmap</a>;
+<a name="l00045"></a>00045 } <a class="code" href="struct__dmxColormapPriv.html">dmxColormapPrivRec</a>, *<a class="code" href="struct__dmxColormapPriv.html">dmxColormapPrivPtr</a>;
+<a name="l00046"></a>00046 
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a07f6c7d8523b669b5fa614cbe5c0e1ad">dmxCreateColormap</a>(ColormapPtr pColormap);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#ab12dcafef41b3dc821dc1ecd220735c3">dmxDestroyColormap</a>(ColormapPtr pColormap);
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#a13a0bbf846ac7b3dcb41ae9bc4e64a3e">dmxInstallColormap</a>(ColormapPtr pColormap);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcmap_8c.html#a38bddf73cfed2aec203c62fc5be4ae97">dmxStoreColors</a>(ColormapPtr pColormap, <span class="keywordtype">int</span> ndef, xColorItem *pdef);
+<a name="l00052"></a>00052 
+<a name="l00053"></a>00053 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a5481a08a1030ecac42ff809a1c7d2139">dmxCreateDefColormap</a>(ScreenPtr pScreen);
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a6986e997430cf665904ad9149e39a50b">dmxBECreateColormap</a>(ColormapPtr pColormap);
+<a name="l00056"></a>00056 <span class="keyword">extern</span> Bool <a class="code" href="dmxcmap_8c.html#a432d82d6335a8bc17292440baded360c">dmxBEFreeColormap</a>(ColormapPtr pColormap);
+<a name="l00057"></a>00057 
+<a name="l00059"></a>00059 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxcmap_8h.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a>;
+<a name="l00060"></a>00060 
+<a name="l00062"></a><a class="code" href="dmxcmap_8h.html#a713cec2a0442303cafdb59183a686d28">00062</a> <span class="preprocessor">#define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)                       \</span>
+<a name="l00063"></a>00063 <span class="preprocessor">    dixSetPrivate(&amp;(_pCMap)-&gt;devPrivates, dmxColormapPrivateKey, _pCMapPriv)</span>
+<a name="l00064"></a>00064 <span class="preprocessor"></span>
+<a name="l00066"></a><a class="code" href="dmxcmap_8h.html#aee4652aa0ac07182583f0cb18ed8557b">00066</a> <span class="preprocessor">#define DMX_GET_COLORMAP_PRIV(_pCMap) (dmxColormapPrivPtr)              \</span>
+<a name="l00067"></a>00067 <span class="preprocessor">    dixLookupPrivate(&amp;(_pCMap)-&gt;devPrivates, dmxColormapPrivateKey)</span>
+<a name="l00068"></a>00068 <span class="preprocessor"></span>
+<a name="l00069"></a>00069 <span class="preprocessor">#endif </span><span class="comment">/* DMXCMAP_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html
index 3e0459c12..6782e36ff 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8c.html
@@ -6,687 +6,875 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcommon.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconsole_8h-source.html">dmxconsole.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmap_8h-source.html">dmxmap.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "input.h"</code><br>
-<code>#include "keysym.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-<code>#include &lt;unistd.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcommon.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconsole_8h_source.html">dmxconsole.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmap_8h_source.html">dmxmap.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;input.h&quot;</code><br/>
+<code>#include &lt;X11/keysym.h&gt;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;scrnintstr.h&quot;</code><br/>
+<code>#include &lt;unistd.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#ac478cb19dda771f00d3b753001a51e09">DMX_STATE_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#adf6865b0bc7ad370c94e3b8682262c13">DMXDBG0</a>(f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a14111ac8f43949172b152e50dc720aba">NAME</a>(x)&nbsp;&nbsp;&nbsp;priv-&gt;xkb-&gt;names-&gt;x ? XGetAtomName(priv-&gt;<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>,priv-&gt;xkb-&gt;names-&gt;x) : NULL</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#ad9bd99dabcb14e9efe85df040d63c4b3">ADD</a>(type)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a5fe4b4fef83f0ca1aba8cabf76ebccf2">dmxCommonKbdSetAR</a> (Display *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, unsigned char *old, unsigned char *new)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a77cfda7cbd3e83a0869b26b782d2b6d4">dmxCommonKbdSetLeds</a> (Display *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, unsigned long new)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a029097ed04b236c945e3715910250680">dmxCommonKbdSetCtrl</a> (Display *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, KeybdCtrl *old, KeybdCtrl *new)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a71374978838ea5232f72055f152a894e">dmxCommonMouSetCtrl</a> (Display *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, PtrCtrl *old, PtrCtrl *new)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a399f0ec4a6e5d0bcd3d07f24b2a6ac9e">dmxCommonKbdCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a11aa027975061ee6f3e684ee66f0f18c">dmxCommonMouCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#aa069076ebf89f8b89668cffafb731cfe">dmxCommonKbdBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a83410e3987567bd35fd146b193a21ed9">dmxCommonKbdGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a86b1c983a556770efdd1a19e8be44534">dmxCommonKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a60cd36c3430ead2858986fe5f93165c1">dmxCommonKbdOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a9ddcdd8a91205b9b0e23022f246190a0">dmxCommonKbdOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a4b8e72433e206d48e6fb471e933800ad">dmxCommonOthOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a45f87ba7a0b02587dd2d1b4cdd3480c6">dmxCommonOthOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a67f944a345e0ba88ac996056914d191c">dmxCommonOthGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a9ce209ad340f84644115a165eadfa540">dmxCommonMouGetMap</a> (DevicePtr pDev, unsigned char *<a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, int *nButtons)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a6e3adb2e48d7cc7a098c542c693d66d0">dmxCommonXSelect</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a82d9ce21ede8d533adde28ce8dbabdf7">dmxCommonAddEnabledDevice</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#adb5e0faaefc43851e4ebcd01bd9c10ec">dmxCommonRemoveEnabledDevice</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a8ba0ee4f9f09bc9089d480d1f5467cd8">dmxCommonMouOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#acfeaccbc1f2f5be028b3ee8c0f31da89">dmxCommonMouOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a907580b7be71d9be0b771d32210f3cad">dmxFindPointerScreen</a> (int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#a14295660e17d34955693cef6654d7bb6">dmxCommonSaveState</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8c.html#aca953b7500d93577441828156674c64e">dmxCommonRestoreState</a> (pointer private)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file implements common routines used by the backend and console input devices. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="ad9bd99dabcb14e9efe85df040d63c4b3"></a><!-- doxytag: member="dmxcommon.c::ADD" ref="ad9bd99dabcb14e9efe85df040d63c4b3" args="(type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ADD</td>
+          <td>(</td>
+          <td class="paramtype">type&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">if</span> (count &lt; <a class="code" href="dmxinputinit_8h.html#ae754d74afaf08d6e9b46b3bc7581623e">DMX_MAX_XINPUT_EVENT_TYPES</a>) {                                \
+        type(priv-&gt;xi, event_type[count], event_list[count]);                \
+        <span class="keywordflow">if</span> (event_type[count]) {                                             \
+            <a class="code" href="dmxmap_8c.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a>(dmxLocal, event_type[count], XI_##type);            \
+            ++count;                                                         \
+        }                                                                    \
+    } <span class="keywordflow">else</span> {                                                                 \
+        <a class="code" href="dmxlog_8c.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog</a>(<a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxWarning</a>, <span class="stringliteral">&quot;More than %d event types for %s\n&quot;</span>,              \
+               <a class="code" href="dmxinputinit_8h.html#ae754d74afaf08d6e9b46b3bc7581623e">DMX_MAX_XINPUT_EVENT_TYPES</a>, dmxInput-&gt;name);                  \
+    }
+</pre></div>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac478cb19dda771f00d3b753001a51e09"></a><!-- doxytag: member="dmxcommon.c::DMX_STATE_DEBUG" ref="ac478cb19dda771f00d3b753001a51e09" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_STATE_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a4">myPrivate</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="adf6865b0bc7ad370c94e3b8682262c13"></a><!-- doxytag: member="dmxcommon.c::DMXDBG0" ref="adf6865b0bc7ad370c94e3b8682262c13" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a14111ac8f43949172b152e50dc720aba"></a><!-- doxytag: member="dmxcommon.c::NAME" ref="a14111ac8f43949172b152e50dc720aba" args="(x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define NAME</td>
+          <td>(</td>
+          <td class="paramtype">x&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;priv-&gt;xkb-&gt;names-&gt;x ? XGetAtomName(priv-&gt;<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>,priv-&gt;xkb-&gt;names-&gt;x) : NULL</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a9">dmxCommonKbdCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a10">dmxCommonMouCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="dmxcommon.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Each device has a private area that is visible only from inside the driver code. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a11">dmxCommonKbdBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a82d9ce21ede8d533adde28ce8dbabdf7"></a><!-- doxytag: member="dmxcommon.c::dmxCommonAddEnabledDevice" ref="a82d9ce21ede8d533adde28ce8dbabdf7" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxCommonAddEnabledDevice </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a12">dmxCommonKbdGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a13">dmxCommonKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a14">dmxCommonKbdOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a0e7301a2783357ff391172acab00d48a"></a><!-- doxytag: member="dmxcommon.c::dmxCommonCopyPrivate" ref="a0e7301a2783357ff391172acab00d48a" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer dmxCommonCopyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns a pointer to the private area for the device that comes just prior to <em>pDevice</em> in the current <em>dmxInput</em> device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a15">dmxCommonKbdOff</a> (DevicePtr pDev)</td></tr>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a16">dmxCommonOthOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa069076ebf89f8b89668cffafb731cfe"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdBell" ref="aa069076ebf89f8b89668cffafb731cfe" args="(DevicePtr pDev, int percent, int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCommonKbdBell </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pitch</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duration</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Sound they keyboard bell. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a17">dmxCommonOthOff</a> (DevicePtr pDev)</td></tr>
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a18">dmxCommonOthGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a399f0ec4a6e5d0bcd3d07f24b2a6ac9e"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdCtrl" ref="a399f0ec4a6e5d0bcd3d07f24b2a6ac9e" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCommonKbdCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Update the keyboard control. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a19">dmxCommonMouGetMap</a> (DevicePtr pDev, unsigned char *map, int *nButtons)</td></tr>
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a23">dmxCommonMouOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a86b1c983a556770efdd1a19e8be44534"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdGetInfo" ref="a86b1c983a556770efdd1a19e8be44534" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCommonKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill in the XKEYBOARD parts of the <em>info</em> structure for the specified <em>pDev</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a24">dmxCommonMouOff</a> (DevicePtr pDev)</td></tr>
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00092">_DMXLocalInitInfo::freenames</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxcommon_8c.html#a14111ac8f43949172b152e50dc720aba">NAME</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00091">_DMXLocalInitInfo::names</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a25">dmxFindPointerScreen</a> (int x, int y)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a26">dmxCommonCopyPrivate</a> (DeviceIntPtr pDevice)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a83410e3987567bd35fd146b193a21ed9"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdGetMap" ref="a83410e3987567bd35fd146b193a21ed9" args="(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCommonKbdGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySymsPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeySyms</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CARD8 *&nbsp;</td>
+          <td class="paramname"> <em>pModMap</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Get the keyboard mapping. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a27">dmxCommonSaveState</a> (pointer private)</td></tr>
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8c.html#a28">dmxCommonRestoreState</a> (pointer private)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements common routines used by the backend and console input devices.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxcommon.c::myPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Each device has a private area that is visible only from inside the driver code.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a26" doxytag="dmxcommon.c::dmxCommonCopyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a9ddcdd8a91205b9b0e23022f246190a0"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdOff" ref="a9ddcdd8a91205b9b0e23022f246190a0" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer dmxCommonCopyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonKbdOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00095">DMX_KEYBOARD_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a60cd36c3430ead2858986fe5f93165c1"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdOn" ref="a60cd36c3430ead2858986fe5f93165c1" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxCommonKbdOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns a pointer to the private area for the device that comes just prior to <em>pDevice</em> in the current <em>dmxInput</em> device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxcommon.c::dmxCommonKbdBell" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00095">DMX_KEYBOARD_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5fe4b4fef83f0ca1aba8cabf76ebccf2"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdSetAR" ref="a5fe4b4fef83f0ca1aba8cabf76ebccf2" args="(Display *display, unsigned char *old, unsigned char *new)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdBell </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void dmxCommonKbdSetAR </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>old</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>volume</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>new</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pitch</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a029097ed04b236c945e3715910250680"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdSetCtrl" ref="a029097ed04b236c945e3715910250680" args="(Display *display, KeybdCtrl *old, KeybdCtrl *new)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxCommonKbdSetCtrl </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>old</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duration</em></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>new</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sound they keyboard bell.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxcommon.c::dmxCommonKbdCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00074">dmxCommonKbdSetAR()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00105">dmxCommonKbdSetLeds()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00156">dmxCommonKbdCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a77cfda7cbd3e83a0869b26b782d2b6d4"></a><!-- doxytag: member="dmxcommon.c::dmxCommonKbdSetLeds" ref="a77cfda7cbd3e83a0869b26b782d2b6d4" args="(Display *display, unsigned long new)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void dmxCommonKbdSetLeds </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>new</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Update the keyboard control.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxcommon.c::dmxCommonKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11aa027975061ee6f3e684ee66f0f18c"></a><!-- doxytag: member="dmxcommon.c::dmxCommonMouCtrl" ref="a11aa027975061ee6f3e684ee66f0f18c" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonMouCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the XKEYBOARD parts of the <em>info</em> structure for the specified <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxcommon.c::dmxCommonKbdGetMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Update the mouse control. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00138">dmxCommonMouSetCtrl()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9ce209ad340f84644115a165eadfa540"></a><!-- doxytag: member="dmxcommon.c::dmxCommonMouGetMap" ref="a9ce209ad340f84644115a165eadfa540" args="(DevicePtr pDev, unsigned char *map, int *nButtons)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdGetMap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonMouGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeySymsPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pKeySyms</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>map</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD8 *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pModMap</em></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>nButtons</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get the keyboard mapping.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxcommon.c::dmxCommonKbdOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Obtain the mouse button mapping. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00047">DMX_MAX_BUTTONS</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acfeaccbc1f2f5be028b3ee8c0f31da89"></a><!-- doxytag: member="dmxcommon.c::dmxCommonMouOff" ref="acfeaccbc1f2f5be028b3ee8c0f31da89" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonMouOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxcommon.c::dmxCommonKbdOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00098">DMX_POINTER_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00471">dmxCommonRemoveEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8ba0ee4f9f09bc9089d480d1f5467cd8"></a><!-- doxytag: member="dmxcommon.c::dmxCommonMouOn" ref="a8ba0ee4f9f09bc9089d480d1f5467cd8" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonKbdOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCommonMouOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxcommon.c::dmxCommonMouCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00098">DMX_POINTER_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00465">dmxCommonAddEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a71374978838ea5232f72055f152a894e"></a><!-- doxytag: member="dmxcommon.c::dmxCommonMouSetCtrl" ref="a71374978838ea5232f72055f152a894e" args="(Display *display, PtrCtrl *old, PtrCtrl *new)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void dmxCommonMouSetCtrl </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>old</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>PtrCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>new</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Update the mouse control.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxcommon.c::dmxCommonMouGetMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00170">dmxCommonMouCtrl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a67f944a345e0ba88ac996056914d191c"></a><!-- doxytag: member="dmxcommon.c::dmxCommonOthGetInfo" ref="a67f944a345e0ba88ac996056914d191c" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouGetMap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonOthGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>map</em>, </td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>nButtons</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="dmxinputinit_8c_source.html#l00830">dmxInputExtensionErrorHandler()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00102">_DMXLocalInitInfo::numAbsAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00111">_DMXLocalInitInfo::proximityClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a45f87ba7a0b02587dd2d1b4cdd3480c6"></a><!-- doxytag: member="dmxcommon.c::dmxCommonOthOff" ref="a45f87ba7a0b02587dd2d1b4cdd3480c6" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxCommonOthOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Obtain the mouse button mapping.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxcommon.c::dmxCommonMouOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxcommon.c::dmxCommonMouOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4b8e72433e206d48e6fb471e933800ad"></a><!-- doxytag: member="dmxcommon.c::dmxCommonOthOn" ref="a4b8e72433e206d48e6fb471e933800ad" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonMouOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCommonOthOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxcommon.c::dmxCommonOthGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8c.html#ad9bd99dabcb14e9efe85df040d63c4b3">ADD</a>, <a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a>, <a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a>, <a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a>, <a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a>, <a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a>, <a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a>, <a class="el" href="dmxinputinit_8h_source.html#l00051">DMX_MAX_XINPUT_EVENT_TYPES</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>, and <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adb5e0faaefc43851e4ebcd01bd9c10ec"></a><!-- doxytag: member="dmxcommon.c::dmxCommonRemoveEnabledDevice" ref="adb5e0faaefc43851e4ebcd01bd9c10ec" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonOthGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void* dmxCommonRemoveEnabledDevice </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxcommon.c::dmxCommonOthOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aca953b7500d93577441828156674c64e"></a><!-- doxytag: member="dmxcommon.c::dmxCommonRestoreState" ref="aca953b7500d93577441828156674c64e" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonOthOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonRestoreState </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxcommon.c::dmxCommonOthOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine restores all the information saved by <a class="el" href="dmxcommon_8h.html#a14295660e17d34955693cef6654d7bb6">dmxCommonSaveState</a>. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00301">dmxCommonKbdOff()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a14295660e17d34955693cef6654d7bb6"></a><!-- doxytag: member="dmxcommon.c::dmxCommonSaveState" ref="a14295660e17d34955693cef6654d7bb6" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonOthOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonSaveState </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxcommon.c::dmxCommonRestoreState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine saves and resets some important state for the backend and console device drivers:</p>
+<ul>
+<li>the modifier map is saved and set to 0 (so DMX controls the LEDs)</li>
+<li>the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using</li>
+</ul>
+<p>This routine and <a class="el" href="dmxcommon_8h.html#aca953b7500d93577441828156674c64e">dmxCommonRestoreState</a> are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown). </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinit_8c_source.html#l00102">dmxUseXKB</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxcommon_8c_source.html#l00156">dmxCommonKbdCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00288">dmxCommonKbdOn()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6e3adb2e48d7cc7a098c542c693d66d0"></a><!-- doxytag: member="dmxcommon.c::dmxCommonXSelect" ref="a6e3adb2e48d7cc7a098c542c693d66d0" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonRestoreState </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void* dmxCommonXSelect </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine restores all the information saved by <a class="el" href="dmxcommon_8h.html#a28">dmxCommonSaveState</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxcommon.c::dmxCommonSaveState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonSaveState </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine saves and resets some important state for the backend and console device drivers:<ul>
-<li>the modifier map is saved and set to 0 (so DMX controls the LEDs)</li><li>the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using</li></ul>
-<p>
-This routine and <a class="el" href="dmxcommon_8h.html#a29">dmxCommonRestoreState</a> are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxcommon.c::dmxFindPointerScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a907580b7be71d9be0b771d32210f3cad"></a><!-- doxytag: member="dmxcommon.c::dmxFindPointerScreen" ref="a907580b7be71d9be0b771d32210f3cad" args="(int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxFindPointerScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">int dmxFindPointerScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Given the global coordinates <em>x</em> and <em>y</em>, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into #dmxScreenInfo and is between -1 and <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a> - 1, inclusive.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Given the global coordinates <em>x</em> and <em>y</em>, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into <em>dmxScreenInfo</em> and is between -1 and <em>dmxNumScreens</em> - 1, inclusive. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html
deleted file mode 100644
index 72ac5378b..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxcommon_8h-source.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcommon.h</h1><a href="dmxcommon_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00039 <span class="preprocessor">#ifndef _DMXCOMMON_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCOMMON_H_</span>
-00041 <span class="preprocessor"></span>
-00042 <span class="preprocessor">#define DMX_COMMON_OTHER                    \</span>
-00043 <span class="preprocessor">    Display                 *display;       \</span>
-00044 <span class="preprocessor">    Window                  window;         \</span>
-00045 <span class="preprocessor">    DMXScreenInfo           *be;            \</span>
-00046 <span class="preprocessor">    DMXLocalInputInfoPtr    dmxLocal;       \</span>
-00047 <span class="preprocessor">    int                     initPointerX;   \</span>
-00048 <span class="preprocessor">    int                     initPointerY;   \</span>
-00049 <span class="preprocessor">    long                    eventMask;      \</span>
-00050 <span class="preprocessor">    KeybdCtrl               kctrl;          \</span>
-00051 <span class="preprocessor">    PtrCtrl                 mctrl;          \</span>
-00052 <span class="preprocessor">    int                     kctrlset;       \</span>
-00053 <span class="preprocessor">    int                     mctrlset;       \</span>
-00054 <span class="preprocessor">    KeybdCtrl               savedKctrl;     \</span>
-00055 <span class="preprocessor">    XModifierKeymap         *savedModMap;   \</span>
-00056 <span class="preprocessor">    int                     stateSaved</span>
-00057 <span class="preprocessor"></span>
-00058 <span class="preprocessor">#ifdef XKB</span>
-00059 <span class="preprocessor"></span><span class="preprocessor">#define DMX_COMMON_XKB                      \</span>
-00060 <span class="preprocessor">    DMX_COMMON_OTHER;                       \</span>
-00061 <span class="preprocessor">    XkbDescPtr              xkb;            \</span>
-00062 <span class="preprocessor">    XkbIndicatorRec         savedIndicators</span>
-00063 <span class="preprocessor"></span><span class="preprocessor">#else</span>
-00064 <span class="preprocessor"></span><span class="preprocessor">#define DMX_COMMON_XKB      DMX_COMMON_OTHER</span>
-00065 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00066 <span class="preprocessor"></span>
-00067 <span class="preprocessor">#ifdef XINPUT</span>
-00068 <span class="preprocessor"></span><span class="preprocessor">#define DMX_COMMON_PRIVATE                  \</span>
-00069 <span class="preprocessor">    DMX_COMMON_XKB;                         \</span>
-00070 <span class="preprocessor">    XDevice                 *xi</span>
-00071 <span class="preprocessor"></span><span class="preprocessor">#else</span>
-00072 <span class="preprocessor"></span><span class="preprocessor">#define DMX_COMMON_PRIVATE  DMX_COMMON_OTHER</span>
-00073 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00074 <span class="preprocessor"></span>
-00075 <span class="preprocessor">#define GETONLYPRIVFROMPRIVATE                                          \</span>
-00076 <span class="preprocessor">    myPrivate            *priv     = private</span>
-00077 <span class="preprocessor"></span>
-00078 <span class="preprocessor">#define GETPRIVFROMPRIVATE                                              \</span>
-00079 <span class="preprocessor">    GETONLYPRIVFROMPRIVATE;                                             \</span>
-00080 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[priv-&gt;dmxLocal-&gt;inputIdx]</span>
-00081 <span class="preprocessor"></span>
-00082 <span class="preprocessor">#define GETDMXLOCALFROMPDEVICE                                          \</span>
-00083 <span class="preprocessor">    DevicePtr            pDev      = &amp;pDevice-&gt;public;                  \</span>
-00084 <span class="preprocessor">    DMXLocalInputInfoPtr dmxLocal  = pDev-&gt;devicePrivate</span>
-00085 <span class="preprocessor"></span>
-00086 <span class="preprocessor">#define GETDMXINPUTFROMPRIV                                             \</span>
-00087 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[priv-&gt;dmxLocal-&gt;inputIdx]</span>
-00088 <span class="preprocessor"></span>
-00089 <span class="preprocessor">#define GETDMXINPUTFROMPDEVICE                                          \</span>
-00090 <span class="preprocessor">    GETDMXLOCALFROMPDEVICE;                                             \</span>
-00091 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[dmxLocal-&gt;inputIdx]</span>
-00092 <span class="preprocessor"></span>
-00093 <span class="preprocessor">#define GETDMXLOCALFROMPDEV                                             \</span>
-00094 <span class="preprocessor">    DMXLocalInputInfoPtr dmxLocal  = pDev-&gt;devicePrivate</span>
-00095 <span class="preprocessor"></span>
-00096 <span class="preprocessor">#define GETDMXINPUTFROMPDEV                                             \</span>
-00097 <span class="preprocessor">    GETDMXLOCALFROMPDEV;                                                \</span>
-00098 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[dmxLocal-&gt;inputIdx]</span>
-00099 <span class="preprocessor"></span>
-00100 <span class="preprocessor">#define GETPRIVFROMPDEV                                                 \</span>
-00101 <span class="preprocessor">    GETDMXLOCALFROMPDEV;                                                \</span>
-00102 <span class="preprocessor">    myPrivate            *priv     = dmxLocal-&gt;private</span>
-00103 <span class="preprocessor"></span>
-00104 <span class="preprocessor">#define DMX_KEYBOARD_EVENT_MASK                                         \</span>
-00105 <span class="preprocessor">    (KeyPressMask | KeyReleaseMask | KeymapStateMask)</span>
-00106 <span class="preprocessor"></span>
-00107 <span class="preprocessor">#define DMX_POINTER_EVENT_MASK                                          \</span>
-00108 <span class="preprocessor">    (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)</span>
-00109 <span class="preprocessor"></span>
-00110 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a13">dmxCommonKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00111 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a12">dmxCommonKbdGetMap</a>(DevicePtr pDev,
-00112                                   KeySymsPtr pKeySyms, CARD8 *pModMap);
-00113 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a9">dmxCommonKbdCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
-00114 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a11">dmxCommonKbdBell</a>(DevicePtr pDev, <span class="keywordtype">int</span> percent,
-00115                                 <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
-00116 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a14">dmxCommonKbdOn</a>(DevicePtr pDev);
-00117 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a15">dmxCommonKbdOff</a>(DevicePtr pDev);
-00118 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a19">dmxCommonMouGetMap</a>(DevicePtr pDev,
-00119                                   <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> *map, <span class="keywordtype">int</span> *nButtons);
-00120 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a10">dmxCommonMouCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
-00121 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a23">dmxCommonMouOn</a>(DevicePtr pDev);
-00122 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a24">dmxCommonMouOff</a>(DevicePtr pDev);
-00123 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a25">dmxFindPointerScreen</a>(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00124 
-00125 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a16">dmxCommonOthOn</a>(DevicePtr pDev);
-00126 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a17">dmxCommonOthOff</a>(DevicePtr pDev);
-00127 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a18">dmxCommonOthGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00128 
-00129                                 <span class="comment">/* helper functions */</span>
-00130 <span class="keyword">extern</span> pointer <a class="code" href="dmxcommon_8c.html#a26">dmxCommonCopyPrivate</a>(DeviceIntPtr pDevice);
-00131 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a27">dmxCommonSaveState</a>(pointer <span class="keyword">private</span>);
-00132 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a28">dmxCommonRestoreState</a>(pointer <span class="keyword">private</span>);
-00133 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html
index 9367b5d2c..469d991a7 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8h.html
@@ -6,651 +6,761 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxcommon.h File Reference</h1>
-<p>
-<a href="dmxcommon_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a13">dmxCommonKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a14">dmxCommonKbdGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a15">dmxCommonKbdCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a16">dmxCommonKbdBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a17">dmxCommonKbdOn</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a18">dmxCommonKbdOff</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a19">dmxCommonMouGetMap</a> (DevicePtr pDev, unsigned char *map, int *nButtons)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a20">dmxCommonMouCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+<p><a href="dmxcommon_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#ac501f773a244037a88da37c0dc48ac66">DMX_COMMON_OTHER</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#ac4c9fac008144d96c6bd6313b5e158d2">DMX_COMMON_XKB</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a6f802c6dc60aba1cbf8c1246cb5a4be4">DMX_COMMON_PRIVATE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a215427f6c6c570d64e1039239484563f">GETONLYPRIVFROMPRIVATE</a>&nbsp;&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html">myPrivate</a>            *priv     = private</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#ae04675e973690cab79ef643f298cb375">GETPRIVFROMPRIVATE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#ae60813d58a79b6dae5b98321fd7e1866">GETDMXLOCALFROMPDEVICE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a2f522c463d79a458d27ac9e1f6b2e30f">GETDMXINPUTFROMPRIV</a>&nbsp;&nbsp;&nbsp;<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *dmxInput = &amp;<a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>[priv-&gt;dmxLocal-&gt;inputIdx]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a7067dd8545db11300dc1ee7f461b346d">GETDMXINPUTFROMPDEVICE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a22db91e32f104411c68049e16a93067b">GETDMXLOCALFROMPDEV</a>&nbsp;&nbsp;&nbsp;<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal  = pDev-&gt;devicePrivate</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#ad100a619cb405b9f315abf1019622dd7">GETDMXINPUTFROMPDEV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a162b4980b050465ca21228eb41f207a2">GETPRIVFROMPDEV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a8ed45b47d9c28c37195b3d10df2319a1">DMX_KEYBOARD_EVENT_MASK</a>&nbsp;&nbsp;&nbsp;(KeyPressMask | KeyReleaseMask | KeymapStateMask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#aab5b14e925716fa97237594ee0b07d01">DMX_POINTER_EVENT_MASK</a>&nbsp;&nbsp;&nbsp;(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a86b1c983a556770efdd1a19e8be44534">dmxCommonKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a83410e3987567bd35fd146b193a21ed9">dmxCommonKbdGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a399f0ec4a6e5d0bcd3d07f24b2a6ac9e">dmxCommonKbdCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#aa069076ebf89f8b89668cffafb731cfe">dmxCommonKbdBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a60cd36c3430ead2858986fe5f93165c1">dmxCommonKbdOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a9ddcdd8a91205b9b0e23022f246190a0">dmxCommonKbdOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a9ce209ad340f84644115a165eadfa540">dmxCommonMouGetMap</a> (DevicePtr pDev, unsigned char *<a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, int *nButtons)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a11aa027975061ee6f3e684ee66f0f18c">dmxCommonMouCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a8ba0ee4f9f09bc9089d480d1f5467cd8">dmxCommonMouOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#acfeaccbc1f2f5be028b3ee8c0f31da89">dmxCommonMouOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a907580b7be71d9be0b771d32210f3cad">dmxFindPointerScreen</a> (int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a4b8e72433e206d48e6fb471e933800ad">dmxCommonOthOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a45f87ba7a0b02587dd2d1b4cdd3480c6">dmxCommonOthOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a67f944a345e0ba88ac996056914d191c">dmxCommonOthGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#a14295660e17d34955693cef6654d7bb6">dmxCommonSaveState</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcommon_8h.html#aca953b7500d93577441828156674c64e">dmxCommonRestoreState</a> (pointer private)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to functions used by backend and console input devices. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a> </dd>
+<dd>
+<a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd>
+<dd>
+<a class="el" href="dmxconsole_8c.html">dmxconsole.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="ac501f773a244037a88da37c0dc48ac66"></a><!-- doxytag: member="dmxcommon.h::DMX_COMMON_OTHER" ref="ac501f773a244037a88da37c0dc48ac66" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_COMMON_OTHER</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">Display                 *<a class="code" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>;       \
+    Window                  window;         \
+    <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>           *be;            \
+    <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>    dmxLocal;       \
+    <span class="keywordtype">int</span>                     initPointerX;   \
+    <span class="keywordtype">int</span>                     initPointerY;   \
+    <span class="keywordtype">long</span>                    eventMask;      \
+    KeybdCtrl               kctrl;          \
+    PtrCtrl                 mctrl;          \
+    <span class="keywordtype">int</span>                     kctrlset;       \
+    <span class="keywordtype">int</span>                     mctrlset;       \
+    KeybdCtrl               savedKctrl;     \
+    XModifierKeymap         *savedModMap;   \
+    <span class="keywordtype">int</span>                     stateSaved
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a6f802c6dc60aba1cbf8c1246cb5a4be4"></a><!-- doxytag: member="dmxcommon.h::DMX_COMMON_PRIVATE" ref="a6f802c6dc60aba1cbf8c1246cb5a4be4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_COMMON_PRIVATE</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#ac4c9fac008144d96c6bd6313b5e158d2">DMX_COMMON_XKB</a>;                         \
+    XDevice                 *xi
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="ac4c9fac008144d96c6bd6313b5e158d2"></a><!-- doxytag: member="dmxcommon.h::DMX_COMMON_XKB" ref="ac4c9fac008144d96c6bd6313b5e158d2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_COMMON_XKB</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#ac501f773a244037a88da37c0dc48ac66">DMX_COMMON_OTHER</a>;                       \
+    XkbDescPtr              xkb;            \
+    XkbIndicatorRec         savedIndicators
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a8ed45b47d9c28c37195b3d10df2319a1"></a><!-- doxytag: member="dmxcommon.h::DMX_KEYBOARD_EVENT_MASK" ref="a8ed45b47d9c28c37195b3d10df2319a1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_KEYBOARD_EVENT_MASK&nbsp;&nbsp;&nbsp;(KeyPressMask | KeyReleaseMask | KeymapStateMask)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a21">dmxCommonMouOn</a> (DevicePtr pDev)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00301">dmxCommonKbdOff()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00288">dmxCommonKbdOn()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a22">dmxCommonMouOff</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aab5b14e925716fa97237594ee0b07d01"></a><!-- doxytag: member="dmxcommon.h::DMX_POINTER_EVENT_MASK" ref="aab5b14e925716fa97237594ee0b07d01" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_POINTER_EVENT_MASK&nbsp;&nbsp;&nbsp;(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a23">dmxFindPointerScreen</a> (int x, int y)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a24">dmxCommonOthOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ad100a619cb405b9f315abf1019622dd7"></a><!-- doxytag: member="dmxcommon.h::GETDMXINPUTFROMPDEV" ref="ad100a619cb405b9f315abf1019622dd7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETDMXINPUTFROMPDEV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#a22db91e32f104411c68049e16a93067b">GETDMXLOCALFROMPDEV</a>;                                                \
+    <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *dmxInput = &amp;<a class="code" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>[dmxLocal-&gt;inputIdx]
+</pre></div>
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, and <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7067dd8545db11300dc1ee7f461b346d"></a><!-- doxytag: member="dmxcommon.h::GETDMXINPUTFROMPDEVICE" ref="a7067dd8545db11300dc1ee7f461b346d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETDMXINPUTFROMPDEVICE</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#ae60813d58a79b6dae5b98321fd7e1866">GETDMXLOCALFROMPDEVICE</a>;                                             \
+    <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *dmxInput = &amp;<a class="code" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>[dmxLocal-&gt;inputIdx]
+</pre></div>
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2f522c463d79a458d27ac9e1f6b2e30f"></a><!-- doxytag: member="dmxcommon.h::GETDMXINPUTFROMPRIV" ref="a2f522c463d79a458d27ac9e1f6b2e30f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETDMXINPUTFROMPRIV&nbsp;&nbsp;&nbsp;<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *dmxInput = &amp;<a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>[priv-&gt;dmxLocal-&gt;inputIdx]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a25">dmxCommonOthOff</a> (DevicePtr pDev)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a26">dmxCommonOthGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a22db91e32f104411c68049e16a93067b"></a><!-- doxytag: member="dmxcommon.h::GETDMXLOCALFROMPDEV" ref="a22db91e32f104411c68049e16a93067b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETDMXLOCALFROMPDEV&nbsp;&nbsp;&nbsp;<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal  = pDev-&gt;devicePrivate</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a27">dmxCommonCopyPrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00174">enqueueMotion()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a28">dmxCommonSaveState</a> (pointer private)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ae60813d58a79b6dae5b98321fd7e1866"></a><!-- doxytag: member="dmxcommon.h::GETDMXLOCALFROMPDEVICE" ref="ae60813d58a79b6dae5b98321fd7e1866" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETDMXLOCALFROMPDEVICE</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">DevicePtr            pDev      = &amp;pDevice-&gt;public;                  \
+    <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal  = pDev-&gt;devicePrivate
+</pre></div>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00104">dmxBackendCreatePrivate()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconsole_8c_source.html#l00140">dmxConsoleCreatePrivate()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxmotion_8c_source.html#l00074">dmxPointerGetMotionEvents()</a>, and <a class="el" href="dmxmotion_8c_source.html#l00102">dmxPointerPutMotionEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a215427f6c6c570d64e1039239484563f"></a><!-- doxytag: member="dmxcommon.h::GETONLYPRIVFROMPRIVATE" ref="a215427f6c6c570d64e1039239484563f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETONLYPRIVFROMPRIVATE&nbsp;&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html">myPrivate</a>            *priv     = private</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcommon_8h.html#a29">dmxCommonRestoreState</a> (pointer private)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, <a class="el" href="dmxconsole_8c_source.html#l00378">dmxConsoleUpdateInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to functions used by backend and console input devices. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a> <p>
-<a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> <p>
-<a class="el" href="dmxconsole_8c.html">dmxconsole.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a27" doxytag="dmxcommon.h::dmxCommonCopyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> pointer dmxCommonCopyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+</div>
+<a class="anchor" id="a162b4980b050465ca21228eb41f207a2"></a><!-- doxytag: member="dmxcommon.h::GETPRIVFROMPDEV" ref="a162b4980b050465ca21228eb41f207a2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIVFROMPDEV</td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns a pointer to the private area for the device that comes just prior to <em>pDevice</em> in the current <em>dmxInput</em> device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxcommon.h::dmxCommonKbdBell" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#a22db91e32f104411c68049e16a93067b">GETDMXLOCALFROMPDEV</a>;                                                \
+    <a class="code" href="struct__myPrivate.html">myPrivate</a>            *priv     = dmxLocal-&gt;private
+</pre></div>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00552">dmxBackendInit()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>, <a class="el" href="dmxcommon_8c_source.html#l00191">dmxCommonKbdBell()</a>, <a class="el" href="dmxcommon_8c_source.html#l00156">dmxCommonKbdCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00214">dmxCommonKbdGetMap()</a>, <a class="el" href="dmxcommon_8c_source.html#l00301">dmxCommonKbdOff()</a>, <a class="el" href="dmxcommon_8c_source.html#l00288">dmxCommonKbdOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00170">dmxCommonMouCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>, <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00354">dmxCommonOthOff()</a>, <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00695">dmxConsoleReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae04675e973690cab79ef643f298cb375"></a><!-- doxytag: member="dmxcommon.h::GETPRIVFROMPRIVATE" ref="ae04675e973690cab79ef643f298cb375" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIVFROMPRIVATE</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="dmxcommon_8h.html#a215427f6c6c570d64e1039239484563f">GETONLYPRIVFROMPRIVATE</a>;                                             \
+    <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *dmxInput = &amp;<a class="code" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>[priv-&gt;dmxLocal-&gt;inputIdx]
+</pre></div>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a0e7301a2783357ff391172acab00d48a"></a><!-- doxytag: member="dmxcommon.h::dmxCommonCopyPrivate" ref="a0e7301a2783357ff391172acab00d48a" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer dmxCommonCopyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns a pointer to the private area for the device that comes just prior to <em>pDevice</em> in the current <em>dmxInput</em> device list. This is used as the private area for the current device in some situations (e.g., when a keyboard and mouse form a pair that should share the same private area). If the requested private area cannot be located, then NULL is returned. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa069076ebf89f8b89668cffafb731cfe"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdBell" ref="aa069076ebf89f8b89668cffafb731cfe" args="(DevicePtr pDev, int percent, int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdBell </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonKbdBell </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>volume</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pitch</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pitch</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duration</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duration</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sound they keyboard bell.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxcommon.h::dmxCommonKbdCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Sound they keyboard bell. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a399f0ec4a6e5d0bcd3d07f24b2a6ac9e"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdCtrl" ref="a399f0ec4a6e5d0bcd3d07f24b2a6ac9e" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonKbdCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Update the keyboard control.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxcommon.h::dmxCommonKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Update the keyboard control. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a86b1c983a556770efdd1a19e8be44534"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdGetInfo" ref="a86b1c983a556770efdd1a19e8be44534" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the XKEYBOARD parts of the <em>info</em> structure for the specified <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxcommon.h::dmxCommonKbdGetMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill in the XKEYBOARD parts of the <em>info</em> structure for the specified <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00092">_DMXLocalInitInfo::freenames</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxcommon_8c.html#a14111ac8f43949172b152e50dc720aba">NAME</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00091">_DMXLocalInitInfo::names</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a83410e3987567bd35fd146b193a21ed9"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdGetMap" ref="a83410e3987567bd35fd146b193a21ed9" args="(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdGetMap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonKbdGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeySymsPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pKeySyms</em>, </td>
+          <td class="paramtype">KeySymsPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeySyms</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD8 *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pModMap</em></td>
+          <td class="paramtype">CARD8 *&nbsp;</td>
+          <td class="paramname"> <em>pModMap</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get the keyboard mapping.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxcommon.h::dmxCommonKbdOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Get the keyboard mapping. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9ddcdd8a91205b9b0e23022f246190a0"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdOff" ref="a9ddcdd8a91205b9b0e23022f246190a0" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonKbdOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonKbdOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxcommon.h::dmxCommonKbdOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00095">DMX_KEYBOARD_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a60cd36c3430ead2858986fe5f93165c1"></a><!-- doxytag: member="dmxcommon.h::dmxCommonKbdOn" ref="a60cd36c3430ead2858986fe5f93165c1" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonKbdOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCommonKbdOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxcommon.h::dmxCommonMouCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00095">DMX_KEYBOARD_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11aa027975061ee6f3e684ee66f0f18c"></a><!-- doxytag: member="dmxcommon.h::dmxCommonMouCtrl" ref="a11aa027975061ee6f3e684ee66f0f18c" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonMouCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PtrCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Update the mouse control.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxcommon.h::dmxCommonMouGetMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Update the mouse control. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00138">dmxCommonMouSetCtrl()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9ce209ad340f84644115a165eadfa540"></a><!-- doxytag: member="dmxcommon.h::dmxCommonMouGetMap" ref="a9ce209ad340f84644115a165eadfa540" args="(DevicePtr pDev, unsigned char *map, int *nButtons)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouGetMap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonMouGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>map</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>map</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>nButtons</em></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>nButtons</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Obtain the mouse button mapping.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxcommon.h::dmxCommonMouOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Obtain the mouse button mapping. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00047">DMX_MAX_BUTTONS</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acfeaccbc1f2f5be028b3ee8c0f31da89"></a><!-- doxytag: member="dmxcommon.h::dmxCommonMouOff" ref="acfeaccbc1f2f5be028b3ee8c0f31da89" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonMouOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonMouOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxcommon.h::dmxCommonMouOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00098">DMX_POINTER_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00471">dmxCommonRemoveEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8ba0ee4f9f09bc9089d480d1f5467cd8"></a><!-- doxytag: member="dmxcommon.h::dmxCommonMouOn" ref="a8ba0ee4f9f09bc9089d480d1f5467cd8" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonMouOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCommonMouOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxcommon.h::dmxCommonOthGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00098">DMX_POINTER_EVENT_MASK</a>, <a class="el" href="dmxcommon_8c_source.html#l00465">dmxCommonAddEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a67f944a345e0ba88ac996056914d191c"></a><!-- doxytag: member="dmxcommon.h::dmxCommonOthGetInfo" ref="a67f944a345e0ba88ac996056914d191c" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonOthGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxCommonOthGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxcommon.h::dmxCommonOthOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="dmxinputinit_8c_source.html#l00830">dmxInputExtensionErrorHandler()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00102">_DMXLocalInitInfo::numAbsAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00111">_DMXLocalInitInfo::proximityClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a45f87ba7a0b02587dd2d1b4cdd3480c6"></a><!-- doxytag: member="dmxcommon.h::dmxCommonOthOff" ref="a45f87ba7a0b02587dd2d1b4cdd3480c6" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonOthOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonOthOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxcommon.h::dmxCommonOthOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4b8e72433e206d48e6fb471e933800ad"></a><!-- doxytag: member="dmxcommon.h::dmxCommonOthOn" ref="a4b8e72433e206d48e6fb471e933800ad" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCommonOthOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCommonOthOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxcommon.h::dmxCommonRestoreState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="dmxcommon_8c.html#ad9bd99dabcb14e9efe85df040d63c4b3">ADD</a>, <a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a>, <a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a>, <a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a>, <a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a>, <a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a>, <a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a>, <a class="el" href="dmxinputinit_8h_source.html#l00051">DMX_MAX_XINPUT_EVENT_TYPES</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>, and <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aca953b7500d93577441828156674c64e"></a><!-- doxytag: member="dmxcommon.h::dmxCommonRestoreState" ref="aca953b7500d93577441828156674c64e" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonRestoreState </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonRestoreState </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine restores all the information saved by <a class="el" href="dmxcommon_8h.html#a28">dmxCommonSaveState</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxcommon.h::dmxCommonSaveState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine restores all the information saved by <a class="el" href="dmxcommon_8h.html#a14295660e17d34955693cef6654d7bb6">dmxCommonSaveState</a>. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00301">dmxCommonKbdOff()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a14295660e17d34955693cef6654d7bb6"></a><!-- doxytag: member="dmxcommon.h::dmxCommonSaveState" ref="a14295660e17d34955693cef6654d7bb6" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCommonSaveState </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCommonSaveState </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine saves and resets some important state for the backend and console device drivers:<ul>
-<li>the modifier map is saved and set to 0 (so DMX controls the LEDs)</li><li>the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using</li></ul>
-<p>
-This routine and <a class="el" href="dmxcommon_8h.html#a29">dmxCommonRestoreState</a> are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxcommon.h::dmxFindPointerScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine saves and resets some important state for the backend and console device drivers:</p>
+<ul>
+<li>the modifier map is saved and set to 0 (so DMX controls the LEDs)</li>
+<li>the key click, bell, led, and repeat masks are saved and set to the values that DMX claims to be using</li>
+</ul>
+<p>This routine and <a class="el" href="dmxcommon_8h.html#aca953b7500d93577441828156674c64e">dmxCommonRestoreState</a> are used when the pointer enters and leaves the console window, or when the backend window is active or not active (for a full-screen window, this only happens at server startup and server shutdown). </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00117">dmxCommonKbdSetCtrl()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinit_8c_source.html#l00102">dmxUseXKB</a>, and <a class="el" href="dmxcommon_8h_source.html#l00069">GETPRIVFROMPRIVATE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxcommon_8c_source.html#l00156">dmxCommonKbdCtrl()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00288">dmxCommonKbdOn()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a907580b7be71d9be0b771d32210f3cad"></a><!-- doxytag: member="dmxcommon.h::dmxFindPointerScreen" ref="a907580b7be71d9be0b771d32210f3cad" args="(int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxFindPointerScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">int dmxFindPointerScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Given the global coordinates <em>x</em> and <em>y</em>, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into #dmxScreenInfo and is between -1 and <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a> - 1, inclusive.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Given the global coordinates <em>x</em> and <em>y</em>, determine the screen with the lowest number on which those coordinates lie. If they are not on any screen, return -1. The number returned is an index into <em>dmxScreenInfo</em> and is between -1 and <em>dmxNumScreens</em> - 1, inclusive. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html
new file mode 100644
index 000000000..eb99e95dc
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxcommon_8h_source.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxcommon.h</h1><a href="dmxcommon_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef _DMXCOMMON_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCOMMON_H_</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00041"></a><a class="code" href="dmxcommon_8h.html#ac501f773a244037a88da37c0dc48ac66">00041</a> <span class="preprocessor">#define DMX_COMMON_OTHER                    \</span>
+<a name="l00042"></a>00042 <span class="preprocessor">    Display                 *display;       \</span>
+<a name="l00043"></a>00043 <span class="preprocessor">    Window                  window;         \</span>
+<a name="l00044"></a>00044 <span class="preprocessor">    DMXScreenInfo           *be;            \</span>
+<a name="l00045"></a>00045 <span class="preprocessor">    DMXLocalInputInfoPtr    dmxLocal;       \</span>
+<a name="l00046"></a>00046 <span class="preprocessor">    int                     initPointerX;   \</span>
+<a name="l00047"></a>00047 <span class="preprocessor">    int                     initPointerY;   \</span>
+<a name="l00048"></a>00048 <span class="preprocessor">    long                    eventMask;      \</span>
+<a name="l00049"></a>00049 <span class="preprocessor">    KeybdCtrl               kctrl;          \</span>
+<a name="l00050"></a>00050 <span class="preprocessor">    PtrCtrl                 mctrl;          \</span>
+<a name="l00051"></a>00051 <span class="preprocessor">    int                     kctrlset;       \</span>
+<a name="l00052"></a>00052 <span class="preprocessor">    int                     mctrlset;       \</span>
+<a name="l00053"></a>00053 <span class="preprocessor">    KeybdCtrl               savedKctrl;     \</span>
+<a name="l00054"></a>00054 <span class="preprocessor">    XModifierKeymap         *savedModMap;   \</span>
+<a name="l00055"></a>00055 <span class="preprocessor">    int                     stateSaved</span>
+<a name="l00056"></a>00056 <span class="preprocessor"></span>
+<a name="l00057"></a><a class="code" href="dmxcommon_8h.html#ac4c9fac008144d96c6bd6313b5e158d2">00057</a> <span class="preprocessor">#define DMX_COMMON_XKB                      \</span>
+<a name="l00058"></a>00058 <span class="preprocessor">    DMX_COMMON_OTHER;                       \</span>
+<a name="l00059"></a>00059 <span class="preprocessor">    XkbDescPtr              xkb;            \</span>
+<a name="l00060"></a>00060 <span class="preprocessor">    XkbIndicatorRec         savedIndicators</span>
+<a name="l00061"></a>00061 <span class="preprocessor"></span>
+<a name="l00062"></a><a class="code" href="dmxcommon_8h.html#a6f802c6dc60aba1cbf8c1246cb5a4be4">00062</a> <span class="preprocessor">#define DMX_COMMON_PRIVATE                  \</span>
+<a name="l00063"></a>00063 <span class="preprocessor">    DMX_COMMON_XKB;                         \</span>
+<a name="l00064"></a>00064 <span class="preprocessor">    XDevice                 *xi</span>
+<a name="l00065"></a>00065 <span class="preprocessor"></span>
+<a name="l00066"></a><a class="code" href="dmxcommon_8h.html#a215427f6c6c570d64e1039239484563f">00066</a> <span class="preprocessor">#define GETONLYPRIVFROMPRIVATE                                          \</span>
+<a name="l00067"></a>00067 <span class="preprocessor">    myPrivate            *priv     = private</span>
+<a name="l00068"></a>00068 <span class="preprocessor"></span>
+<a name="l00069"></a><a class="code" href="dmxcommon_8h.html#ae04675e973690cab79ef643f298cb375">00069</a> <span class="preprocessor">#define GETPRIVFROMPRIVATE                                              \</span>
+<a name="l00070"></a>00070 <span class="preprocessor">    GETONLYPRIVFROMPRIVATE;                                             \</span>
+<a name="l00071"></a>00071 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[priv-&gt;dmxLocal-&gt;inputIdx]</span>
+<a name="l00072"></a>00072 <span class="preprocessor"></span>
+<a name="l00073"></a><a class="code" href="dmxcommon_8h.html#ae60813d58a79b6dae5b98321fd7e1866">00073</a> <span class="preprocessor">#define GETDMXLOCALFROMPDEVICE                                          \</span>
+<a name="l00074"></a>00074 <span class="preprocessor">    DevicePtr            pDev      = &amp;pDevice-&gt;public;                  \</span>
+<a name="l00075"></a>00075 <span class="preprocessor">    DMXLocalInputInfoPtr dmxLocal  = pDev-&gt;devicePrivate</span>
+<a name="l00076"></a>00076 <span class="preprocessor"></span>
+<a name="l00077"></a><a class="code" href="dmxcommon_8h.html#a2f522c463d79a458d27ac9e1f6b2e30f">00077</a> <span class="preprocessor">#define GETDMXINPUTFROMPRIV                                             \</span>
+<a name="l00078"></a>00078 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[priv-&gt;dmxLocal-&gt;inputIdx]</span>
+<a name="l00079"></a>00079 <span class="preprocessor"></span>
+<a name="l00080"></a><a class="code" href="dmxcommon_8h.html#a7067dd8545db11300dc1ee7f461b346d">00080</a> <span class="preprocessor">#define GETDMXINPUTFROMPDEVICE                                          \</span>
+<a name="l00081"></a>00081 <span class="preprocessor">    GETDMXLOCALFROMPDEVICE;                                             \</span>
+<a name="l00082"></a>00082 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[dmxLocal-&gt;inputIdx]</span>
+<a name="l00083"></a>00083 <span class="preprocessor"></span>
+<a name="l00084"></a><a class="code" href="dmxcommon_8h.html#a22db91e32f104411c68049e16a93067b">00084</a> <span class="preprocessor">#define GETDMXLOCALFROMPDEV                                             \</span>
+<a name="l00085"></a>00085 <span class="preprocessor">    DMXLocalInputInfoPtr dmxLocal  = pDev-&gt;devicePrivate</span>
+<a name="l00086"></a>00086 <span class="preprocessor"></span>
+<a name="l00087"></a><a class="code" href="dmxcommon_8h.html#ad100a619cb405b9f315abf1019622dd7">00087</a> <span class="preprocessor">#define GETDMXINPUTFROMPDEV                                             \</span>
+<a name="l00088"></a>00088 <span class="preprocessor">    GETDMXLOCALFROMPDEV;                                                \</span>
+<a name="l00089"></a>00089 <span class="preprocessor">    DMXInputInfo         *dmxInput = &amp;dmxInputs[dmxLocal-&gt;inputIdx]</span>
+<a name="l00090"></a>00090 <span class="preprocessor"></span>
+<a name="l00091"></a><a class="code" href="dmxcommon_8h.html#a162b4980b050465ca21228eb41f207a2">00091</a> <span class="preprocessor">#define GETPRIVFROMPDEV                                                 \</span>
+<a name="l00092"></a>00092 <span class="preprocessor">    GETDMXLOCALFROMPDEV;                                                \</span>
+<a name="l00093"></a>00093 <span class="preprocessor">    myPrivate            *priv     = dmxLocal-&gt;private</span>
+<a name="l00094"></a>00094 <span class="preprocessor"></span>
+<a name="l00095"></a><a class="code" href="dmxcommon_8h.html#a8ed45b47d9c28c37195b3d10df2319a1">00095</a> <span class="preprocessor">#define DMX_KEYBOARD_EVENT_MASK                                         \</span>
+<a name="l00096"></a>00096 <span class="preprocessor">    (KeyPressMask | KeyReleaseMask | KeymapStateMask)</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a><a class="code" href="dmxcommon_8h.html#aab5b14e925716fa97237594ee0b07d01">00098</a> <span class="preprocessor">#define DMX_POINTER_EVENT_MASK                                          \</span>
+<a name="l00099"></a>00099 <span class="preprocessor">    (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>
+<a name="l00101"></a>00101 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a86b1c983a556770efdd1a19e8be44534">dmxCommonKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00102"></a>00102 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a83410e3987567bd35fd146b193a21ed9">dmxCommonKbdGetMap</a>(DevicePtr pDev,
+<a name="l00103"></a>00103                                   KeySymsPtr pKeySyms, CARD8 *pModMap);
+<a name="l00104"></a>00104 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a399f0ec4a6e5d0bcd3d07f24b2a6ac9e">dmxCommonKbdCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
+<a name="l00105"></a>00105 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#aa069076ebf89f8b89668cffafb731cfe">dmxCommonKbdBell</a>(DevicePtr pDev, <span class="keywordtype">int</span> percent,
+<a name="l00106"></a>00106                                 <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
+<a name="l00107"></a>00107 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a60cd36c3430ead2858986fe5f93165c1">dmxCommonKbdOn</a>(DevicePtr pDev);
+<a name="l00108"></a>00108 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a9ddcdd8a91205b9b0e23022f246190a0">dmxCommonKbdOff</a>(DevicePtr pDev);
+<a name="l00109"></a>00109 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a9ce209ad340f84644115a165eadfa540">dmxCommonMouGetMap</a>(DevicePtr pDev,
+<a name="l00110"></a>00110                                   <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> *<a class="code" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, <span class="keywordtype">int</span> *nButtons);
+<a name="l00111"></a>00111 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a11aa027975061ee6f3e684ee66f0f18c">dmxCommonMouCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
+<a name="l00112"></a>00112 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a8ba0ee4f9f09bc9089d480d1f5467cd8">dmxCommonMouOn</a>(DevicePtr pDev);
+<a name="l00113"></a>00113 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#acfeaccbc1f2f5be028b3ee8c0f31da89">dmxCommonMouOff</a>(DevicePtr pDev);
+<a name="l00114"></a>00114 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a907580b7be71d9be0b771d32210f3cad">dmxFindPointerScreen</a>(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00115"></a>00115 
+<a name="l00116"></a>00116 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxcommon_8c.html#a4b8e72433e206d48e6fb471e933800ad">dmxCommonOthOn</a>(DevicePtr pDev);
+<a name="l00117"></a>00117 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a45f87ba7a0b02587dd2d1b4cdd3480c6">dmxCommonOthOff</a>(DevicePtr pDev);
+<a name="l00118"></a>00118 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a67f944a345e0ba88ac996056914d191c">dmxCommonOthGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120                                 <span class="comment">/* helper functions */</span>
+<a name="l00121"></a>00121 <span class="keyword">extern</span> pointer <a class="code" href="dmxcommon_8c.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a>(DeviceIntPtr pDevice);
+<a name="l00122"></a>00122 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#a14295660e17d34955693cef6654d7bb6">dmxCommonSaveState</a>(pointer <span class="keyword">private</span>);
+<a name="l00123"></a>00123 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxcommon_8c.html#aca953b7500d93577441828156674c64e">dmxCommonRestoreState</a>(pointer <span class="keyword">private</span>);
+<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html
index fe1f991ea..c8100f532 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8c.html
@@ -6,54 +6,240 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcompat.c File Reference</h1><code>#include "<a class="el" href="dmxconfig_8h-source.html">dmxconfig.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcompat_8h-source.html">dmxcompat.h</a>"</code><br>
-<code>#include "parser.h"</code><br>
-<code>#include &lt;stdio.h&gt;</code><br>
-<code>#include &lt;stdlib.h&gt;</code><br>
-<code>#include &lt;string.h&gt;</code><br>
-<code>#include &lt;ctype.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcompat_8c.html#a4">dmxVDLRead</a> (const  char *filename)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcompat.c File Reference</h1><code>#include &quot;<a class="el" href="dmxconfig_8h_source.html">dmxconfig.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcompat_8h_source.html">dmxcompat.h</a>&quot;</code><br/>
+<code>#include &quot;parser.h&quot;</code><br/>
+<code>#include &lt;stdio.h&gt;</code><br/>
+<code>#include &lt;stdlib.h&gt;</code><br/>
+<code>#include &lt;string.h&gt;</code><br/>
+<code>#include &lt;ctype.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8c.html#a186cebe5d2ccba23be8ed5184ec0b27d">dmxVDLReadLine</a> (FILE *<a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a>, char *buf, int len)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8c.html#a2bfb19f15e4e2fab177d050423dfd478">dmxVDLCount</a> (const char *buf)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8c.html#a0f960866400da9b168f15d8e738bf864">dmxVDLVirtualEntry</a> (const char *buf, char *name, int *len, int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8c.html#a48a37477c3206396f646511a64e8b7c9">dmxVDLDisplayEntry</a> (const char *buf, char *name, int *len, int *x, int *y, int *xoff, int *yoff, int *xorig, int *yorig)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8c.html#a1ef0f6bb5be6a9851f12c38122662bef">dmxVDLRead</a> (const char *filename)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides some compatibility support for reading VDL files that are used by xmovie (<a href="http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml">http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml</a>).<p>
-This file is not used by the DMX server.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxcompat.c::dmxVDLRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxVDLRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>filename</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides some compatibility support for reading VDL files that are used by xmovie (<a href="http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml">http://www.llnl.gov/icc/sdd/img/xmovie/xmovie.shtml</a>).</p>
+<p>This file is not used by the DMX server. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a2bfb19f15e4e2fab177d050423dfd478"></a><!-- doxytag: member="dmxcompat.c::dmxVDLCount" ref="a2bfb19f15e4e2fab177d050423dfd478" args="(const char *buf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxVDLCount </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a48a37477c3206396f646511a64e8b7c9"></a><!-- doxytag: member="dmxcompat.c::dmxVDLDisplayEntry" ref="a48a37477c3206396f646511a64e8b7c9" args="(const char *buf, char *name, int *len, int *x, int *y, int *xoff, int *yoff, int *xorig, int *yorig)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxVDLDisplayEntry </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>len</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>xoff</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>yoff</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>xorig</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>yorig</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Read from the VDL format <em>filename</em> and return a newly allocated <em>DMXConfigEntryPtr</em>     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1ef0f6bb5be6a9851f12c38122662bef"></a><!-- doxytag: member="dmxcompat.c::dmxVDLRead" ref="a1ef0f6bb5be6a9851f12c38122662bef" args="(const char *filename)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxVDLRead </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Read from the VDL format <em>filename</em> and return a newly allocated <em>DMXConfigEntryPtr</em> </p>
+
+<p>References <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="dmxparse_8c_source.html#l00583">dmxConfigAddEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00508">dmxConfigAddSub()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00088">dmxConfigCopyString()</a>, <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00487">dmxConfigSubDisplay()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxcompat_8c_source.html#l00060">dmxVDLCount()</a>, <a class="el" href="dmxcompat_8c_source.html#l00087">dmxVDLDisplayEntry()</a>, <a class="el" href="dmxcompat_8c_source.html#l00054">dmxVDLReadLine()</a>, <a class="el" href="dmxcompat_8c_source.html#l00065">dmxVDLVirtualEntry()</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="vdltodmx_8c_source.html#l00039">main()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a186cebe5d2ccba23be8ed5184ec0b27d"></a><!-- doxytag: member="dmxcompat.c::dmxVDLReadLine" ref="a186cebe5d2ccba23be8ed5184ec0b27d" args="(FILE *str, char *buf, int len)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxVDLReadLine </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>str</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>len</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0f960866400da9b168f15d8e738bf864"></a><!-- doxytag: member="dmxcompat.c::dmxVDLVirtualEntry" ref="a0f960866400da9b168f15d8e738bf864" args="(const char *buf, char *name, int *len, int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxVDLVirtualEntry </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>len</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html
deleted file mode 100644
index 5199ae022..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxcompat_8h-source.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcompat.h</h1><a href="dmxcompat_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00041 <span class="preprocessor">#ifndef _DMXCOMPAT_H_</span>
-00042 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCOMPAT_H_</span>
-00043 <span class="preprocessor"></span>
-00044 <span class="keyword">extern</span> <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> <a class="code" href="dmxcompat_8c.html#a4">dmxVDLRead</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *filename);
-00045 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html
index ab3412ac7..4fc44d7fa 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8h.html
@@ -6,48 +6,58 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxcompat.h File Reference</h1>
-<p>
-<a href="dmxcompat_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcompat_8h.html#a0">dmxVDLRead</a> (const  char *filename)</td></tr>
-
+<p><a href="dmxcompat_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcompat_8h.html#a1ef0f6bb5be6a9851f12c38122662bef">dmxVDLRead</a> (const char *filename)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to VDL compatibility support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcompat_8c.html">dmxcompat.c</a></dd></dl>
-This file is not used by the DMX server.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxcompat.h::dmxVDLRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to VDL compatibility support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcompat_8c.html">dmxcompat.c</a></dd></dl>
+<p>This file is not used by the DMX server. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a1ef0f6bb5be6a9851f12c38122662bef"></a><!-- doxytag: member="dmxcompat.h::dmxVDLRead" ref="a1ef0f6bb5be6a9851f12c38122662bef" args="(const char *filename)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxVDLRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>filename</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxVDLRead </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Read from the VDL format <em>filename</em> and return a newly allocated <em>DMXConfigEntryPtr</em> </p>
 
-<p>
-Read from the VDL format <em>filename</em> and return a newly allocated <em>DMXConfigEntryPtr</em>     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="dmxparse_8c_source.html#l00583">dmxConfigAddEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00508">dmxConfigAddSub()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00088">dmxConfigCopyString()</a>, <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00487">dmxConfigSubDisplay()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxcompat_8c_source.html#l00060">dmxVDLCount()</a>, <a class="el" href="dmxcompat_8c_source.html#l00087">dmxVDLDisplayEntry()</a>, <a class="el" href="dmxcompat_8c_source.html#l00054">dmxVDLReadLine()</a>, <a class="el" href="dmxcompat_8c_source.html#l00065">dmxVDLVirtualEntry()</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="vdltodmx_8c_source.html#l00039">main()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html
new file mode 100644
index 000000000..16b073d47
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxcompat_8h_source.html
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxcompat.h</h1><a href="dmxcompat_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00040"></a>00040 <span class="preprocessor">#ifndef _DMXCOMPAT_H_</span>
+<a name="l00041"></a>00041 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCOMPAT_H_</span>
+<a name="l00042"></a>00042 <span class="preprocessor"></span>
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> <a class="code" href="dmxcompat_8c.html#a1ef0f6bb5be6a9851f12c38122662bef">dmxVDLRead</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *filename);
+<a name="l00044"></a>00044 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html
index a20ab1c26..1a404fc5f 100644
--- a/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8c.html
@@ -6,388 +6,849 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxconfig.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconfig_8h-source.html">dmxconfig.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxstat_8h-source.html">dmxstat.h</a>"</code><br>
-<code>#include "parser.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxconfig.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconfig_8h_source.html">dmxconfig.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxstat_8h_source.html">dmxstat.h</a>&quot;</code><br/>
+<code>#include &quot;parser.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#af12101f305634cb9d15269a4b7a13b34">GEN</a>(param, glob, def)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a3dfd693067cad9597343923410b0372e">DMXConfigList</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a1e7e0db8e8b8c4ea8068d57243bb94b9">DMXConfigListPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ab9c66f76ee551600df2b3fc9ce6f4d33">DMXConfigCmd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a5a96d2434004ba9bddaf2b62b5ca9f39">DMXConfigCmdPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a847a2de5c1c28c9d7055a2b89ed7dad7">yyparse</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ac372c2ded30d6c82cc7973f7891d2363">dmxConfigStoreDisplay</a> (const char *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#aa591f4e1846bc6e6d78c68d77879c900">dmxConfigStoreInput</a> (const char *input)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ac116ffa05f76ddb8f5920cf3a262e2e5">dmxConfigStoreXInput</a> (const char *input)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a6d2a898606f3b373c5a6ebd07d288e53">dmxConfigStoreFile</a> (const char *file)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a224cf25e04e43ce049574c10ce39b597">dmxConfigStoreConfig</a> (const char *config)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a26c4557203995a45cf09b1c810b4d07a">dmxConfigReadFile</a> (const char *filename, int debug)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a6a8c408992d310e3e18b6403bc7a7371">dmxConfigMatch</a> (const char *target, <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a5fa6729153f7f7e5d3037d451291fa64">dmxConfigAddDisplay</a> (const char *name, int scrnWidth, int scrnHeight, int scrnX, int scrnY, int scrnXSign, int scrnYSign, int rootWidth, int rootHeight, int rootX, int rootY, int rootXSign, int rootYSign)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a21dc2639218a59ae564d3eaeb4781a90">dmxConfigAddInput</a> (const char *name, int core)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ad46057dba8680aec8dd960f05a571cb1">dmxConfigCopyFromDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> d)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ad9a587a7bacd29a6e7b23caa5e482930">dmxConfigCopyFromWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> w)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a48c8a79b6592af11c76511bd6ab781dc">dmxConfigCopyFromOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> o)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#afc8b90e1cf4b70434515265c10970967">dmxConfigCopyFromParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#aa8143b3e3871932b1c7ebe5727909304">dmxConfigCopyData</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> v)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#ab1add76564bec8f2616b0a3dedc63184">dmxConfigFromCommandLine</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a441a0182ba8329783400aef0930adc85">dmxConfigFromConfigFile</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#aea3cce9591f89ab89cc581abc6521eee">dmxConfigConfigInputs</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a826f729e29c8737ac9bbb9416505cd74">dmxConfigConfigure</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a41ff0900fb1b1056b02014bf39bee02f">dmxConfigSetMaxScreens</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">FILE *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a46af646807e0797e72b6e8945e7ea88b">yyin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#aae9b4e8aa3f950c6e12e792d6940a852">dmxXkbRules</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a03f1affbcf5042cf537cffc8ce9d47f4">dmxXkbModel</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a70d750a10d2cda84bbb9e009c8cdbdda">dmxXkbLayout</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a9237687e93253996897e0e0d584222ed">dmxXkbVariant</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#aba9019237c80bcabbbbd9afffc723c22">dmxXkbOptions</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">dmxConfigEntry</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmd</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a9d2aa7477b1176f8ee206f47e03c29da">dmxConfigCmd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8c.html#a574577536ff981870613b67021f61930">dmxDisplaysFromCommandLine</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provides interface for reading DMX configuration files and for combining that information with command-line configuration parameters. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="af12101f305634cb9d15269a4b7a13b34"></a><!-- doxytag: member="dmxconfig.c::GEN" ref="af12101f305634cb9d15269a4b7a13b34" args="(param, glob, def)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GEN</td>
+          <td>(</td>
+          <td class="paramtype">param, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">glob, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">def&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordtype">void</span> dmxConfigSet##glob(<span class="keyword">const</span> <span class="keywordtype">char</span> *param) {                                 \
+     <span class="keywordflow">if</span> (dmx##glob) free((<span class="keywordtype">void</span> *)dmx##glob);                                  \
+     dmx##glob = strdup(param);                                               \
+ }                                                                            \
+ <span class="keywordtype">char</span> *dmxConfigGet##glob(<span class="keywordtype">void</span>) {                                             \
+     <span class="keywordflow">return</span> (<span class="keywordtype">char</span> *)(dmx##glob ? dmx##glob : def);                            \
+ }
+</pre></div><p>This macro is used to generate the following access methods:</p>
+<ul>
+<li>dmxConfig{Set,Get}rules</li>
+<li>dmxConfig{Set,Get}model</li>
+<li>dmxConfig{Set,Get}layout</li>
+<li>dmxConfig{Set,Get}variant</li>
+<li>dmxConfig{Set,Get}options These methods are used to read and write information about the keyboard. </li>
+</ul>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="ab9c66f76ee551600df2b3fc9ce6f4d33"></a><!-- doxytag: member="dmxconfig.c::DMXConfigCmd" ref="ab9c66f76ee551600df2b3fc9ce6f4d33" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>  <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmd</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This stucture stores the parsed configuration information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a5a96d2434004ba9bddaf2b62b5ca9f39"></a><!-- doxytag: member="dmxconfig.c::DMXConfigCmdPtr" ref="a5a96d2434004ba9bddaf2b62b5ca9f39" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a> * <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3dfd693067cad9597343923410b0372e"></a><!-- doxytag: member="dmxconfig.c::DMXConfigList" ref="a3dfd693067cad9597343923410b0372e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>  <a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores lists of configuration information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a1e7e0db8e8b8c4ea8068d57243bb94b9"></a><!-- doxytag: member="dmxconfig.c::DMXConfigListPtr" ref="a1e7e0db8e8b8c4ea8068d57243bb94b9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a> * <a class="el" href="structDMXConfigListStruct.html">DMXConfigListPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a5fa6729153f7f7e5d3037d451291fa64"></a><!-- doxytag: member="dmxconfig.c::dmxConfigAddDisplay" ref="a5fa6729153f7f7e5d3037d451291fa64" args="(const char *name, int scrnWidth, int scrnHeight, int scrnX, int scrnY, int scrnXSign, int scrnYSign, int rootWidth, int rootHeight, int rootX, int rootY, int rootXSign, int rootYSign)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxConfigAddDisplay </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnWidth</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnHeight</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnX</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnY</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnXSign</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnYSign</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootWidth</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootHeight</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootX</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootY</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootXSign</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>rootYSign</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a></td></tr>
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxstat_8c_source.html#l00116">dmxStatAlloc()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00130">_DMXScreenInfo::scrnXSign</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmx_8h_source.html#l00131">_DMXScreenInfo::scrnYSign</a>, and <a class="el" href="dmx_8h_source.html#l00182">_DMXScreenInfo::stat</a>.</p>
 
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a0">GEN</a>(param, glob, def)</td></tr>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>.</p>
 
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a7">DMXConfigList</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a21dc2639218a59ae564d3eaeb4781a90"></a><!-- doxytag: member="dmxconfig.c::dmxConfigAddInput" ref="a21dc2639218a59ae564d3eaeb4781a90" args="(const char *name, int core)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* dmxConfigAddInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>core</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a8">DMXConfigListPtr</a></td></tr>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a9">DMXConfigCmd</a></td></tr>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a10">DMXConfigCmdPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="aea3cce9591f89ab89cc581abc6521eee"></a><!-- doxytag: member="dmxconfig.c::dmxConfigConfigInputs" ref="aea3cce9591f89ab89cc581abc6521eee" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigConfigInputs </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a15">dmxConfigStoreDisplay</a> (const  char *display)</td></tr>
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxconfig_8c_source.html#l00072">DMXConfigCmdStruct::inputs</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>, and <a class="el" href="dmxconfig_8c_source.html#l00073">DMXConfigCmdStruct::xinputs</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a16">dmxConfigStoreInput</a> (const  char *input)</td></tr>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a17">dmxConfigStoreXInput</a> (const  char *input)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a826f729e29c8737ac9bbb9416505cd74"></a><!-- doxytag: member="dmxconfig.c::dmxConfigConfigure" ref="a826f729e29c8737ac9bbb9416505cd74" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigConfigure </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a18">dmxConfigStoreFile</a> (const  char *file)</td></tr>
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxconfig_8c_source.html#l00071">DMXConfigCmdStruct::displays</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a19">dmxConfigStoreConfig</a> (const  char *config)</td></tr>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a32">dmxConfigConfigure</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa8143b3e3871932b1c7ebe5727909304"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCopyData" ref="aa8143b3e3871932b1c7ebe5727909304" args="(DMXConfigVirtualPtr v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigCopyData </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>v</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8c.html#a33">dmxConfigSetMaxScreens</a> (void)</td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00187">_DMXConfigVirtual::dim</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00300">dmxConfigCopyFromOption()</a>, <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxcb_8c_source.html#l00060">dmxSetWidthHeight()</a>, <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00189">_DMXConfigVirtual::subentry</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, and <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provides interface for reading DMX configuration files and for combining that information with command-line configuration parameters.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxconfig.c::GEN" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define GEN</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">param,         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>glob,         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>def&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad46057dba8680aec8dd960f05a571cb1"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCopyFromDisplay" ref="ad46057dba8680aec8dd960f05a571cb1" args="(DMXConfigDisplayPtr d)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigCopyFromDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>d</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Value:</b><div class="fragment"><pre><span class="keywordtype">void</span> dmxConfigSet##glob(<span class="keyword">const</span> <span class="keywordtype">char</span> *param) {                                 \
-     <span class="keywordflow">if</span> (dmx##glob) free((<span class="keywordtype">void</span> *)dmx##glob);                                  \
-     dmx##glob = strdup(param);                                               \
- }                                                                            \
- <span class="keywordtype">char</span> *dmxConfigGet##glob(<span class="keywordtype">void</span>) {                                             \
-     <span class="keywordflow">return</span> (<span class="keywordtype">char</span> *)(dmx##glob ? dmx##glob : def);                            \
- }
-</pre></div>This macro is used to generate the following access methods:<ul>
-<li>dmxConfig{Set,Get}rules</li><li>dmxConfig{Set,Get}model</li><li>dmxConfig{Set,Get}layout</li><li>dmxConfig{Set,Get}variant</li><li>dmxConfig{Set,Get}options These methods are used to read and write information about the keyboard. </li></ul>
-    </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a9" doxytag="dmxconfig.c::DMXConfigCmd" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxparse_8h_source.html#l00108">_DMXConfigDisplay::name</a>, <a class="el" href="dmx_8h_source.html#l00076">PosAbsolute</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootX</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootXOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootY</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootYOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnX</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnY</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnYSign</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, and <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a48c8a79b6592af11c76511bd6ab781dc"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCopyFromOption" ref="a48c8a79b6592af11c76511bd6ab781dc" args="(DMXConfigOptionPtr o)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a>  <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmd</a>
+          <td class="memname">static void dmxConfigCopyFromOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>o</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This stucture stores the parsed configuration information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxconfig.c::DMXConfigCmdPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmxparse_8h_source.html#l00150">_DMXConfigOption::option</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afc8b90e1cf4b70434515265c10970967"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCopyFromParam" ref="afc8b90e1cf4b70434515265c10970967" args="(DMXConfigParamPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdStruct</a> * <a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmdPtr</a>
+          <td class="memname">static void dmxConfigCopyFromParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This stucture stores the parsed configuration information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxconfig.c::DMXConfigList" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00380">dmxConfigLookupParam()</a>, <a class="el" href="dmxconfig_8h.html#ad072d4dab0b5b0623c9b6d1b3b57e23a">dmxConfigSetXkbLayout()</a>, <a class="el" href="dmxconfig_8h.html#ab9b9a8c70f9fd1b051187c47427f4999">dmxConfigSetXkbModel()</a>, <a class="el" href="dmxconfig_8h.html#aef54e09cba9b65acbdcb6568de54b2b6">dmxConfigSetXkbOptions()</a>, <a class="el" href="dmxconfig_8h.html#ae3270803aaa7990900d8c123f2181485">dmxConfigSetXkbRules()</a>, and <a class="el" href="dmxconfig_8h.html#af8922109f7462e6e246d8e06f1e21c5b">dmxConfigSetXkbVariant()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad9a587a7bacd29a6e7b23caa5e482930"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCopyFromWall" ref="ad9a587a7bacd29a6e7b23caa5e482930" args="(DMXConfigWallPtr w)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>  <a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a>
+          <td class="memname">static void dmxConfigCopyFromWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>w</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores lists of configuration information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxconfig.c::DMXConfigListPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::height</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmx_8h_source.html#l00076">PosAbsolute</a>, <a class="el" href="dmx_8h_source.html#l00080">PosBelow</a>, <a class="el" href="dmx_8h_source.html#l00077">PosRightOf</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00173">_DMXScreenInfo::whereRefScreen</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::width</a>, <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::xwall</a>, and <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::ywall</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab1add76564bec8f2616b0a3dedc63184"></a><!-- doxytag: member="dmxconfig.c::dmxConfigFromCommandLine" ref="ab1add76564bec8f2616b0a3dedc63184" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a> * <a class="el" href="structDMXConfigListStruct.html">DMXConfigListPtr</a>
+          <td class="memname">static void dmxConfigFromCommandLine </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores lists of configuration information.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a32" doxytag="dmxconfig.c::dmxConfigConfigure" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00071">DMXConfigCmdStruct::displays</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>, <a class="el" href="dmx_8h_source.html#l00076">PosAbsolute</a>, <a class="el" href="dmx_8h_source.html#l00080">PosBelow</a>, <a class="el" href="dmx_8h_source.html#l00077">PosRightOf</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00173">_DMXScreenInfo::whereRefScreen</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, and <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a441a0182ba8329783400aef0930adc85"></a><!-- doxytag: member="dmxconfig.c::dmxConfigFromConfigFile" ref="a441a0182ba8329783400aef0930adc85" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigConfigure </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxConfigFromConfigFile </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxconfig_8c_source.html#l00163">dmxConfigMatch()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>, <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a8c408992d310e3e18b6403bc7a7371"></a><!-- doxytag: member="dmxconfig.c::dmxConfigMatch" ref="a6a8c408992d310e3e18b6403bc7a7371" args="(const char *target, DMXConfigEntryPtr entry)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static const char* dmxConfigMatch </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>target</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>entry</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="dmxconfig.c::dmxConfigSetMaxScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxparse_8h_source.html#l00181">_DMXConfigVirtual::name</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a26c4557203995a45cf09b1c810b4d07a"></a><!-- doxytag: member="dmxconfig.c::dmxConfigReadFile" ref="a26c4557203995a45cf09b1c810b4d07a" args="(const char *filename, int debug)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxConfigReadFile </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigSetMaxScreens </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>debug</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00055">str</a>, <a class="el" href="dmxparse_8h.html#ab138aa8e11f58bcdcc7134adf240ea8c">yydebug</a>, <a class="el" href="dmxconfig_8c.html#a46af646807e0797e72b6e8945e7ea88b">yyin</a>, and <a class="el" href="dmxconfig_8c.html#a847a2de5c1c28c9d7055a2b89ed7dad7">yyparse()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a41ff0900fb1b1056b02014bf39bee02f"></a><!-- doxytag: member="dmxconfig.c::dmxConfigSetMaxScreens" ref="a41ff0900fb1b1056b02014bf39bee02f" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigSetMaxScreens </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxconfig.c::dmxConfigStoreConfig" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00079">dmxDisplaysFromCommandLine</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a224cf25e04e43ce049574c10ce39b597"></a><!-- doxytag: member="dmxconfig.c::dmxConfigStoreConfig" ref="a224cf25e04e43ce049574c10ce39b597" args="(const char *config)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreConfig </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>config</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigStoreConfig </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>config</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>config</em> should be used as the configuration for current instantiation of the DMX server. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, and <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ac372c2ded30d6c82cc7973f7891d2363"></a><!-- doxytag: member="dmxconfig.c::dmxConfigStoreDisplay" ref="ac372c2ded30d6c82cc7973f7891d2363" args="(const char *display)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreDisplay </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>display</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>config</em> should be used as the configuration for current instantiation of the DMX server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxconfig.c::dmxConfigStoreDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Make a note that <em>display</em> is the name of an X11 display that should be initialized as a backend (output) display. Called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a>. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00071">DMXConfigCmdStruct::displays</a>, <a class="el" href="dmxconfig_8c_source.html#l00079">dmxDisplaysFromCommandLine</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, and <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6d2a898606f3b373c5a6ebd07d288e53"></a><!-- doxytag: member="dmxconfig.c::dmxConfigStoreFile" ref="a6d2a898606f3b373c5a6ebd07d288e53" args="(const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>display</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigStoreFile </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>file</em> is the configuration file. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa591f4e1846bc6e6d78c68d77879c900"></a><!-- doxytag: member="dmxconfig.c::dmxConfigStoreInput" ref="aa591f4e1846bc6e6d78c68d77879c900" args="(const char *input)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>input</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>display</em> is the name of an X11 display that should be initialized as a backend (output) display. Called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxconfig.c::dmxConfigStoreFile" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Make a note that <em>input</em> is the name of an X11 display that should be used for input (either a backend or a console input device). </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00072">DMXConfigCmdStruct::inputs</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, and <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac116ffa05f76ddb8f5920cf3a262e2e5"></a><!-- doxytag: member="dmxconfig.c::dmxConfigStoreXInput" ref="ac116ffa05f76ddb8f5920cf3a262e2e5" args="(const char *input)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreFile </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigStoreXInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>input</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>input</em> is the name of an X11 display that should be used for input from XInput extension devices. </p>
 
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>, and <a class="el" href="dmxconfig_8c_source.html#l00073">DMXConfigCmdStruct::xinputs</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a847a2de5c1c28c9d7055a2b89ed7dad7"></a><!-- doxytag: member="dmxconfig.c::yyparse" ref="a847a2de5c1c28c9d7055a2b89ed7dad7" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int yyparse </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>file</em> is the configuration file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxconfig.c::dmxConfigStoreInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, and <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a9d2aa7477b1176f8ee206f47e03c29da"></a><!-- doxytag: member="dmxconfig.c::dmxConfigCmd" ref="a9d2aa7477b1176f8ee206f47e03c29da" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>input</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="structDMXConfigCmdStruct.html">DMXConfigCmd</a> <a class="el" href="dmxconfig_8c.html#a9d2aa7477b1176f8ee206f47e03c29da">dmxConfigCmd</a><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>input</em> is the name of an X11 display that should be used for input (either a backend or a console input device).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxconfig.c::dmxConfigStoreXInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af1733e9f6f810a355a158f16f8bc7899"></a><!-- doxytag: member="dmxconfig.c::dmxConfigEntry" ref="af1733e9f6f810a355a158f16f8bc7899" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreXInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>input</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> <a class="el" href="xdmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">dmxConfigEntry</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a574577536ff981870613b67021f61930"></a><!-- doxytag: member="dmxconfig.c::dmxDisplaysFromCommandLine" ref="a574577536ff981870613b67021f61930" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxconfig_8c.html#a574577536ff981870613b67021f61930">dmxDisplaysFromCommandLine</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>input</em> is the name of an X11 display that should be used for input from XInput extension devices.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a70d750a10d2cda84bbb9e009c8cdbdda"></a><!-- doxytag: member="dmxconfig.c::dmxXkbLayout" ref="a70d750a10d2cda84bbb9e009c8cdbdda" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxconfig_8c.html#a70d750a10d2cda84bbb9e009c8cdbdda">dmxXkbLayout</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a03f1affbcf5042cf537cffc8ce9d47f4"></a><!-- doxytag: member="dmxconfig.c::dmxXkbModel" ref="a03f1affbcf5042cf537cffc8ce9d47f4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxconfig_8c.html#a03f1affbcf5042cf537cffc8ce9d47f4">dmxXkbModel</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aba9019237c80bcabbbbd9afffc723c22"></a><!-- doxytag: member="dmxconfig.c::dmxXkbOptions" ref="aba9019237c80bcabbbbd9afffc723c22" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxconfig_8c.html#aba9019237c80bcabbbbd9afffc723c22">dmxXkbOptions</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aae9b4e8aa3f950c6e12e792d6940a852"></a><!-- doxytag: member="dmxconfig.c::dmxXkbRules" ref="aae9b4e8aa3f950c6e12e792d6940a852" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxconfig_8c.html#aae9b4e8aa3f950c6e12e792d6940a852">dmxXkbRules</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a9237687e93253996897e0e0d584222ed"></a><!-- doxytag: member="dmxconfig.c::dmxXkbVariant" ref="a9237687e93253996897e0e0d584222ed" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxconfig_8c.html#a9237687e93253996897e0e0d584222ed">dmxXkbVariant</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a46af646807e0797e72b6e8945e7ea88b"></a><!-- doxytag: member="dmxconfig.c::yyin" ref="a46af646807e0797e72b6e8945e7ea88b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">FILE* <a class="el" href="xdmxconfig_8c.html#a46af646807e0797e72b6e8945e7ea88b">yyin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html
deleted file mode 100644
index eeaae6481..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxconfig_8h-source.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxconfig.h</h1><a href="dmxconfig_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXCONFIG_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCONFIG_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define DMX_DEFAULT_XKB_RULES  "xfree86"</span>
-00041 <span class="preprocessor"></span><span class="preprocessor">#define DMX_DEFAULT_XKB_MODEL  "pc101"</span>
-00042 <span class="preprocessor"></span><span class="preprocessor">#define DMX_DEFAULT_XKB_LAYOUT "us"</span>
-00043 <span class="preprocessor"></span><span class="preprocessor">#define DMX_DEFAULT_XKB_VARIANT NULL</span>
-00044 <span class="preprocessor"></span><span class="preprocessor">#define DMX_DEFAULT_XKB_OPTIONS NULL</span>
-00045 <span class="preprocessor"></span>
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a15">dmxConfigStoreDisplay</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *display);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a16">dmxConfigStoreInput</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *input); <span class="comment">/* Core devices */</span>
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a17">dmxConfigStoreXInput</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *input); <span class="comment">/* Non-core devices */</span>
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a18">dmxConfigStoreFile</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *file);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a19">dmxConfigStoreConfig</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *config);
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a32">dmxConfigConfigure</a>(<span class="keywordtype">void</span>);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a33">dmxConfigSetMaxScreens</a>(<span class="keywordtype">void</span>);
-00053 
-00054 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxConfigSetXkbRules(<span class="keyword">const</span> <span class="keywordtype">char</span> *rules);
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxConfigSetXkbModel(<span class="keyword">const</span> <span class="keywordtype">char</span> *model);
-00056 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxConfigSetXkbLayout(<span class="keyword">const</span> <span class="keywordtype">char</span> *layout);
-00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxConfigSetXkbVariant(<span class="keyword">const</span> <span class="keywordtype">char</span> *variant);
-00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxConfigSetXkbOptions(<span class="keyword">const</span> <span class="keywordtype">char</span> *options);
-00059 
-00060 <span class="keyword">extern</span> <span class="keywordtype">char</span> *dmxConfigGetXkbRules(<span class="keywordtype">void</span>);
-00061 <span class="keyword">extern</span> <span class="keywordtype">char</span> *dmxConfigGetXkbModel(<span class="keywordtype">void</span>);
-00062 <span class="keyword">extern</span> <span class="keywordtype">char</span> *dmxConfigGetXkbLayout(<span class="keywordtype">void</span>);
-00063 <span class="keyword">extern</span> <span class="keywordtype">char</span> *dmxConfigGetXkbVariant(<span class="keywordtype">void</span>);
-00064 <span class="keyword">extern</span> <span class="keywordtype">char</span> *dmxConfigGetXkbOptions(<span class="keywordtype">void</span>);
-00065 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html
index 76c2eb03d..72d5e1e57 100644
--- a/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8h.html
@@ -6,234 +6,412 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxconfig.h File Reference</h1>
-<p>
-<a href="dmxconfig_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a5">dmxConfigStoreDisplay</a> (const  char *display)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxconfig.h File Reference</h1><code>#include &lt;xkb-config.h&gt;</code><br/>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a6">dmxConfigStoreInput</a> (const  char *input)</td></tr>
+<p><a href="dmxconfig_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ac372c2ded30d6c82cc7973f7891d2363">dmxConfigStoreDisplay</a> (const char *<a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#aa591f4e1846bc6e6d78c68d77879c900">dmxConfigStoreInput</a> (const char *input)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ac116ffa05f76ddb8f5920cf3a262e2e5">dmxConfigStoreXInput</a> (const char *input)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a6d2a898606f3b373c5a6ebd07d288e53">dmxConfigStoreFile</a> (const char *file)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a224cf25e04e43ce049574c10ce39b597">dmxConfigStoreConfig</a> (const char *config)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a826f729e29c8737ac9bbb9416505cd74">dmxConfigConfigure</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a41ff0900fb1b1056b02014bf39bee02f">dmxConfigSetMaxScreens</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ae3270803aaa7990900d8c123f2181485">dmxConfigSetXkbRules</a> (const char *rules)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ab9b9a8c70f9fd1b051187c47427f4999">dmxConfigSetXkbModel</a> (const char *model)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ad072d4dab0b5b0623c9b6d1b3b57e23a">dmxConfigSetXkbLayout</a> (const char *layout)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#af8922109f7462e6e246d8e06f1e21c5b">dmxConfigSetXkbVariant</a> (const char *variant)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#aef54e09cba9b65acbdcb6568de54b2b6">dmxConfigSetXkbOptions</a> (const char *options)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a144614ca8f250e559b030eef79189aac">dmxConfigGetXkbRules</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a9789c9f2428105bd9e896ddd25ea9a76">dmxConfigGetXkbModel</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a5d7b9c934bac97af375cfc1425e4d71c">dmxConfigGetXkbLayout</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#a3206dcb48297854a1d47e8aaa88d647e">dmxConfigGetXkbVariant</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconfig_8h.html#ae5986f5f5ba901313f950db2b4d8b340">dmxConfigGetXkbOptions</a> (void)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for DMX configuration file support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a826f729e29c8737ac9bbb9416505cd74"></a><!-- doxytag: member="dmxconfig.h::dmxConfigConfigure" ref="a826f729e29c8737ac9bbb9416505cd74" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigConfigure </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxconfig_8c_source.html#l00071">DMXConfigCmdStruct::displays</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a7">dmxConfigStoreXInput</a> (const  char *input)</td></tr>
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a8">dmxConfigStoreFile</a> (const  char *file)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a5d7b9c934bac97af375cfc1425e4d71c"></a><!-- doxytag: member="dmxconfig.h::dmxConfigGetXkbLayout" ref="a5d7b9c934bac97af375cfc1425e4d71c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* dmxConfigGetXkbLayout </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a9">dmxConfigStoreConfig</a> (const  char *config)</td></tr>
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a10">dmxConfigConfigure</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a9789c9f2428105bd9e896ddd25ea9a76"></a><!-- doxytag: member="dmxconfig.h::dmxConfigGetXkbModel" ref="a9789c9f2428105bd9e896ddd25ea9a76" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* dmxConfigGetXkbModel </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconfig_8h.html#a11">dmxConfigSetMaxScreens</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for DMX configuration file support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a10" doxytag="dmxconfig.h::dmxConfigConfigure" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigConfigure </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set up the appropriate global variables so that the DMX server will be initialized using the configuration specified in the config file and on the command line.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxconfig.h::dmxConfigSetMaxScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ae5986f5f5ba901313f950db2b4d8b340"></a><!-- doxytag: member="dmxconfig.h::dmxConfigGetXkbOptions" ref="ae5986f5f5ba901313f950db2b4d8b340" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigSetMaxScreens </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">char* dmxConfigGetXkbOptions </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a144614ca8f250e559b030eef79189aac"></a><!-- doxytag: member="dmxconfig.h::dmxConfigGetXkbRules" ref="a144614ca8f250e559b030eef79189aac" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* dmxConfigGetXkbRules </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxconfig.h::dmxConfigStoreConfig" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3206dcb48297854a1d47e8aaa88d647e"></a><!-- doxytag: member="dmxconfig.h::dmxConfigGetXkbVariant" ref="a3206dcb48297854a1d47e8aaa88d647e" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreConfig </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>config</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">char* dmxConfigGetXkbVariant </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a41ff0900fb1b1056b02014bf39bee02f"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetMaxScreens" ref="a41ff0900fb1b1056b02014bf39bee02f" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigSetMaxScreens </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>config</em> should be used as the configuration for current instantiation of the DMX server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxconfig.h::dmxConfigStoreDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This function determines the number of displays we WILL have and sets MAXSCREENS to that value. This is difficult since the number depends on the command line (which is easy to count) or on the config file, which has to be parsed. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00079">dmxDisplaysFromCommandLine</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad072d4dab0b5b0623c9b6d1b3b57e23a"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetXkbLayout" ref="ad072d4dab0b5b0623c9b6d1b3b57e23a" args="(const char *layout)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>display</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigSetXkbLayout </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>layout</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab9b9a8c70f9fd1b051187c47427f4999"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetXkbModel" ref="ab9b9a8c70f9fd1b051187c47427f4999" args="(const char *model)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigSetXkbModel </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>model</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>display</em> is the name of an X11 display that should be initialized as a backend (output) display. Called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxconfig.h::dmxConfigStoreFile" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aef54e09cba9b65acbdcb6568de54b2b6"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetXkbOptions" ref="aef54e09cba9b65acbdcb6568de54b2b6" args="(const char *options)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreFile </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigSetXkbOptions </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>options</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ae3270803aaa7990900d8c123f2181485"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetXkbRules" ref="ae3270803aaa7990900d8c123f2181485" args="(const char *rules)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigSetXkbRules </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>rules</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>file</em> is the configuration file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxconfig.h::dmxConfigStoreInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af8922109f7462e6e246d8e06f1e21c5b"></a><!-- doxytag: member="dmxconfig.h::dmxConfigSetXkbVariant" ref="af8922109f7462e6e246d8e06f1e21c5b" args="(const char *variant)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>input</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigSetXkbVariant </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>variant</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a224cf25e04e43ce049574c10ce39b597"></a><!-- doxytag: member="dmxconfig.h::dmxConfigStoreConfig" ref="a224cf25e04e43ce049574c10ce39b597" args="(const char *config)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreConfig </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>config</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>input</em> is the name of an X11 display that should be used for input (either a backend or a console input device).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxconfig.h::dmxConfigStoreXInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Make a note that <em>config</em> should be used as the configuration for current instantiation of the DMX server. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00070">DMXConfigCmdStruct::config</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, and <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac372c2ded30d6c82cc7973f7891d2363"></a><!-- doxytag: member="dmxconfig.h::dmxConfigStoreDisplay" ref="ac372c2ded30d6c82cc7973f7891d2363" args="(const char *display)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigStoreXInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>input</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConfigStoreDisplay </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>display</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>display</em> is the name of an X11 display that should be initialized as a backend (output) display. Called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a>. </p>
+
+<p>References <a class="el" href="dmxconfig_8c_source.html#l00071">DMXConfigCmdStruct::displays</a>, <a class="el" href="dmxconfig_8c_source.html#l00079">dmxDisplaysFromCommandLine</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, and <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a6d2a898606f3b373c5a6ebd07d288e53"></a><!-- doxytag: member="dmxconfig.h::dmxConfigStoreFile" ref="a6d2a898606f3b373c5a6ebd07d288e53" args="(const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreFile </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that <em>input</em> is the name of an X11 display that should be used for input from XInput extension devices.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>file</em> is the configuration file. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00069">DMXConfigCmdStruct::filename</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa591f4e1846bc6e6d78c68d77879c900"></a><!-- doxytag: member="dmxconfig.h::dmxConfigStoreInput" ref="aa591f4e1846bc6e6d78c68d77879c900" args="(const char *input)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>input</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>input</em> is the name of an X11 display that should be used for input (either a backend or a console input device). </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00072">DMXConfigCmdStruct::inputs</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, and <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac116ffa05f76ddb8f5920cf3a262e2e5"></a><!-- doxytag: member="dmxconfig.h::dmxConfigStoreXInput" ref="ac116ffa05f76ddb8f5920cf3a262e2e5" args="(const char *input)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigStoreXInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>input</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that <em>input</em> is the name of an X11 display that should be used for input from XInput extension devices. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconfig_8c_source.html#l00063">DMXConfigListStruct::name</a>, <a class="el" href="dmxconfig_8c_source.html#l00064">DMXConfigListStruct::next</a>, and <a class="el" href="dmxconfig_8c_source.html#l00073">DMXConfigCmdStruct::xinputs</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html
new file mode 100644
index 000000000..836bd94be
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxconfig_8h_source.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxconfig.h</h1><a href="dmxconfig_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXCONFIG_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCONFIG_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &lt;xkb-config.h&gt;</span>
+<a name="l00041"></a>00041 
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#ac372c2ded30d6c82cc7973f7891d2363">dmxConfigStoreDisplay</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *display);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#aa591f4e1846bc6e6d78c68d77879c900">dmxConfigStoreInput</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *input); <span class="comment">/* Core devices */</span>
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#ac116ffa05f76ddb8f5920cf3a262e2e5">dmxConfigStoreXInput</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *input); <span class="comment">/* Non-core devices */</span>
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a6d2a898606f3b373c5a6ebd07d288e53">dmxConfigStoreFile</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *file);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a224cf25e04e43ce049574c10ce39b597">dmxConfigStoreConfig</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *config);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a826f729e29c8737ac9bbb9416505cd74">dmxConfigConfigure</a>(<span class="keywordtype">void</span>);
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8c.html#a41ff0900fb1b1056b02014bf39bee02f">dmxConfigSetMaxScreens</a>(<span class="keywordtype">void</span>);
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8h.html#ae3270803aaa7990900d8c123f2181485">dmxConfigSetXkbRules</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *rules);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8h.html#ab9b9a8c70f9fd1b051187c47427f4999">dmxConfigSetXkbModel</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *model);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8h.html#ad072d4dab0b5b0623c9b6d1b3b57e23a">dmxConfigSetXkbLayout</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *layout);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8h.html#af8922109f7462e6e246d8e06f1e21c5b">dmxConfigSetXkbVariant</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *variant);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxconfig_8h.html#aef54e09cba9b65acbdcb6568de54b2b6">dmxConfigSetXkbOptions</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *options);
+<a name="l00055"></a>00055 
+<a name="l00056"></a>00056 <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="dmxconfig_8h.html#a144614ca8f250e559b030eef79189aac">dmxConfigGetXkbRules</a>(<span class="keywordtype">void</span>);
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="dmxconfig_8h.html#a9789c9f2428105bd9e896ddd25ea9a76">dmxConfigGetXkbModel</a>(<span class="keywordtype">void</span>);
+<a name="l00058"></a>00058 <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="dmxconfig_8h.html#a5d7b9c934bac97af375cfc1425e4d71c">dmxConfigGetXkbLayout</a>(<span class="keywordtype">void</span>);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="dmxconfig_8h.html#a3206dcb48297854a1d47e8aaa88d647e">dmxConfigGetXkbVariant</a>(<span class="keywordtype">void</span>);
+<a name="l00060"></a>00060 <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="dmxconfig_8h.html#ae5986f5f5ba901313f950db2b4d8b340">dmxConfigGetXkbOptions</a>(<span class="keywordtype">void</span>);
+<a name="l00061"></a>00061 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html
index 026847587..1ee466b09 100644
--- a/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8c.html
@@ -6,484 +6,1468 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxconsole.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxevents_8h-source.html">dmxevents.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconsole_8h-source.html">dmxconsole.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxscrinit_8h-source.html">dmxscrinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "input.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "windowstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxconsole.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxevents_8h_source.html">dmxevents.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconsole_8h_source.html">dmxconsole.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxscrinit_8h_source.html">dmxscrinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;input.h&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ae6c4c4e74cae671c41da9251ce9f1fc1">DMX_CONSOLE_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ae119931aa626ba4edf85defe5bebe2e7">DMX_WINDOW_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#af1044436ff6b782c51553425ab4886a9">CONSOLE_NUM</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a9966cd444cfac23d54a82230ea4d1abb">CONSOLE_DEN</a>&nbsp;&nbsp;&nbsp;4</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a8ac83cbd82d4f8ec05a6d83a0b8b447f">DMX_CONSOLE_NAME</a>&nbsp;&nbsp;&nbsp;&quot;DMX Console&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a3dcea52f8f4efb214af127167c51447f">DMX_RES_NAME</a>&nbsp;&nbsp;&nbsp;&quot;Xdmx&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a678a6a04bb4db0eb59755b010773ed08">DMX_RES_CLASS</a>&nbsp;&nbsp;&nbsp;&quot;XDmx&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a6fe0e39a803f195f4b98f0a771b7770a">CONSOLE_BG_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;gray75&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a28d20c43c4cde047ef8db075a3c92ead">CONSOLE_FG_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;black&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a8a86151c856b02dd2d832ab6420358a0">CONSOLE_SCREEN_BG_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;white&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a9b686d2ada1bab9f9a84a5985baab548">CONSOLE_SCREEN_FG_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;black&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a34059c2f2d177a788cef1f14697c4dc4">CONSOLE_SCREEN_DET_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;gray75&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a3493122f5e207552fb641de41c77df82">CONSOLE_SCREEN_CUR_COLOR</a>&nbsp;&nbsp;&nbsp;&quot;red&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#adf6865b0bc7ad370c94e3b8682262c13">DMXDBG0</a>(f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a302a2c9f84249eee79404eb601d085ab">DMXDBG1</a>(f, a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a1056d63499cee76ebe297c19637f2b79">DMXDBG2</a>(f, a, b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a6c6714b899194081b94edb722ca1c4bc">DMXDBG3</a>(f, a, b, c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a8ffd07ee80777c394a6ff32d1021347d">DMXDBG4</a>(f, a, b, c, d)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a753eef37715b6379d7d65e34a23d2e03">DMXDBG5</a>(f, a, b, c, d, e)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#af703e1a00a515e2507f7d2a354429a24">DMXDBG6</a>(f, a, b, c, d, e, g)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ab45c7f6cc47b2c786215ca0276d37d91">DMXDBG7</a>(f, a, b, c, d, e, g, h)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a775cc5d6380d9b514484678c74945a17">scalex</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int x)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a522fcecd527755f128ded24ed2449e67">scaley</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a8d0da535d8543184dd5c418d123806ec">unscalex</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int x)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#abbad6ed54f9edf3c3a92321eb2d6b424">unscaley</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a44f5875f978cc85c2190eacef51debac">dmxConsoleCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ab189a2fd44ccd2e6936b6bb1a27f1d5b">dmxConsoleDestroyPrivate</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a276766fb2f2449f248420e3177c36072">dmxConsoleDrawFineCursor</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, XRectangle *rect)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#aa058e61a540d8d4c740fee239c3bffe1">dmxConsoleDrawWindows</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ae190afd60f808521f7ecdc32d3a0326c">dmxConsoleDraw</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int updateCursor, int update)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a1197a51c042b3536fdb3132ac0feec54">dmxConsoleClearCursor</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int x, int y, XRectangle *rect)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#af9111e31dfe8cc6e5a531f66fd11b108">dmxConsoleUpdateFineCursor</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a180def32863f7bdddf3637181661c505">dmxConsoleUpdateInfo</a> (pointer private, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a2b430aacdd54f91c8d3f3600daeba404">dmxConsoleMoveAbsolute</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int x, int y, DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ab395efb910b074e2c4c727c0d63ba79d">dmxConsoleMoveRelative</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int x, int y, DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a596b1bd2ef51d5542393215ad810b227">dmxConsoleUpdatePosition</a> (pointer private, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a9c2ec3c63c36955d2458283dbd62b605">dmxConsoleCollectEvents</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a4d898acda21ed431ce0ee21303930153">dmxCloseConsole</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#aa38653f98dd899952cf2b0803ec67bf7">dmxCloseConsoleScreen</a> (int idx, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a54f9e8e06f4ead9df8ff103fffff278e">dmxConsoleCreateEmptyCursor</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a6d6dd821d75fae79c02d7407bbd3c4c5">dmxConsoleComputeWidthHeight</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int *width, int *height, double *xScale, double *yScale, int *consWidth, int *consHeight)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a35bfb53c46a7a14282d0110aa603dd4a">dmxConsoleReInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#afdd1f3231a4059e6c13d81cb5b472ab6">dmxConsoleInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a3d639d0e2a2c3c520f3544f15910ab01">dmxConsoleMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a710d0bdd587deeb35b430ba48ac209f1">dmxConsoleKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a613139541bddab357c413b76238e489b">dmxConsoleFunctions</a> (pointer private, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#a7d50c99c929a09ffebd10b1e3df8a99e">dmxDump</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#ae70541f26e4a4ff6360090393d622b41">dmxConsoleCapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8c.html#aadf02f44bcb19eb2d0f8507a397a73fb">dmxConsoleUncapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file implements the console input devices. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a6fe0e39a803f195f4b98f0a771b7770a"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_BG_COLOR" ref="a6fe0e39a803f195f4b98f0a771b7770a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_BG_COLOR&nbsp;&nbsp;&nbsp;&quot;gray75&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a25">dmxConsoleCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a26">dmxConsoleDestroyPrivate</a> (pointer private)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a9966cd444cfac23d54a82230ea4d1abb"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_DEN" ref="a9966cd444cfac23d54a82230ea4d1abb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_DEN&nbsp;&nbsp;&nbsp;4</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a32">dmxConsoleUpdateInfo</a> (pointer private, <a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a35">dmxConsoleUpdatePosition</a> (pointer private, int x, int y)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a28d20c43c4cde047ef8db075a3c92ead"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_FG_COLOR" ref="a28d20c43c4cde047ef8db075a3c92ead" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_FG_COLOR&nbsp;&nbsp;&nbsp;&quot;black&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a36">dmxConsoleCollectEvents</a> (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="af1044436ff6b782c51553425ab4886a9"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_NUM" ref="af1044436ff6b782c51553425ab4886a9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_NUM&nbsp;&nbsp;&nbsp;3</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a41">dmxConsoleReInit</a> (DevicePtr pDev)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a42">dmxConsoleInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8a86151c856b02dd2d832ab6420358a0"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_SCREEN_BG_COLOR" ref="a8a86151c856b02dd2d832ab6420358a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_SCREEN_BG_COLOR&nbsp;&nbsp;&nbsp;&quot;white&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a43">dmxConsoleMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a44">dmxConsoleKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a3493122f5e207552fb641de41c77df82"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_SCREEN_CUR_COLOR" ref="a3493122f5e207552fb641de41c77df82" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_SCREEN_CUR_COLOR&nbsp;&nbsp;&nbsp;&quot;red&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a45">dmxConsoleFunctions</a> (pointer private, DMXFunctionType function)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a47">dmxConsoleCapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a34059c2f2d177a788cef1f14697c4dc4"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_SCREEN_DET_COLOR" ref="a34059c2f2d177a788cef1f14697c4dc4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CONSOLE_SCREEN_DET_COLOR&nbsp;&nbsp;&nbsp;&quot;gray75&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8c.html#a48">dmxConsoleUncapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements the console input devices.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a47" doxytag="dmxconsole.c::dmxConsoleCapture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a9b686d2ada1bab9f9a84a5985baab548"></a><!-- doxytag: member="dmxconsole.c::CONSOLE_SCREEN_FG_COLOR" ref="a9b686d2ada1bab9f9a84a5985baab548" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleCapture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define CONSOLE_SCREEN_FG_COLOR&nbsp;&nbsp;&nbsp;&quot;black&quot;</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae6c4c4e74cae671c41da9251ce9f1fc1"></a><!-- doxytag: member="dmxconsole.c::DMX_CONSOLE_DEBUG" ref="ae6c4c4e74cae671c41da9251ce9f1fc1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_CONSOLE_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a36" doxytag="dmxconsole.c::dmxConsoleCollectEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8ac83cbd82d4f8ec05a6d83a0b8b447f"></a><!-- doxytag: member="dmxconsole.c::DMX_CONSOLE_NAME" ref="a8ac83cbd82d4f8ec05a6d83a0b8b447f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_CONSOLE_NAME&nbsp;&nbsp;&nbsp;&quot;DMX Console&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a678a6a04bb4db0eb59755b010773ed08"></a><!-- doxytag: member="dmxconsole.c::DMX_RES_CLASS" ref="a678a6a04bb4db0eb59755b010773ed08" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_RES_CLASS&nbsp;&nbsp;&nbsp;&quot;XDmx&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3dcea52f8f4efb214af127167c51447f"></a><!-- doxytag: member="dmxconsole.c::DMX_RES_NAME" ref="a3dcea52f8f4efb214af127167c51447f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_RES_NAME&nbsp;&nbsp;&nbsp;&quot;Xdmx&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae119931aa626ba4edf85defe5bebe2e7"></a><!-- doxytag: member="dmxconsole.c::DMX_WINDOW_DEBUG" ref="ae119931aa626ba4edf85defe5bebe2e7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adf6865b0bc7ad370c94e3b8682262c13"></a><!-- doxytag: member="dmxconsole.c::DMXDBG0" ref="adf6865b0bc7ad370c94e3b8682262c13" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a302a2c9f84249eee79404eb601d085ab"></a><!-- doxytag: member="dmxconsole.c::DMXDBG1" ref="a302a2c9f84249eee79404eb601d085ab" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleCollectEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define DMXDBG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1056d63499cee76ebe297c19637f2b79"></a><!-- doxytag: member="dmxconsole.c::DMXDBG2" ref="a1056d63499cee76ebe297c19637f2b79" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>dmxMotionProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>dmxEnqueueProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a6c6714b899194081b94edb722ca1c4bc"></a><!-- doxytag: member="dmxconsole.c::DMXDBG3" ref="a6c6714b899194081b94edb722ca1c4bc" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define DMXDBG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>dmxCheckSpecialProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">b, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8ffd07ee80777c394a6ff32d1021347d"></a><!-- doxytag: member="dmxconsole.c::DMXDBG4" ref="a8ffd07ee80777c394a6ff32d1021347d" args="(f, a, b, c, d)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG4</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">b, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a753eef37715b6379d7d65e34a23d2e03"></a><!-- doxytag: member="dmxconsole.c::DMXDBG5" ref="a753eef37715b6379d7d65e34a23d2e03" args="(f, a, b, c, d, e)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG5</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Collect all pending events from the console's display. Plase these events on the server event queue using the <em>motion</em> and <em>enqueue</em> routines. The <em>checkspecial</em> routine is used to check for special keys that need handling. <em>block</em> tells if signals should be blocked when updating the event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxconsole.c::dmxConsoleCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af703e1a00a515e2507f7d2a354429a24"></a><!-- doxytag: member="dmxconsole.c::DMXDBG6" ref="af703e1a00a515e2507f7d2a354429a24" args="(f, a, b, c, d, e, g)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer dmxConsoleCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define DMXDBG6</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="ab45c7f6cc47b2c786215ca0276d37d91"></a><!-- doxytag: member="dmxconsole.c::DMXDBG7" ref="ab45c7f6cc47b2c786215ca0276d37d91" args="(f, a, b, c, d, e, g, h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG7</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">h&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create the private area for <em>pDevice</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxconsole.c::dmxConsoleDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="dmxconsole.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a4d898acda21ed431ce0ee21303930153"></a><!-- doxytag: member="dmxconsole.c::dmxCloseConsole" ref="a4d898acda21ed431ce0ee21303930153" args="(myPrivate *priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxCloseConsole </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If <em>private</em> is non-NULL, free its associated memory.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a45" doxytag="dmxconsole.c::dmxConsoleFunctions" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00095">_DMXInputInfo::console</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcCur</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcDet</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcRev</a>, and <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa38653f98dd899952cf2b0803ec67bf7"></a><!-- doxytag: member="dmxconsole.c::dmxCloseConsoleScreen" ref="aa38653f98dd899952cf2b0803ec67bf7" args="(int idx, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxConsoleFunctions </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">static Bool dmxCloseConsoleScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXFunctionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>function</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00113">_myPrivate::CloseScreen</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00078">dmxScreenPrivateKey</a>, and <a class="el" href="dmxconsole_8c_source.html#l00114">_myPrivate::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae70541f26e4a4ff6360090393d622b41"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleCapture" ref="ae70541f26e4a4ff6360090393d622b41" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxConsoleCapture </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::captured</a>, <a class="el" href="dmxconsole_8c_source.html#l00100">_myPrivate::curX</a>, <a class="el" href="dmxconsole_8c_source.html#l00101">_myPrivate::curY</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::fine</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1197a51c042b3536fdb3132ac0feec54"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleClearCursor" ref="a1197a51c042b3536fdb3132ac0feec54" args="(myPrivate *priv, int x, int y, XRectangle *rect)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConsoleClearCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XRectangle *&nbsp;</td>
+          <td class="paramname"> <em>rect</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle special console-only keys.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a42" doxytag="dmxconsole.c::dmxConsoleInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcDet</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcRev</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9c2ec3c63c36955d2458283dbd62b605"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleCollectEvents" ref="a9c2ec3c63c36955d2458283dbd62b605" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleCollectEvents </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Collect all pending events from the console's display. Plase these events on the server event queue using the <em>motion</em> and <em>enqueue</em> routines. The <em>checkspecial</em> routine is used to check for special keys that need handling. <em>block</em> tells if signals should be blocked when updating the event queue. </p>
 
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>, <a class="el" href="dmxconsole_8c_source.html#l00402">dmxConsoleMoveRelative()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxconsole_8c_source.html#l00103">_myPrivate::height</a>, and <a class="el" href="dmxconsole_8c_source.html#l00102">_myPrivate::width</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6d6dd821d75fae79c02d7407bbd3c4c5"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleComputeWidthHeight" ref="a6d6dd821d75fae79c02d7407bbd3c4c5" args="(myPrivate *priv, int *width, int *height, double *xScale, double *yScale, int *consWidth, int *consHeight)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConsoleComputeWidthHeight </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>xScale</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>yScale</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>consWidth</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>consHeight</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialized the console device described by <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a44" doxytag="dmxconsole.c::dmxConsoleKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00062">CONSOLE_DEN</a>, <a class="el" href="dmxconsole_8c_source.html#l00061">CONSOLE_NUM</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00695">dmxConsoleReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a54f9e8e06f4ead9df8ff103fffff278e"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleCreateEmptyCursor" ref="a54f9e8e06f4ead9df8ff103fffff278e" args="(myPrivate *priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static Cursor dmxConsoleCreateEmptyCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00111">_myPrivate::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a44f5875f978cc85c2190eacef51debac"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleCreatePrivate" ref="a44f5875f978cc85c2190eacef51debac" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">pointer dmxConsoleCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create the private area for <em>pDevice</em>. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab189a2fd44ccd2e6936b6bb1a27f1d5b"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleDestroyPrivate" ref="ab189a2fd44ccd2e6936b6bb1a27f1d5b" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>If <em>private</em> is non-NULL, free its associated memory. </p>
+
+</div>
+</div>
+<a class="anchor" id="ae190afd60f808521f7ecdc32d3a0326c"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleDraw" ref="ae190afd60f808521f7ecdc32d3a0326c" args="(myPrivate *priv, int updateCursor, int update)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static void dmxConsoleDraw </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>updateCursor</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>update</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxconsole_8c_source.html#l00105">_myPrivate::consHeight</a>, <a class="el" href="dmxconsole_8c_source.html#l00104">_myPrivate::consWidth</a>, <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::fine</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcDet</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcRev</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxconsole_8c_source.html#l00103">_myPrivate::height</a>, <a class="el" href="dmxconsole_8c_source.html#l00111">_myPrivate::pixmap</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>, <a class="el" href="dmxconsole_8c_source.html#l00102">_myPrivate::width</a>, and <a class="el" href="dmxinput_8h_source.html#l00099">_DMXInputInfo::windows</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00695">dmxConsoleReInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00378">dmxConsoleUpdateInfo()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a276766fb2f2449f248420e3177c36072"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleDrawFineCursor" ref="a276766fb2f2449f248420e3177c36072" args="(myPrivate *priv, XRectangle *rect)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConsoleDrawFineCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XRectangle *&nbsp;</td>
+          <td class="paramname"> <em>rect</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for keyboard.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a43" doxytag="dmxconsole.c::dmxConsoleMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gcCur</a>, <a class="el" href="dmxconsole_8c_source.html#l00098">_myPrivate::globalX</a>, <a class="el" href="dmxconsole_8c_source.html#l00099">_myPrivate::globalY</a>, <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::grabbed</a>, <a class="el" href="dmxconsole_8c_source.html#l00111">_myPrivate::pixmap</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa058e61a540d8d4c740fee239c3bffe1"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleDrawWindows" ref="aa058e61a540d8d4c740fee239c3bffe1" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void dmxConsoleDrawWindows </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a613139541bddab357c413b76238e489b"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleFunctions" ref="a613139541bddab357c413b76238e489b" args="(pointer private, DMXFunctionType function)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int dmxConsoleFunctions </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>&nbsp;</td>
+          <td class="paramname"> <em>function</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Handle special console-only keys. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00058">DMX_FUNCTION_FINE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00056">DMX_FUNCTION_GRAB</a>, <a class="el" href="dmxinputinit_8h_source.html#l00057">DMX_FUNCTION_TERMINATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afdd1f3231a4059e6c13d81cb5b472ab6"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleInit" ref="afdd1f3231a4059e6c13d81cb5b472ab6" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxConsoleInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialized the console device described by <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00113">_myPrivate::CloseScreen</a>, <a class="el" href="dmxconsole_8c_source.html#l00066">CONSOLE_BG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00068">CONSOLE_SCREEN_BG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00071">CONSOLE_SCREEN_CUR_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00070">CONSOLE_SCREEN_DET_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00069">CONSOLE_SCREEN_FG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00063">DMX_CONSOLE_NAME</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxconsole_8c_source.html#l00065">DMX_RES_CLASS</a>, <a class="el" href="dmxconsole_8c_source.html#l00064">DMX_RES_NAME</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00623">dmxConsoleCreateEmptyCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00078">dmxScreenPrivateKey</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="usb-private_8h_source.html#l00103">_myPrivate::mask</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a710d0bdd587deeb35b430ba48ac209f1"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleKbdGetInfo" ref="a710d0bdd587deeb35b430ba48ac209f1" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for pointers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a41" doxytag="dmxconsole.c::dmxConsoleReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for keyboard. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00214">dmxCommonKbdGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3d639d0e2a2c3c520f3544f15910ab01"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleMouGetInfo" ref="a3d639d0e2a2c3c520f3544f15910ab01" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for pointers. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2b430aacdd54f91c8d3f3600daeba404"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleMoveAbsolute" ref="a2b430aacdd54f91c8d3f3600daeba404" args="(myPrivate *priv, int x, int y, DevicePtr pDev, dmxMotionProcPtr motion, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConsoleMoveAbsolute </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00100">_myPrivate::curX</a>, <a class="el" href="dmxconsole_8c_source.html#l00101">_myPrivate::curY</a>, <a class="el" href="dmxinputinit_8h_source.html#l00078">DMX_ABSOLUTE_CONFINED</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxconsole_8c_source.html#l00129">unscalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00134">unscaley()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab395efb910b074e2c4c727c0d63ba79d"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleMoveRelative" ref="ab395efb910b074e2c4c727c0d63ba79d" args="(myPrivate *priv, int x, int y, DevicePtr pDev, dmxMotionProcPtr motion, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConsoleMoveRelative </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialized the console device described by <em>pDev</em> (after a reconfig).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a48" doxytag="dmxconsole.c::dmxConsoleUncapture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxbackend_8c_source.html#l00069">_myPrivate::lastX</a>, and <a class="el" href="dmxbackend_8c_source.html#l00069">_myPrivate::lastY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a35bfb53c46a7a14282d0110aa603dd4a"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleReInit" ref="a35bfb53c46a7a14282d0110aa603dd4a" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUncapture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxConsoleReInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Re-initialized the console device described by <em>pDev</em> (after a reconfig). </p>
 
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aadf02f44bcb19eb2d0f8507a397a73fb"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleUncapture" ref="aadf02f44bcb19eb2d0f8507a397a73fb" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleUncapture </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Undo the capture that was done by <a class="el" href="dmxconsole_8h.html#a10">dmxConsoleCapture</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="dmxconsole.c::dmxConsoleUpdateInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Undo the capture that was done by <a class="el" href="dmxconsole_8h.html#ae70541f26e4a4ff6360090393d622b41">dmxConsoleCapture</a>. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::captured</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af9111e31dfe8cc6e5a531f66fd11b108"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleUpdateFineCursor" ref="af9111e31dfe8cc6e5a531f66fd11b108" args="(myPrivate *priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUpdateInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">static void dmxConsoleUpdateFineCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00105">_myPrivate::consHeight</a>, <a class="el" href="dmxconsole_8c_source.html#l00104">_myPrivate::consWidth</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxlog_8c_source.html#l00307">dmxEventName()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmxconsole_8c_source.html#l00098">_myPrivate::globalX</a>, <a class="el" href="dmxconsole_8c_source.html#l00099">_myPrivate::globalY</a>, <a class="el" href="dmxconsole_8c_source.html#l00103">_myPrivate::height</a>, <a class="el" href="dmxbackend_8c_source.html#l00069">_myPrivate::lastX</a>, <a class="el" href="dmxbackend_8c_source.html#l00069">_myPrivate::lastY</a>, <a class="el" href="dmxconsole_8c_source.html#l00111">_myPrivate::pixmap</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00102">_myPrivate::width</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a180def32863f7bdddf3637181661c505"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleUpdateInfo" ref="a180def32863f7bdddf3637181661c505" args="(pointer private, DMXUpdateType type, WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxConsoleUpdateInfo </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the <em>pWindow</em> that changed and the <em>type</em> of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a596b1bd2ef51d5542393215ad810b227"></a><!-- doxytag: member="dmxconsole.c::dmxConsoleUpdatePosition" ref="a596b1bd2ef51d5542393215ad810b227" args="(pointer private, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleUpdatePosition </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine gets called from <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a7d50c99c929a09ffebd10b1e3df8a99e"></a><!-- doxytag: member="dmxconsole.c::dmxDump" ref="a7d50c99c929a09ffebd10b1e3df8a99e" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDump </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the <em>pWindow</em> that changed and the <em>type</em> of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a35" doxytag="dmxconsole.c::dmxConsoleUpdatePosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxlog_8c_source.html#l00307">dmxEventName()</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a775cc5d6380d9b514484678c74945a17"></a><!-- doxytag: member="dmxconsole.c::scalex" ref="a775cc5d6380d9b514484678c74945a17" args="(myPrivate *priv, int x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUpdatePosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">static int scalex </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00106">_myPrivate::xScale</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a522fcecd527755f128ded24ed2449e67"></a><!-- doxytag: member="dmxconsole.c::scaley" ref="a522fcecd527755f128ded24ed2449e67" args="(myPrivate *priv, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int scaley </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00107">_myPrivate::yScale</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8d0da535d8543184dd5c418d123806ec"></a><!-- doxytag: member="dmxconsole.c::unscalex" ref="a8d0da535d8543184dd5c418d123806ec" args="(myPrivate *priv, int x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int unscalex </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00106">_myPrivate::xScale</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="abbad6ed54f9edf3c3a92321eb2d6b424"></a><!-- doxytag: member="dmxconsole.c::unscaley" ref="abbad6ed54f9edf3c3a92321eb2d6b424" args="(myPrivate *priv, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int unscaley </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine gets called from #dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00107">_myPrivate::yScale</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html
deleted file mode 100644
index b806b86fc..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxconsole_8h-source.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxconsole.h</h1><a href="dmxconsole_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXCONSOLE_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCONSOLE_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> pointer <a class="code" href="dmxconsole_8c.html#a25">dmxConsoleCreatePrivate</a>(DeviceIntPtr pDevice);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a26">dmxConsoleDestroyPrivate</a>(pointer <span class="keyword">private</span>);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a42">dmxConsoleInit</a>(DevicePtr pDev);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a41">dmxConsoleReInit</a>(DevicePtr pDev);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a43">dmxConsoleMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a44">dmxConsoleKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a36">dmxConsoleCollectEvents</a>(DevicePtr pDev,
-00048                                        dmxMotionProcPtr motion,
-00049                                        dmxEnqueueProcPtr enqueue,
-00050                                        dmxCheckSpecialProcPtr checkspecial,
-00051                                        DMXBlockType block);
-00052 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxconsole_8c.html#a45">dmxConsoleFunctions</a>(pointer <span class="keyword">private</span>, DMXFunctionType function);
-00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a35">dmxConsoleUpdatePosition</a>(pointer <span class="keyword">private</span>, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    dmxConsoleKbdSetCtrl(pointer <span class="keyword">private</span>, KeybdCtrl *ctrl);
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a47">dmxConsoleCapture</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00056 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a48">dmxConsoleUncapture</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00057 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a32">dmxConsoleUpdateInfo</a>(pointer <span class="keyword">private</span>,
-00058                                     DMXUpdateType, WindowPtr pWindow);
-00059 
-00060 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html
index 398f56a16..5baa40b29 100644
--- a/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8h.html
@@ -6,474 +6,413 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxconsole.h File Reference</h1>
-<p>
-<a href="dmxconsole_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a0">dmxConsoleCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a1">dmxConsoleDestroyPrivate</a> (pointer private)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a2">dmxConsoleInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a3">dmxConsoleReInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a4">dmxConsoleMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a5">dmxConsoleKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a6">dmxConsoleCollectEvents</a> (DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a7">dmxConsoleFunctions</a> (pointer private, DMXFunctionType function)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a8">dmxConsoleUpdatePosition</a> (pointer private, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a10">dmxConsoleCapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a11">dmxConsoleUncapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxconsole_8h.html#a12">dmxConsoleUpdateInfo</a> (pointer private, <a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>, WindowPtr pWindow)</td></tr>
-
+<p><a href="dmxconsole_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a44f5875f978cc85c2190eacef51debac">dmxConsoleCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#ab189a2fd44ccd2e6936b6bb1a27f1d5b">dmxConsoleDestroyPrivate</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#afdd1f3231a4059e6c13d81cb5b472ab6">dmxConsoleInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a35bfb53c46a7a14282d0110aa603dd4a">dmxConsoleReInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a3d639d0e2a2c3c520f3544f15910ab01">dmxConsoleMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a710d0bdd587deeb35b430ba48ac209f1">dmxConsoleKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a9c2ec3c63c36955d2458283dbd62b605">dmxConsoleCollectEvents</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a613139541bddab357c413b76238e489b">dmxConsoleFunctions</a> (pointer private, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a596b1bd2ef51d5542393215ad810b227">dmxConsoleUpdatePosition</a> (pointer private, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#a85026fe07bc1cf4f5b740249655c1648">dmxConsoleKbdSetCtrl</a> (pointer private, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#ae70541f26e4a4ff6360090393d622b41">dmxConsoleCapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#aadf02f44bcb19eb2d0f8507a397a73fb">dmxConsoleUncapture</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxconsole_8h.html#ac5fba2223efdab61863b6458a90c189a">dmxConsoleUpdateInfo</a> (pointer private, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr pWindow)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for console device support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxconsole_8c.html">dmxconsole.c</a> <p>
-<a class="el" href="dmxcommon_8c.html">dmxcommon.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a10" doxytag="dmxconsole.h::dmxConsoleCapture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleCapture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for console device support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxconsole_8c.html">dmxconsole.c</a> </dd>
+<dd>
+<a class="el" href="dmxcommon_8c.html">dmxcommon.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ae70541f26e4a4ff6360090393d622b41"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleCapture" ref="ae70541f26e4a4ff6360090393d622b41" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleCapture </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display. </p>
 
-<p>
-This routine is used to warp the pointer into the console window from anywhere on the screen. It is used when backend and console input are both being taken from the same X display.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxconsole.h::dmxConsoleCollectEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::captured</a>, <a class="el" href="dmxconsole_8c_source.html#l00100">_myPrivate::curX</a>, <a class="el" href="dmxconsole_8c_source.html#l00101">_myPrivate::curY</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::fine</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9c2ec3c63c36955d2458283dbd62b605"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleCollectEvents" ref="a9c2ec3c63c36955d2458283dbd62b605" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleCollectEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxConsoleCollectEvents </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxMotionProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxEnqueueProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>dmxCheckSpecialProcPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Collect all pending events from the console's display. Plase these events on the server event queue using the <em>motion</em> and <em>enqueue</em> routines. The <em>checkspecial</em> routine is used to check for special keys that need handling. <em>block</em> tells if signals should be blocked when updating the event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxconsole.h::dmxConsoleCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> pointer dmxConsoleCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+<div class="memdoc">
+<p>Collect all pending events from the console's display. Plase these events on the server event queue using the <em>motion</em> and <em>enqueue</em> routines. The <em>checkspecial</em> routine is used to check for special keys that need handling. <em>block</em> tells if signals should be blocked when updating the event queue. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>, <a class="el" href="dmxconsole_8c_source.html#l00402">dmxConsoleMoveRelative()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxcommon_8h_source.html#l00077">GETDMXINPUTFROMPRIV</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxconsole_8c_source.html#l00103">_myPrivate::height</a>, and <a class="el" href="dmxconsole_8c_source.html#l00102">_myPrivate::width</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a44f5875f978cc85c2190eacef51debac"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleCreatePrivate" ref="a44f5875f978cc85c2190eacef51debac" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer dmxConsoleCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create the private area for <em>pDevice</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxconsole.h::dmxConsoleDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>private</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+<div class="memdoc">
+<p>Create the private area for <em>pDevice</em>. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab189a2fd44ccd2e6936b6bb1a27f1d5b"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleDestroyPrivate" ref="ab189a2fd44ccd2e6936b6bb1a27f1d5b" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If <em>private</em> is non-NULL, free its associated memory.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxconsole.h::dmxConsoleFunctions" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>If <em>private</em> is non-NULL, free its associated memory. </p>
+
+</div>
+</div>
+<a class="anchor" id="a613139541bddab357c413b76238e489b"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleFunctions" ref="a613139541bddab357c413b76238e489b" args="(pointer private, DMXFunctionType function)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxConsoleFunctions </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">int dmxConsoleFunctions </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXFunctionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>function</em></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>&nbsp;</td>
+          <td class="paramname"> <em>function</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle special console-only keys.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxconsole.h::dmxConsoleInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+<div class="memdoc">
+<p>Handle special console-only keys. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00058">DMX_FUNCTION_FINE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00056">DMX_FUNCTION_GRAB</a>, <a class="el" href="dmxinputinit_8h_source.html#l00057">DMX_FUNCTION_TERMINATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afdd1f3231a4059e6c13d81cb5b472ab6"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleInit" ref="afdd1f3231a4059e6c13d81cb5b472ab6" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialized the console device described by <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxconsole.h::dmxConsoleKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialized the console device described by <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00113">_myPrivate::CloseScreen</a>, <a class="el" href="dmxconsole_8c_source.html#l00066">CONSOLE_BG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00068">CONSOLE_SCREEN_BG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00071">CONSOLE_SCREEN_CUR_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00070">CONSOLE_SCREEN_DET_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00069">CONSOLE_SCREEN_FG_COLOR</a>, <a class="el" href="dmxconsole_8c_source.html#l00063">DMX_CONSOLE_NAME</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxconsole_8c_source.html#l00065">DMX_RES_CLASS</a>, <a class="el" href="dmxconsole_8c_source.html#l00064">DMX_RES_NAME</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00623">dmxConsoleCreateEmptyCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="usb-private_8h_source.html#l00115">_myPrivate::dmxInput</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00078">dmxScreenPrivateKey</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="usb-private_8h_source.html#l00103">_myPrivate::mask</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a710d0bdd587deeb35b430ba48ac209f1"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleKbdGetInfo" ref="a710d0bdd587deeb35b430ba48ac209f1" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxConsoleKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for keyboard. </p>
+
+<p>References <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00214">dmxCommonKbdGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a85026fe07bc1cf4f5b740249655c1648"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleKbdSetCtrl" ref="a85026fe07bc1cf4f5b740249655c1648" args="(pointer private, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleKbdSetCtrl </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for keyboard.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxconsole.h::dmxConsoleMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3d639d0e2a2c3c520f3544f15910ab01"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleMouGetInfo" ref="a3d639d0e2a2c3c520f3544f15910ab01" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxConsoleMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for pointers. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>, <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a35bfb53c46a7a14282d0110aa603dd4a"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleReInit" ref="a35bfb53c46a7a14282d0110aa603dd4a" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxConsoleReInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill in the <em>info</em> structure for the specified <em>pDev</em>. Only used for pointers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxconsole.h::dmxConsoleReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+<div class="memdoc">
+<p>Re-initialized the console device described by <em>pDev</em> (after a reconfig). </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00091">GETPRIVFROMPDEV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aadf02f44bcb19eb2d0f8507a397a73fb"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleUncapture" ref="aadf02f44bcb19eb2d0f8507a397a73fb" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConsoleUncapture </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Undo the capture that was done by <a class="el" href="dmxconsole_8h.html#ae70541f26e4a4ff6360090393d622b41">dmxConsoleCapture</a>. </p>
 
-<p>
-Re-initialized the console device described by <em>pDev</em> (after a reconfig).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxconsole.h::dmxConsoleUncapture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUncapture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00109">_myPrivate::captured</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxcursor_8c_source.html#l00105">DMXDBG0</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>.</p>
 
-<p>
-Undo the capture that was done by <a class="el" href="dmxconsole_8h.html#a10">dmxConsoleCapture</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxconsole.h::dmxConsoleUpdateInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ac5fba2223efdab61863b6458a90c189a"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleUpdateInfo" ref="ac5fba2223efdab61863b6458a90c189a" args="(pointer private, DMXUpdateType, WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUpdateInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">void dmxConsoleUpdateInfo </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the <em>pWindow</em> that changed and the <em>type</em> of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxconsole.h::dmxConsoleUpdatePosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Whenever the window layout (size, position, stacking order) might be changed, this routine is called with the <em>pWindow</em> that changed and the <em>type</em> of change. This routine is called in a conservative fashion: the actual layout of the windows of the screen might not have had any human-visible changes. </p>
+
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a596b1bd2ef51d5542393215ad810b227"></a><!-- doxytag: member="dmxconsole.h::dmxConsoleUpdatePosition" ref="a596b1bd2ef51d5542393215ad810b227" args="(pointer private, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConsoleUpdatePosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>private</em>, </td>
+          <td class="memname">void dmxConsoleUpdatePosition </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>private</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine gets called from <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change. </p>
 
-<p>
-This routine gets called from #dmxCoreMotion for each motion. This allows the console's notion of the cursor postion to change when another input device actually caused the change.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxcommon_8h_source.html#l00066">GETONLYPRIVFROMPRIVATE</a>, <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html
new file mode 100644
index 000000000..1f3f4e911
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxconsole_8h_source.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxconsole.h</h1><a href="dmxconsole_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXCONSOLE_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXCONSOLE_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> pointer <a class="code" href="dmxconsole_8c.html#a44f5875f978cc85c2190eacef51debac">dmxConsoleCreatePrivate</a>(DeviceIntPtr <a class="code" href="struct__myPrivate.html#ae08ddb2f15fe104faf25f51f05c26033">pDevice</a>);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#ab189a2fd44ccd2e6936b6bb1a27f1d5b">dmxConsoleDestroyPrivate</a>(pointer <span class="keyword">private</span>);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#afdd1f3231a4059e6c13d81cb5b472ab6">dmxConsoleInit</a>(DevicePtr pDev);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a35bfb53c46a7a14282d0110aa603dd4a">dmxConsoleReInit</a>(DevicePtr pDev);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a3d639d0e2a2c3c520f3544f15910ab01">dmxConsoleMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a710d0bdd587deeb35b430ba48ac209f1">dmxConsoleKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a9c2ec3c63c36955d2458283dbd62b605">dmxConsoleCollectEvents</a>(DevicePtr pDev,
+<a name="l00047"></a>00047                                        <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00048"></a>00048                                        <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00049"></a>00049                                        <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00050"></a>00050                                        <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="dmxconsole_8c.html#a613139541bddab357c413b76238e489b">dmxConsoleFunctions</a>(pointer <span class="keyword">private</span>, <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> function);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a596b1bd2ef51d5542393215ad810b227">dmxConsoleUpdatePosition</a>(pointer <span class="keyword">private</span>, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8h.html#a85026fe07bc1cf4f5b740249655c1648">dmxConsoleKbdSetCtrl</a>(pointer <span class="keyword">private</span>, KeybdCtrl *ctrl);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#ae70541f26e4a4ff6360090393d622b41">dmxConsoleCapture</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *<a class="code" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">dmxInput</a>);
+<a name="l00055"></a>00055 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#aadf02f44bcb19eb2d0f8507a397a73fb">dmxConsoleUncapture</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *<a class="code" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">dmxInput</a>);
+<a name="l00056"></a>00056 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="dmxconsole_8c.html#a180def32863f7bdddf3637181661c505">dmxConsoleUpdateInfo</a>(pointer <span class="keyword">private</span>,
+<a name="l00057"></a>00057                                     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr pWindow);
+<a name="l00058"></a>00058 
+<a name="l00059"></a>00059 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html
index 744bc3547..f6abb7f83 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8c.html
@@ -6,457 +6,1444 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcursor.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "windowstr.h"</code><br>
-<code>#include "globals.h"</code><br>
-<code>#include "cursorstr.h"</code><br>
-<code>#include "dixevents.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a12">dmxCursorNoMulti</a> (void)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcursor.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<code>#include &quot;globals.h&quot;</code><br/>
+<code>#include &quot;cursorstr.h&quot;</code><br/>
+<code>#include &quot;dixevents.h&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a757d7359cf12591268a62c0974178079">DMX_CURSOR_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#adf6865b0bc7ad370c94e3b8682262c13">DMXDBG0</a>(f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a302a2c9f84249eee79404eb601d085ab">DMXDBG1</a>(f, a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a1056d63499cee76ebe297c19637f2b79">DMXDBG2</a>(f, a, b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a6c6714b899194081b94edb722ca1c4bc">DMXDBG3</a>(f, a, b, c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a8ffd07ee80777c394a6ff32d1021347d">DMXDBG4</a>(f, a, b, c, d)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a753eef37715b6379d7d65e34a23d2e03">DMXDBG5</a>(f, a, b, c, d, e)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#af703e1a00a515e2507f7d2a354429a24">DMXDBG6</a>(f, a, b, c, d, e, g)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ab45c7f6cc47b2c786215ca0276d37d91">DMXDBG7</a>(f, a, b, c, d, e, g, h)</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a709e3d4a4e44e17fed3de1fcb0d42b20">dmxCursorNoMulti</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a1c7f5d94ee32f85ec027c53b881fc697">dmxCursorOffScreen</a> (ScreenPtr *ppScreen, int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a2d0757fa7119492da7fe26901dab8571">dmxCrossScreen</a> (ScreenPtr pScreen, Bool entering)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#af80076061e55521b62a7cfd8e66bf3e6">dmxWarpCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#aaf8a9878f12b6653247fc27d960beccf">dmxSLCreate</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a565fbb8c3754a14c1aed13b741705b91">dmxSLFree</a> (int *list)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ab4dcb11cad339e72d843356841ffd203">dmxSLFindNext</a> (int *list)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a97efbe7e0a872da9de0be49da214c210">dmxTryComputeScreenOrigins</a> (int *screensLeft)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#aa5a4c58dbde29584153fbc43a1ac6e26">dmxComputeScreenOrigins</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a9bdb6eff5f7f86fd071091c5a55cee7c">dmxReInitOrigins</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#af3fb4b2c2d3cc318c88fbc6658893360">dmxInitOrigins</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#adaf3455cdd3f54d22285e5a0fa99fddb">dmxOnScreen</a> (int x, int y, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a5612d5f5b97d54fa9eb73540eaeba4f3">dmxDoesOverlap</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *a, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a52398858fc93988512050543967652fe">dmxPrintOverlap</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a28c6651bdff6f7fc01292548659a6eb4">dmxIterateOverlap</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start, void *(*f)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *), void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a3beed7bb0f6999879936b2f47751d125">dmxTestSameDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *a, void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a77c74a33de88fae6cf0de8b755a5c411">dmxInitOverlap</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a84c92b801c5802879047e74401f62e94">dmxBECreateCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ac722828c4781d1a44d8b04955472a134">_dmxRealizeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ae0e94924bf5a69c2b26e9d0442befadd">dmxBEFreeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#aa2ac82b5666d162e873c7f0c88ec96f6">_dmxUnrealizeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#aa208a04334d595e3507287bacffdae80">_dmxMoveCursor</a> (ScreenPtr pScreen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a6fd26c7c7811ff77fc3c6e84b82d57d5">_dmxSetCursor</a> (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ad51761f218c643ebe7f010538e9c745f">dmxRealizeCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a81c0223355350e6d897d4d7306381130">dmxUnrealizeCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static CursorPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ac7dc34eb6db6964e4330acc4d0e2badc">dmxFindCursor</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a21820e2001f763e3cfc924a1d602bb62">dmxMoveCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a4cbf6be156525a669ae883465f6458c2">dmxSetCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#ad67e1086ef62ecfa33549d74cd89a379">dmxHideCursor</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a6a381bffb099457e7c26a2312cf968a6">dmxCheckCursor</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a214b710621ed0279d6321375f3512a87">dmxDeviceCursorInitialize</a> (DeviceIntPtr pDev, ScreenPtr pScr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#af291298e4f52875e45d7097a223a8c0b">dmxDeviceCursorCleanup</a> (DeviceIntPtr pDev, ScreenPtr pScr)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a4d792c0cb9ce0c21787d3cd88d774fa6">dmxCursorDoMultiCursors</a> = 1</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">miPointerScreenFuncRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#aacf8d4857dd965073f62f10a53edcaa3">dmxPointerCursorFuncs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">miPointerSpriteFuncRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8c.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file contains code than supports cursor movement, including the code that initializes and reinitializes the screen positions and computes screen overlap.</p>
+<p>"This code is based very closely on the XFree86 equivalent
+ (xfree86/common/xf86Cursor.c)." --David Dawes.</p>
+<p>"This code was then extensively re-written, as explained here." --Rik Faith</p>
+<p>The code in xf86Cursor.c used edge lists to implement the CursorOffScreen function. The edge list computation was complex (especially in the face of arbitrarily overlapping screens) compared with the speed savings in the CursorOffScreen function. The new implementation has erred on the side of correctness, readability, and maintainability over efficiency. For the common (non-edge) case, the dmxCursorOffScreen function does avoid a loop over all the screens. When the cursor has left the screen, all the screens are searched, and the first screen (in dmxScreens order) containing the cursor will be returned. If run-time profiling shows that this routing is a performance bottle-neck, then an edge list may have to be reimplemented. An edge list algorithm is O(edges) whereas the new algorithm is O(dmxNumScreens). Since edges is usually 1-3 and dmxNumScreens may be 30-60 for large backend walls, this trade off may be compelling.</p>
+<p>The xf86InitOrigins routine uses bit masks during the computation and is therefore limited to the length of a word (e.g., 32 or 64 bits) screens. Because Xdmx is expected to be used with a large number of backend displays, this limitation was removed. The new implementation has erred on the side of readability over efficiency, using the dmxSL* routines to manage a screen list instead of a bitmap, and a function call to decrease the length of the main routine. Both algorithms are of the same order, and both are called only at server generation time, so trading clarity and long-term maintainability for efficiency does not seem justified in this case. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a757d7359cf12591268a62c0974178079"></a><!-- doxytag: member="dmxcursor.c::DMX_CURSOR_DEBUG" ref="a757d7359cf12591268a62c0974178079" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_CURSOR_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a21">dmxReInitOrigins</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="adf6865b0bc7ad370c94e3b8682262c13"></a><!-- doxytag: member="dmxcursor.c::DMXDBG0" ref="adf6865b0bc7ad370c94e3b8682262c13" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a22">dmxInitOrigins</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, and <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a23">dmxOnScreen</a> (int x, int y, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a302a2c9f84249eee79404eb601d085ab"></a><!-- doxytag: member="dmxcursor.c::DMXDBG1" ref="a302a2c9f84249eee79404eb601d085ab" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a28">dmxInitOverlap</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a29">dmxBECreateCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a1056d63499cee76ebe297c19637f2b79"></a><!-- doxytag: member="dmxcursor.c::DMXDBG2" ref="a1056d63499cee76ebe297c19637f2b79" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a31">dmxBEFreeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, and <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a38">dmxMoveCursor</a> (ScreenPtr pScreen, int x, int y)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6c6714b899194081b94edb722ca1c4bc"></a><!-- doxytag: member="dmxcursor.c::DMXDBG3" ref="a6c6714b899194081b94edb722ca1c4bc" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a40">dmxHideCursor</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00182">dmxWarpCursor()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a41">dmxCheckCursor</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8ffd07ee80777c394a6ff32d1021347d"></a><!-- doxytag: member="dmxcursor.c::DMXDBG4" ref="a8ffd07ee80777c394a6ff32d1021347d" args="(f, a, b, c, d)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG4</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>miPointerScreenFuncRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a10">dmxPointerCursorFuncs</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>miPointerSpriteFuncRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8c.html#a11">dmxPointerSpriteFuncs</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a753eef37715b6379d7d65e34a23d2e03"></a><!-- doxytag: member="dmxcursor.c::DMXDBG5" ref="a753eef37715b6379d7d65e34a23d2e03" args="(f, a, b, c, d, e)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG5</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file contains code than supports cursor movement, including the code that initializes and reinitializes the screen positions and computes screen overlap.<p>
-"This code is based very closely on the XFree86 equivalent (xfree86/common/xf86Cursor.c)." --David Dawes.<p>
-"This code was then extensively re-written, as explained here." --Rik Faith<p>
-The code in xf86Cursor.c used edge lists to implement the CursorOffScreen function. The edge list computation was complex (especially in the face of arbitrarily overlapping screens) compared with the speed savings in the CursorOffScreen function. The new implementation has erred on the side of correctness, readability, and maintainability over efficiency. For the common (non-edge) case, the dmxCursorOffScreen function does avoid a loop over all the screens. When the cursor has left the screen, all the screens are searched, and the first screen (in dmxScreens order) containing the cursor will be returned. If run-time profiling shows that this routing is a performance bottle-neck, then an edge list may have to be reimplemented. An edge list algorithm is O(edges) whereas the new algorithm is O(dmxNumScreens). Since edges is usually 1-3 and dmxNumScreens may be 30-60 for large backend walls, this trade off may be compelling.<p>
-The xf86InitOrigins routine uses bit masks during the computation and is therefore limited to the length of a word (e.g., 32 or 64 bits) screens. Because Xdmx is expected to be used with a large number of backend displays, this limitation was removed. The new implementation has erred on the side of readability over efficiency, using the dmxSL* routines to manage a screen list instead of a bitmap, and a function call to decrease the length of the main routine. Both algorithms are of the same order, and both are called only at server generation time, so trading clarity and long-term maintainability for efficiency does not seem justified in this case.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a29" doxytag="dmxcursor.c::dmxBECreateCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af703e1a00a515e2507f7d2a354429a24"></a><!-- doxytag: member="dmxcursor.c::DMXDBG6" ref="af703e1a00a515e2507f7d2a354429a24" args="(f, a, b, c, d, e, g)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG6</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreateCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CursorPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pCursor</em></td>
+          <td class="paramtype">e, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab45c7f6cc47b2c786215ca0276d37d91"></a><!-- doxytag: member="dmxcursor.c::DMXDBG7" ref="ab45c7f6cc47b2c786215ca0276d37d91" args="(f, a, b, c, d, e, g, h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG7</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">h&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create <em>pCursor</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a31" doxytag="dmxcursor.c::dmxBEFreeCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aa208a04334d595e3507287bacffdae80"></a><!-- doxytag: member="dmxcursor.c::_dmxMoveCursor" ref="aa208a04334d595e3507287bacffdae80" args="(ScreenPtr pScreen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">static void _dmxMoveCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CursorPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pCursor</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac722828c4781d1a44d8b04955472a134"></a><!-- doxytag: member="dmxcursor.c::_dmxRealizeCursor" ref="ac722828c4781d1a44d8b04955472a134" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool _dmxRealizeCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free <em>pCursor</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a41" doxytag="dmxcursor.c::dmxCheckCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, <a class="el" href="dmxcursor_8h_source.html#l00069">DMX_SET_CURSOR_PRIV</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6fd26c7c7811ff77fc3c6e84b82d57d5"></a><!-- doxytag: member="dmxcursor.c::_dmxSetCursor" ref="a6fd26c7c7811ff77fc3c6e84b82d57d5" args="(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void _dmxSetCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCheckCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00163">_DMXScreenInfo::curCursor</a>, <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmx_8h_source.html#l00167">_DMXScreenInfo::cursorVisible</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00162">_DMXScreenInfo::noCursor</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aa2ac82b5666d162e873c7f0c88ec96f6"></a><!-- doxytag: member="dmxcursor.c::_dmxUnrealizeCursor" ref="aa2ac82b5666d162e873c7f0c88ec96f6" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool _dmxUnrealizeCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is called during reconfiguration to make sure the cursor is visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxcursor.c::dmxCursorNoMulti" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, <a class="el" href="dmxcursor_8h_source.html#l00069">DMX_SET_CURSOR_PRIV</a>, <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a84c92b801c5802879047e74401f62e94"></a><!-- doxytag: member="dmxcursor.c::dmxBECreateCursor" ref="a84c92b801c5802879047e74401f62e94" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCursorNoMulti </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBECreateCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>pCursor</em> on the back-end associated with <em>pScreen</em>. </p>
 
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, and <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0e94924bf5a69c2b26e9d0442befadd"></a><!-- doxytag: member="dmxcursor.c::dmxBEFreeCursor" ref="ae0e94924bf5a69c2b26e9d0442befadd" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEFreeCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn off support for displaying multiple cursors on overlapped back-end displays. See #dmxCursorDoMultiCursors.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a40" doxytag="dmxcursor.c::dmxHideCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free <em>pCursor</em> on the back-end associated with <em>pScreen</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, and <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a381bffb099457e7c26a2312cf968a6"></a><!-- doxytag: member="dmxcursor.c::dmxCheckCursor" ref="a6a381bffb099457e7c26a2312cf968a6" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxHideCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCheckCursor </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine is called during reconfiguration to make sure the cursor is visible. </p>
 
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa5a4c58dbde29584153fbc43a1ac6e26"></a><!-- doxytag: member="dmxcursor.c::dmxComputeScreenOrigins" ref="aa5a4c58dbde29584153fbc43a1ac6e26" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxComputeScreenOrigins </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxcursor.c::dmxInitOrigins" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00204">dmxSLCreate()</a>, <a class="el" href="dmxcursor_8c_source.html#l00221">dmxSLFindNext()</a>, <a class="el" href="dmxcursor_8c_source.html#l00215">dmxSLFree()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, and <a class="el" href="dmx_8h_source.html#l00173">_DMXScreenInfo::whereRefScreen</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d0757fa7119492da7fe26901dab8571"></a><!-- doxytag: member="dmxcursor.c::dmxCrossScreen" ref="a2d0757fa7119492da7fe26901dab8571" args="(ScreenPtr pScreen, Bool entering)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxCrossScreen </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitOrigins </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>entering</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a709e3d4a4e44e17fed3de1fcb0d42b20"></a><!-- doxytag: member="dmxcursor.c::dmxCursorNoMulti" ref="a709e3d4a4e44e17fed3de1fcb0d42b20" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCursorNoMulti </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use <a class="el" href="dmxcursor_8c.html#a21">dmxReInitOrigins()</a> instead.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxcursor.c::dmxInitOverlap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn off support for displaying multiple cursors on overlapped back-end displays. See <a class="el" href="dmxcursor_8c.html#a4d792c0cb9ce0c21787d3cd88d774fa6">dmxCursorDoMultiCursors</a>. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c7f5d94ee32f85ec027c53b881fc697"></a><!-- doxytag: member="dmxcursor.c::dmxCursorOffScreen" ref="a1c7f5d94ee32f85ec027c53b881fc697" args="(ScreenPtr *ppScreen, int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool dmxCursorOffScreen </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr *&nbsp;</td>
+          <td class="paramname"> <em>ppScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitOverlap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxconsole_8c_source.html#l00098">_myPrivate::globalX</a>, <a class="el" href="dmxconsole_8c_source.html#l00099">_myPrivate::globalY</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af291298e4f52875e45d7097a223a8c0b"></a><!-- doxytag: member="dmxcursor.c::dmxDeviceCursorCleanup" ref="af291298e4f52875e45d7097a223a8c0b" args="(DeviceIntPtr pDev, ScreenPtr pScr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDeviceCursorCleanup </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is &lt; 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .     </td>
-  </tr>
-</table>
-<a class="anchor" name="a38" doxytag="dmxcursor.c::dmxMoveCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a214b710621ed0279d6321375f3512a87"></a><!-- doxytag: member="dmxcursor.c::dmxDeviceCursorInitialize" ref="a214b710621ed0279d6321375f3512a87" args="(DeviceIntPtr pDev, ScreenPtr pScr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMoveCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">static Bool dmxDeviceCursorInitialize </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5612d5f5b97d54fa9eb73540eaeba4f3"></a><!-- doxytag: member="dmxcursor.c::dmxDoesOverlap" ref="a5612d5f5b97d54fa9eb73540eaeba4f3" args="(DMXScreenInfo *a, DMXScreenInfo *b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxDoesOverlap </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>b</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns non-zero if <em>a</em> overlaps <em>b</em>. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, and <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac7dc34eb6db6964e4330acc4d0e2badc"></a><!-- doxytag: member="dmxcursor.c::dmxFindCursor" ref="ac7dc34eb6db6964e4330acc4d0e2badc" args="(DMXScreenInfo *start)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static CursorPtr dmxFindCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>start</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad67e1086ef62ecfa33549d74cd89a379"></a><!-- doxytag: member="dmxcursor.c::dmxHideCursor" ref="ad67e1086ef62ecfa33549d74cd89a379" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxHideCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd></dl>
 
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, and <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af3fb4b2c2d3cc318c88fbc6658893360"></a><!-- doxytag: member="dmxcursor.c::dmxInitOrigins" ref="af3fb4b2c2d3cc318c88fbc6658893360" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInitOrigins </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Move the cursor to coordinates (<em>x</em>, <em>y</em>)on <em>pScreen</em>. This function is usually called via <a class="el" href="dmxcursor_8h.html#a4">dmxPointerSpriteFuncs</a>, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxcursor.c::dmxOnScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use <a class="el" href="dmxcursor_8c.html#a9bdb6eff5f7f86fd071091c5a55cee7c">dmxReInitOrigins()</a> instead. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, and <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a77c74a33de88fae6cf0de8b755a5c411"></a><!-- doxytag: member="dmxcursor.c::dmxInitOverlap" ref="a77c74a33de88fae6cf0de8b755a5c411" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxOnScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">void dmxInitOverlap </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is &lt; 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration . </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxcursor_8c_source.html#l00484">dmxIterateOverlap()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00195">dmxLogOutputCont()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00502">dmxTestSameDisplay()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a28c6651bdff6f7fc01292548659a6eb4"></a><!-- doxytag: member="dmxcursor.c::dmxIterateOverlap" ref="a28c6651bdff6f7fc01292548659a6eb4" args="(DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *), void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxIterateOverlap </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">void *(*)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *)&nbsp;</td>
+          <td class="paramname"> <em>f</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Iterate over the screens which overlap with the <em>start</em> screen, calling <em>f</em> with the <em>closure</em> for each argument. Often used with <a class="el" href="dmxcursor_8c.html#a52398858fc93988512050543967652fe">dmxPrintOverlap</a>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a21820e2001f763e3cfc924a1d602bb62"></a><!-- doxytag: member="dmxcursor.c::dmxMoveCursor" ref="a21820e2001f763e3cfc924a1d602bb62" args="(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxMoveCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Move the cursor to coordinates (<em>x</em>, <em>y</em>)on <em>pScreen</em>. This function is usually called via <a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a>, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.</p>
+<p>The coords (x,y) are in global coord space. We'll loop over the back-end screens and see if they contain the global coord. If so, call <a class="el" href="dmxcursor_8c.html#aa208a04334d595e3507287bacffdae80">_dmxMoveCursor()</a> (XWarpPointer) to position the pointer on that screen. </p>
 
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmx_8h_source.html#l00167">_DMXScreenInfo::cursorVisible</a>, <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>, <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adaf3455cdd3f54d22285e5a0fa99fddb"></a><!-- doxytag: member="dmxcursor.c::dmxOnScreen" ref="adaf3455cdd3f54d22285e5a0fa99fddb" args="(int x, int y, DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxOnScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns non-zero if the global <em>x</em>, <em>y</em> coordinate is on the screen window of the <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxcursor.c::dmxReInitOrigins" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Returns non-zero if the global <em>x</em>, <em>y</em> coordinate is on the screen window of the <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a52398858fc93988512050543967652fe"></a><!-- doxytag: member="dmxcursor.c::dmxPrintOverlap" ref="a52398858fc93988512050543967652fe" args="(DMXScreenInfo *dmxScreen, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxPrintOverlap </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxReInitOrigins </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Used with <em>dmxInterateOverlap</em> to print out a list of screens which overlap each other. </p>
 
+<p>References <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxlog_8c_source.html#l00195">dmxLogOutputCont()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad51761f218c643ebe7f010538e9c745f"></a><!-- doxytag: member="dmxcursor.c::dmxRealizeCursor" ref="ad51761f218c643ebe7f010538e9c745f" args="(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool dmxRealizeCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Recompute origin information in the <a class="el" href="dmxinit_8c.html#a2">dmxScreens</a> list. This is either called from <a class="el" href="dmxcursor_8c.html#a22">dmxInitOrigins()</a> or from #dmxReconfig().     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a10" doxytag="dmxcursor.c::dmxPointerCursorFuncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9bdb6eff5f7f86fd071091c5a55cee7c"></a><!-- doxytag: member="dmxcursor.c::dmxReInitOrigins" ref="a9bdb6eff5f7f86fd071091c5a55cee7c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> miPointerScreenFuncRec <a class="el" href="dmxcursor_8h.html#a3">dmxPointerCursorFuncs</a>
+          <td class="memname">void dmxReInitOrigins </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Initial value:</b><div class="fragment"><pre>
+</div>
+<div class="memdoc">
+<p>Recompute origin information in the <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a> list. This is called from <a class="el" href="dmxcursor_8h.html#af3fb4b2c2d3cc318c88fbc6658893360">dmxInitOrigins</a>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4cbf6be156525a669ae883465f6458c2"></a><!-- doxytag: member="dmxcursor.c::dmxSetCursor" ref="a4cbf6be156525a669ae883465f6458c2" args="(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSetCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxinput_8h_source.html#l00148">DMX_NO_BLOCK</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaf8a9878f12b6653247fc27d960beccf"></a><!-- doxytag: member="dmxcursor.c::dmxSLCreate" ref="aaf8a9878f12b6653247fc27d960beccf" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int* dmxSLCreate </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create a list of screens that we'll manipulate. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab4dcb11cad339e72d843356841ffd203"></a><!-- doxytag: member="dmxcursor.c::dmxSLFindNext" ref="ab4dcb11cad339e72d843356841ffd203" args="(int *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxSLFindNext </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>list</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Find next uninitialized entry in list. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a565fbb8c3754a14c1aed13b741705b91"></a><!-- doxytag: member="dmxcursor.c::dmxSLFree" ref="a565fbb8c3754a14c1aed13b741705b91" args="(int *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSLFree </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>list</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free list. </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3beed7bb0f6999879936b2f47751d125"></a><!-- doxytag: member="dmxcursor.c::dmxTestSameDisplay" ref="a3beed7bb0f6999879936b2f47751d125" args="(DMXScreenInfo *a, void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void* dmxTestSameDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Used with <a class="el" href="dmxprop_8h.html#a4c53640b27c787d65539555cc3bf3c57">dmxPropertyIterate</a> to determine if screen <em>a</em> is the same as the screen <em>closure</em>. </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a97efbe7e0a872da9de0be49da214c210"></a><!-- doxytag: member="dmxcursor.c::dmxTryComputeScreenOrigins" ref="a97efbe7e0a872da9de0be49da214c210" args="(int *screensLeft)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxTryComputeScreenOrigins </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>screensLeft</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make one pass over all the screens and return the number updated. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00079">PosAbove</a>, <a class="el" href="dmx_8h_source.html#l00076">PosAbsolute</a>, <a class="el" href="dmx_8h_source.html#l00080">PosBelow</a>, <a class="el" href="dmx_8h_source.html#l00078">PosLeftOf</a>, <a class="el" href="dmx_8h_source.html#l00075">PosNone</a>, <a class="el" href="dmx_8h_source.html#l00081">PosRelative</a>, <a class="el" href="dmx_8h_source.html#l00077">PosRightOf</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00173">_DMXScreenInfo::whereRefScreen</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, and <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a81c0223355350e6d897d4d7306381130"></a><!-- doxytag: member="dmxcursor.c::dmxUnrealizeCursor" ref="a81c0223355350e6d897d4d7306381130" args="(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool dmxUnrealizeCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af80076061e55521b62a7cfd8e66bf3e6"></a><!-- doxytag: member="dmxcursor.c::dmxWarpCursor" ref="af80076061e55521b62a7cfd8e66bf3e6" args="(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxWarpCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a4d792c0cb9ce0c21787d3cd88d774fa6"></a><!-- doxytag: member="dmxcursor.c::dmxCursorDoMultiCursors" ref="a4d792c0cb9ce0c21787d3cd88d774fa6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxcursor_8c.html#a4d792c0cb9ce0c21787d3cd88d774fa6">dmxCursorDoMultiCursors</a> = 1<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00119">dmxCursorNoMulti()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf8d4857dd965073f62f10a53edcaa3"></a><!-- doxytag: member="dmxcursor.c::dmxPointerCursorFuncs" ref="aacf8d4857dd965073f62f10a53edcaa3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">miPointerScreenFuncRec <a class="el" href="dmxcursor_8h.html#aacf8d4857dd965073f62f10a53edcaa3">dmxPointerCursorFuncs</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment">
 {
-    dmxCursorOffScreen,
-    dmxCrossScreen,
-    dmxWarpCursor,
-    <a class="code" href="dmxeq_8c.html#a13">dmxeqEnqueue</a>,
-    <a class="code" href="dmxeq_8c.html#a14">dmxeqSwitchScreen</a>
+    <a class="code" href="dmxcursor_8c.html#a1c7f5d94ee32f85ec027c53b881fc697">dmxCursorOffScreen</a>,
+    <a class="code" href="dmxcursor_8c.html#a2d0757fa7119492da7fe26901dab8571">dmxCrossScreen</a>,
+    <a class="code" href="dmxcursor_8c.html#af80076061e55521b62a7cfd8e66bf3e6">dmxWarpCursor</a>,
+    NULL,
+    NULL,
 }
-</pre></div>Cursor functions for mi layer. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> <p>
+</pre></div><p>Cursor functions for mi layer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> </dd>
+<dd>
 <a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxcursor.c::dmxPointerSpriteFuncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7bf2f59a6c5d381aea975cd78dd1f9dc"></a><!-- doxytag: member="dmxcursor.c::dmxPointerSpriteFuncs" ref="a7bf2f59a6c5d381aea975cd78dd1f9dc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> miPointerSpriteFuncRec <a class="el" href="dmxcursor_8h.html#a4">dmxPointerSpriteFuncs</a>
+          <td class="memname">miPointerSpriteFuncRec <a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-<b>Initial value:</b><div class="fragment"><pre>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment">
 {
-    dmxRealizeCursor,
-    dmxUnrealizeCursor,
-    dmxSetCursor,
-    <a class="code" href="dmxcursor_8c.html#a38">dmxMoveCursor</a>,
+    <a class="code" href="dmxcursor_8c.html#ad51761f218c643ebe7f010538e9c745f">dmxRealizeCursor</a>,
+    <a class="code" href="dmxcursor_8c.html#a81c0223355350e6d897d4d7306381130">dmxUnrealizeCursor</a>,
+    <a class="code" href="dmxcursor_8c.html#a4cbf6be156525a669ae883465f6458c2">dmxSetCursor</a>,
+    <a class="code" href="dmxcursor_8c.html#a21820e2001f763e3cfc924a1d602bb62">dmxMoveCursor</a>,
+    <a class="code" href="dmxcursor_8c.html#a214b710621ed0279d6321375f3512a87">dmxDeviceCursorInitialize</a>,
+    <a class="code" href="dmxcursor_8c.html#af291298e4f52875e45d7097a223a8c0b">dmxDeviceCursorCleanup</a>
 }
-</pre></div>Sprite functions for mi layer. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> <p>
+</pre></div><p>Sprite functions for mi layer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> </dd>
+<dd>
 <a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html
deleted file mode 100644
index c9a7c8d4d..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxcursor_8h-source.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcursor.h</h1><a href="dmxcursor_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
-00032 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00033 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00034 <span class="comment"> *</span>
-00035 <span class="comment"> */</span>
-00036 
-00040 <span class="preprocessor">#ifndef DMXCURSOR_H</span>
-00041 <span class="preprocessor"></span><span class="preprocessor">#define DMXCURSOR_H</span>
-00042 <span class="preprocessor"></span>
-00043 <span class="preprocessor">#include "mipointer.h"</span>
-00044 
-<a name="l00046"></a><a class="code" href="struct__dmxCursorPriv.html">00046</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> {
-00047     Cursor  cursor;
-00048 } <a class="code" href="struct__dmxCursorPriv.html">dmxCursorPrivRec</a>, *<a class="code" href="struct__dmxCursorPriv.html">dmxCursorPrivPtr</a>;
-00049 
-<a name="l00051"></a><a class="code" href="dmxcursor_8h.html#a3">00051</a> <span class="keyword">extern</span> miPointerScreenFuncRec <a class="code" href="dmxcursor_8c.html#a10">dmxPointerCursorFuncs</a>;
-<a name="l00053"></a><a class="code" href="dmxcursor_8h.html#a4">00053</a> <span class="keyword">extern</span> miPointerSpriteFuncRec <a class="code" href="dmxcursor_8c.html#a11">dmxPointerSpriteFuncs</a>;
-00054 
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a21">dmxReInitOrigins</a>(<span class="keywordtype">void</span>);
-00056 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a22">dmxInitOrigins</a>(<span class="keywordtype">void</span>);
-00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a28">dmxInitOverlap</a>(<span class="keywordtype">void</span>);
-00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a12">dmxCursorNoMulti</a>(<span class="keywordtype">void</span>);
-00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a38">dmxMoveCursor</a>(ScreenPtr pScreen, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00060 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a41">dmxCheckCursor</a>(<span class="keywordtype">void</span>);
-00061 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxcursor_8c.html#a23">dmxOnScreen</a>(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00062 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a40">dmxHideCursor</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00063 
-00064 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a29">dmxBECreateCursor</a>(ScreenPtr pScreen, CursorPtr pCursor);
-00065 <span class="keyword">extern</span> Bool <a class="code" href="dmxcursor_8c.html#a31">dmxBEFreeCursor</a>(ScreenPtr pScreen, CursorPtr pCursor);
-00066 
-00067 <span class="preprocessor">#define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen)                         \</span>
-00068 <span class="preprocessor">    (dmxCursorPrivPtr)(_pCursor)-&gt;devPriv[(_pScreen)-&gt;myNum]</span>
-00069 <span class="preprocessor"></span>
-00070 <span class="preprocessor">#endif </span><span class="comment">/* DMXCURSOR_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html
index 3bb81f00f..93ac65165 100644
--- a/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8h.html
@@ -6,484 +6,464 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxcursor.h File Reference</h1><code>#include "mipointer.h"</code><br>
-
-<p>
-<a href="dmxcursor_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a1">dmxCursorPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a2">dmxCursorPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a5">dmxReInitOrigins</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a6">dmxInitOrigins</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a7">dmxInitOverlap</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a8">dmxCursorNoMulti</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a9">dmxMoveCursor</a> (ScreenPtr pScreen, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a10">dmxCheckCursor</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a11">dmxOnScreen</a> (int x, int y, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a12">dmxHideCursor</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a13">dmxBECreateCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a14">dmxBEFreeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>miPointerScreenFuncRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a3">dmxPointerCursorFuncs</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>miPointerSpriteFuncRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxcursor_8h.html#a4">dmxPointerSpriteFuncs</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxcursor.h File Reference</h1><code>#include &quot;mipointer.h&quot;</code><br/>
+
+<p><a href="dmxcursor_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a7ddaf12551bbbd8a23fa60c09cdd6218">DMX_GET_CURSOR_PRIV</a>(_pCursor, _pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a7ec081934a095ba159d03229e714cfd5">DMX_SET_CURSOR_PRIV</a>(_pCursor, _pScreen, v)&nbsp;&nbsp;&nbsp;dixSetPrivate(&amp;(_pCursor)-&gt;devPrivates, CursorScreenKey(_pScreen), v)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a78a877b8bee68809063112fb5286e2db">dmxCursorPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#ae93d2b5a8714fcf2714f03b6cdeadc07">dmxCursorPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a9bdb6eff5f7f86fd071091c5a55cee7c">dmxReInitOrigins</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#af3fb4b2c2d3cc318c88fbc6658893360">dmxInitOrigins</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a77c74a33de88fae6cf0de8b755a5c411">dmxInitOverlap</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a709e3d4a4e44e17fed3de1fcb0d42b20">dmxCursorNoMulti</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a21820e2001f763e3cfc924a1d602bb62">dmxMoveCursor</a> (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a6a381bffb099457e7c26a2312cf968a6">dmxCheckCursor</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#adaf3455cdd3f54d22285e5a0fa99fddb">dmxOnScreen</a> (int x, int y, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#ad67e1086ef62ecfa33549d74cd89a379">dmxHideCursor</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a84c92b801c5802879047e74401f62e94">dmxBECreateCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#ae0e94924bf5a69c2b26e9d0442befadd">dmxBEFreeCursor</a> (ScreenPtr pScreen, CursorPtr pCursor)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">miPointerScreenFuncRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#aacf8d4857dd965073f62f10a53edcaa3">dmxPointerCursorFuncs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">miPointerSpriteFuncRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for cursor support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a>.</dd></dl>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxcursor.h::dmxCursorPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for cursor support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a>. </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a7ddaf12551bbbd8a23fa60c09cdd6218"></a><!-- doxytag: member="dmxcursor.h::DMX_GET_CURSOR_PRIV" ref="a7ddaf12551bbbd8a23fa60c09cdd6218" args="(_pCursor, _pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> * <a class="el" href="struct__dmxCursorPriv.html">dmxCursorPrivPtr</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Cursor private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxcursor.h::dmxCursorPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="memname">#define DMX_GET_CURSOR_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pCursor, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>  <a class="el" href="struct__dmxCursorPriv.html">dmxCursorPrivRec</a>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">_pScreen&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Cursor private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a13" doxytag="dmxcursor.h::dmxBECreateCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">((<a class="code" href="struct__dmxCursorPriv.html">dmxCursorPrivPtr</a>) \
+    dixLookupPrivate(&amp;(_pCursor)-&gt;devPrivates, CursorScreenKey(_pScreen)))
+</pre></div>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7ec081934a095ba159d03229e714cfd5"></a><!-- doxytag: member="dmxcursor.h::DMX_SET_CURSOR_PRIV" ref="a7ec081934a095ba159d03229e714cfd5" args="(_pCursor, _pScreen, v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreateCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">#define DMX_SET_CURSOR_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pCursor, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CursorPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pCursor</em></td>
+          <td class="paramtype">_pScreen, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">v&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dixSetPrivate(&amp;(_pCursor)-&gt;devPrivates, CursorScreenKey(_pScreen), v)</td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create <em>pCursor</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxcursor.h::dmxBEFreeCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="ae93d2b5a8714fcf2714f03b6cdeadc07"></a><!-- doxytag: member="dmxcursor.h::dmxCursorPrivPtr" ref="ae93d2b5a8714fcf2714f03b6cdeadc07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> * <a class="el" href="struct__dmxCursorPriv.html">dmxCursorPrivPtr</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a78a877b8bee68809063112fb5286e2db"></a><!-- doxytag: member="dmxcursor.h::dmxCursorPrivRec" ref="a78a877b8bee68809063112fb5286e2db" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a>  <a class="el" href="struct__dmxCursorPriv.html">dmxCursorPrivRec</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Cursor private area. </p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a84c92b801c5802879047e74401f62e94"></a><!-- doxytag: member="dmxcursor.h::dmxBECreateCursor" ref="a84c92b801c5802879047e74401f62e94" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBECreateCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CursorPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pCursor</em></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free <em>pCursor</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxcursor.h::dmxCheckCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create <em>pCursor</em> on the back-end associated with <em>pScreen</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxconsole_8c_source.html#l00108">_myPrivate::gc</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, and <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0e94924bf5a69c2b26e9d0442befadd"></a><!-- doxytag: member="dmxcursor.h::dmxBEFreeCursor" ref="ae0e94924bf5a69c2b26e9d0442befadd" args="(ScreenPtr pScreen, CursorPtr pCursor)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCheckCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreeCursor </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is called during reconfiguration to make sure the cursor is visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxcursor.h::dmxCursorNoMulti" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCursorNoMulti </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CursorPtr&nbsp;</td>
+          <td class="paramname"> <em>pCursor</em></td><td>&nbsp;</td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn off support for displaying multiple cursors on overlapped back-end displays. See #dmxCursorDoMultiCursors.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxcursor.h::dmxHideCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxHideCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free <em>pCursor</em> on the back-end associated with <em>pScreen</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxcursor_8h_source.html#l00046">_dmxCursorPriv::cursor</a>, <a class="el" href="dmxcursor_8h_source.html#l00066">DMX_GET_CURSOR_PRIV</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, and <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a381bffb099457e7c26a2312cf968a6"></a><!-- doxytag: member="dmxcursor.h::dmxCheckCursor" ref="a6a381bffb099457e7c26a2312cf968a6" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCheckCursor </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxcursor.h::dmxInitOrigins" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine is called during reconfiguration to make sure the cursor is visible. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a709e3d4a4e44e17fed3de1fcb0d42b20"></a><!-- doxytag: member="dmxcursor.h::dmxCursorNoMulti" ref="a709e3d4a4e44e17fed3de1fcb0d42b20" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitOrigins </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCursorNoMulti </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn off support for displaying multiple cursors on overlapped back-end displays. See <a class="el" href="dmxcursor_8c.html#a4d792c0cb9ce0c21787d3cd88d774fa6">dmxCursorDoMultiCursors</a>. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ad67e1086ef62ecfa33549d74cd89a379"></a><!-- doxytag: member="dmxcursor.h::dmxHideCursor" ref="ad67e1086ef62ecfa33549d74cd89a379" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxHideCursor </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use <a class="el" href="dmxcursor_8c.html#a21">dmxReInitOrigins()</a> instead.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxcursor.h::dmxInitOverlap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine is used by the backend input routines to hide the cursor on a screen that is being used for relative input. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a> </dd></dl>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, and <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af3fb4b2c2d3cc318c88fbc6658893360"></a><!-- doxytag: member="dmxcursor.h::dmxInitOrigins" ref="af3fb4b2c2d3cc318c88fbc6658893360" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitOverlap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInitOrigins </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize screen origins (and relative position). This is called for each server generation. For dynamic reconfiguration, use <a class="el" href="dmxcursor_8c.html#a9bdb6eff5f7f86fd071091c5a55cee7c">dmxReInitOrigins()</a> instead. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmx_8h_source.html#l00170">_DMXScreenInfo::where</a>, <a class="el" href="dmx_8h_source.html#l00171">_DMXScreenInfo::whereX</a>, and <a class="el" href="dmx_8h_source.html#l00172">_DMXScreenInfo::whereY</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a77c74a33de88fae6cf0de8b755a5c411"></a><!-- doxytag: member="dmxcursor.h::dmxInitOverlap" ref="a77c74a33de88fae6cf0de8b755a5c411" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInitOverlap </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is &lt; 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration .     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxcursor.h::dmxMoveCursor" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Detects overlapping dmxScreens and creates circular lists. This uses an O(dmxNumScreens^2) algorithm, but dmxNumScreens is &lt; 100 and the computation only needs to be performed for every server generation or dynamic reconfiguration . </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxcursor_8c_source.html#l00484">dmxIterateOverlap()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00195">dmxLogOutputCont()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00502">dmxTestSameDisplay()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a21820e2001f763e3cfc924a1d602bb62"></a><!-- doxytag: member="dmxcursor.h::dmxMoveCursor" ref="a21820e2001f763e3cfc924a1d602bb62" args="(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMoveCursor </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxMoveCursor </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Move the cursor to coordinates (<em>x</em>, <em>y</em>)on <em>pScreen</em>. This function is usually called via <a class="el" href="dmxcursor_8h.html#a4">dmxPointerSpriteFuncs</a>, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxcursor.h::dmxOnScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Move the cursor to coordinates (<em>x</em>, <em>y</em>)on <em>pScreen</em>. This function is usually called via <a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a>, except during reconfiguration when the cursor is repositioned to force an update on newley overlapping screens and on screens that no longer overlap.</p>
+<p>The coords (x,y) are in global coord space. We'll loop over the back-end screens and see if they contain the global coord. If so, call <a class="el" href="dmxcursor_8c.html#aa208a04334d595e3507287bacffdae80">_dmxMoveCursor()</a> (XWarpPointer) to position the pointer on that screen. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmx_8h_source.html#l00166">_DMXScreenInfo::cursor</a>, <a class="el" href="dmx_8h_source.html#l00168">_DMXScreenInfo::cursorNotShared</a>, <a class="el" href="dmx_8h_source.html#l00167">_DMXScreenInfo::cursorVisible</a>, <a class="el" href="dmxcursor_8c_source.html#l00115">dmxCursorDoMultiCursors</a>, <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00137">_DMXScreenInfo::over</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, and <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adaf3455cdd3f54d22285e5a0fa99fddb"></a><!-- doxytag: member="dmxcursor.h::dmxOnScreen" ref="adaf3455cdd3f54d22285e5a0fa99fddb" args="(int x, int y, DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxOnScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">int dmxOnScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns non-zero if the global <em>x</em>, <em>y</em> coordinate is on the screen window of the <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxcursor.h::dmxReInitOrigins" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Returns non-zero if the global <em>x</em>, <em>y</em> coordinate is on the screen window of the <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9bdb6eff5f7f86fd071091c5a55cee7c"></a><!-- doxytag: member="dmxcursor.h::dmxReInitOrigins" ref="a9bdb6eff5f7f86fd071091c5a55cee7c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxReInitOrigins </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxReInitOrigins </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Recompute origin information in the <a class="el" href="dmxinit_8c.html#a2">dmxScreens</a> list. This is either called from <a class="el" href="dmxcursor_8c.html#a22">dmxInitOrigins()</a> or from #dmxReconfig().     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxcursor.h::dmxPointerCursorFuncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Recompute origin information in the <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a> list. This is called from <a class="el" href="dmxcursor_8h.html#af3fb4b2c2d3cc318c88fbc6658893360">dmxInitOrigins</a>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="aacf8d4857dd965073f62f10a53edcaa3"></a><!-- doxytag: member="dmxcursor.h::dmxPointerCursorFuncs" ref="aacf8d4857dd965073f62f10a53edcaa3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> miPointerScreenFuncRec <a class="el" href="dmxcursor_8h.html#a3">dmxPointerCursorFuncs</a>
+          <td class="memname">miPointerScreenFuncRec <a class="el" href="dmxcursor_8h.html#aacf8d4857dd965073f62f10a53edcaa3">dmxPointerCursorFuncs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Cursor functions for mi layer. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> <p>
+</div>
+<div class="memdoc">
+<p>Cursor functions for mi layer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> </dd>
+<dd>
 <a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxcursor.h::dmxPointerSpriteFuncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7bf2f59a6c5d381aea975cd78dd1f9dc"></a><!-- doxytag: member="dmxcursor.h::dmxPointerSpriteFuncs" ref="a7bf2f59a6c5d381aea975cd78dd1f9dc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> miPointerSpriteFuncRec <a class="el" href="dmxcursor_8h.html#a4">dmxPointerSpriteFuncs</a>
+          <td class="memname">miPointerSpriteFuncRec <a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sprite functions for mi layer. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> <p>
+</div>
+<div class="memdoc">
+<p>Sprite functions for mi layer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a> </dd>
+<dd>
 <a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html
new file mode 100644
index 000000000..6211c73eb
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxcursor_8h_source.html
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxcursor.h</h1><a href="dmxcursor_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00033"></a>00033 <span class="comment"> *</span>
+<a name="l00034"></a>00034 <span class="comment"> */</span>
+<a name="l00035"></a>00035 
+<a name="l00039"></a>00039 <span class="preprocessor">#ifndef DMXCURSOR_H</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span><span class="preprocessor">#define DMXCURSOR_H</span>
+<a name="l00041"></a>00041 <span class="preprocessor"></span>
+<a name="l00042"></a>00042 <span class="preprocessor">#include &quot;mipointer.h&quot;</span>
+<a name="l00043"></a>00043 
+<a name="l00045"></a><a class="code" href="struct__dmxCursorPriv.html">00045</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxCursorPriv.html">_dmxCursorPriv</a> {
+<a name="l00046"></a><a class="code" href="struct__dmxCursorPriv.html#aa55d93640b2d29175eeaa07b92c83cad">00046</a>     Cursor  <a class="code" href="struct__dmxCursorPriv.html#aa55d93640b2d29175eeaa07b92c83cad">cursor</a>;
+<a name="l00047"></a>00047 } <a class="code" href="struct__dmxCursorPriv.html">dmxCursorPrivRec</a>, *<a class="code" href="struct__dmxCursorPriv.html">dmxCursorPrivPtr</a>;
+<a name="l00048"></a>00048 
+<a name="l00050"></a>00050 <span class="keyword">extern</span> miPointerScreenFuncRec <a class="code" href="dmxcursor_8c.html#aacf8d4857dd965073f62f10a53edcaa3">dmxPointerCursorFuncs</a>;
+<a name="l00052"></a>00052 <span class="keyword">extern</span> miPointerSpriteFuncRec <a class="code" href="dmxcursor_8c.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxPointerSpriteFuncs</a>;
+<a name="l00053"></a>00053 
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a9bdb6eff5f7f86fd071091c5a55cee7c">dmxReInitOrigins</a>(<span class="keywordtype">void</span>);
+<a name="l00055"></a>00055 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#af3fb4b2c2d3cc318c88fbc6658893360">dmxInitOrigins</a>(<span class="keywordtype">void</span>);
+<a name="l00056"></a>00056 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a77c74a33de88fae6cf0de8b755a5c411">dmxInitOverlap</a>(<span class="keywordtype">void</span>);
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a709e3d4a4e44e17fed3de1fcb0d42b20">dmxCursorNoMulti</a>(<span class="keywordtype">void</span>);
+<a name="l00058"></a>00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a21820e2001f763e3cfc924a1d602bb62">dmxMoveCursor</a>(DeviceIntPtr pDev, ScreenPtr pScreen, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a6a381bffb099457e7c26a2312cf968a6">dmxCheckCursor</a>(<span class="keywordtype">void</span>);
+<a name="l00060"></a>00060 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxcursor_8c.html#adaf3455cdd3f54d22285e5a0fa99fddb">dmxOnScreen</a>(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00061"></a>00061 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#ad67e1086ef62ecfa33549d74cd89a379">dmxHideCursor</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00062"></a>00062 
+<a name="l00063"></a>00063 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxcursor_8c.html#a84c92b801c5802879047e74401f62e94">dmxBECreateCursor</a>(ScreenPtr pScreen, CursorPtr pCursor);
+<a name="l00064"></a>00064 <span class="keyword">extern</span> Bool <a class="code" href="dmxcursor_8c.html#ae0e94924bf5a69c2b26e9d0442befadd">dmxBEFreeCursor</a>(ScreenPtr pScreen, CursorPtr pCursor);
+<a name="l00065"></a>00065 
+<a name="l00066"></a><a class="code" href="dmxcursor_8h.html#a7ddaf12551bbbd8a23fa60c09cdd6218">00066</a> <span class="preprocessor">#define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen) ((dmxCursorPrivPtr) \</span>
+<a name="l00067"></a>00067 <span class="preprocessor">    dixLookupPrivate(&amp;(_pCursor)-&gt;devPrivates, CursorScreenKey(_pScreen)))</span>
+<a name="l00068"></a>00068 <span class="preprocessor"></span>
+<a name="l00069"></a><a class="code" href="dmxcursor_8h.html#a7ec081934a095ba159d03229e714cfd5">00069</a> <span class="preprocessor">#define DMX_SET_CURSOR_PRIV(_pCursor, _pScreen, v) \</span>
+<a name="l00070"></a>00070 <span class="preprocessor">    dixSetPrivate(&amp;(_pCursor)-&gt;devPrivates, CursorScreenKey(_pScreen), v)</span>
+<a name="l00071"></a>00071 <span class="preprocessor"></span>
+<a name="l00072"></a>00072 <span class="preprocessor">#endif </span><span class="comment">/* DMXCURSOR_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html b/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html
index e311a99bd..b1394f74c 100644
--- a/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxdetach_8c.html
@@ -6,56 +6,65 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxdetach.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdetach_8c.html#a0">dmxInputDetach</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool reserveId)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxdetach.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdetach_8c.html#adcf530802f6d092e58a6db38efb0498c">dmxInputDetach</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool reserveId)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide support and helper functions for input detach and attach.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxdetach.c::dmxInputDetach" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide support and helper functions for input detach and attach. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="adcf530802f6d092e58a6db38efb0498c"></a><!-- doxytag: member="dmxdetach.c::dmxInputDetach" ref="adcf530802f6d092e58a6db38efb0498c" args="(DMXScreenInfo *dmxScreen, Bool reserveId)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputDetach </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxInputDetach </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>reserveId</em></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>reserveId</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Search for input associated with <em>dmxScreen</em>, and detach. </p>
 
-<p>
-Search for input associated with <em>dmxScreen</em>, and detach.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01209">dmxInputDetachId()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html
index 4ad87da6d..2912b4e7c 100644
--- a/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8c.html
@@ -6,114 +6,161 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxdpms.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxdpms_8h-source.html">dmxdpms.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "dpmsproc.h"</code><br>
-<code>#include "windowstr.h"</code><br>
-<code>#include "X11/extensions/dpms.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8c.html#a3">dmxDPMSInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxdpms.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxdpms_8h_source.html">dmxdpms.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/dpms.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#afd14a12acf152c0a881144aff85e584a">_dmxDPMSInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#a6c93ecabb9ee83027c79f878e143a472">dmxDPMSInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#a54288399c9ed5293b83d7d508ff2465c">dmxDPMSTerm</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#aa996aaa17a07afb7fc613142599505c5">dmxDPMSWakeup</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#a7bb06fe7454077ecfbfae62ac9cba1e0">dpmsGeneration</a> = 0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8c.html#a2d45a784084cd5cdef646499d5298254">dpmsSupported</a> = TRUE</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provides DPMS support and unifies all DPMS and other screen-saver support in one file. If -dpms is given on the command line, or the Xdmx server is not compiled with DPMS support, then the DPMS extension does not work for clients, but DPMS on the backends is still disables (and restored at Xdmx server shutdown time). </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="afd14a12acf152c0a881144aff85e584a"></a><!-- doxytag: member="dmxdpms.c::_dmxDPMSInit" ref="afd14a12acf152c0a881144aff85e584a" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void _dmxDPMSInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8c.html#a4">dmxDPMSTerm</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmx_8h_source.html#l00176">_DMXScreenInfo::dpmsCapable</a>, <a class="el" href="dmx_8h_source.html#l00177">_DMXScreenInfo::dpmsEnabled</a>, <a class="el" href="dmxdpms_8c_source.html#l00056">dpmsGeneration</a>, <a class="el" href="dmx_8h_source.html#l00180">_DMXScreenInfo::dpmsOff</a>, <a class="el" href="dmx_8h_source.html#l00178">_DMXScreenInfo::dpmsStandby</a>, <a class="el" href="dmxdpms_8c_source.html#l00057">dpmsSupported</a>, and <a class="el" href="dmx_8h_source.html#l00179">_DMXScreenInfo::dpmsSuspend</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8c.html#a5">dmxDPMSWakeup</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provides DPMS support and unifies all DPMS and other screen-saver support in one file. If -dpms is given on the command line, or the Xdmx server is not compiled with DPMS support, then the DPMS extension does not work for clients, but DPMS on the backends is still disables (and restored at Xdmx server shutdown time).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxdpms.c::dmxDPMSInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a6c93ecabb9ee83027c79f878e143a472"></a><!-- doxytag: member="dmxdpms.c::dmxDPMSInit" ref="a6c93ecabb9ee83027c79f878e143a472" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDPMSInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in <a class="el" href="dmxdpms_8h.html#a54288399c9ed5293b83d7d508ff2465c">dmxDPMSTerm</a>. </p>
 
-<p>
-Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in <a class="el" href="dmxdpms_8h.html#a1">dmxDPMSTerm</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxdpms.c::dmxDPMSTerm" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmx_8h_source.html#l00175">_DMXScreenInfo::savedTimeout</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a54288399c9ed5293b83d7d508ff2465c"></a><!-- doxytag: member="dmxdpms.c::dmxDPMSTerm" ref="a54288399c9ed5293b83d7d508ff2465c" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSTerm </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDPMSTerm </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Terminate DPMS support on <em>dmxScreen</em>. We restore the settings saved in <a class="el" href="dmxdpms_8h.html#a6c93ecabb9ee83027c79f878e143a472">dmxDPMSInit</a>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00176">_DMXScreenInfo::dpmsCapable</a>, <a class="el" href="dmx_8h_source.html#l00177">_DMXScreenInfo::dpmsEnabled</a>, <a class="el" href="dmx_8h_source.html#l00180">_DMXScreenInfo::dpmsOff</a>, <a class="el" href="dmx_8h_source.html#l00178">_DMXScreenInfo::dpmsStandby</a>, <a class="el" href="dmx_8h_source.html#l00179">_DMXScreenInfo::dpmsSuspend</a>, and <a class="el" href="dmx_8h_source.html#l00175">_DMXScreenInfo::savedTimeout</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa996aaa17a07afb7fc613142599505c5"></a><!-- doxytag: member="dmxdpms.c::dmxDPMSWakeup" ref="aa996aaa17a07afb7fc613142599505c5" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxDPMSWakeup </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Called when activity is detected so that DPMS power-saving mode can be deactivated. </p>
 
-<p>
-Terminate DPMS support on <em>dmxScreen</em>. We restore the settings saved in <a class="el" href="dmxdpms_8h.html#a0">dmxDPMSInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxdpms.c::dmxDPMSWakeup" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a7bb06fe7454077ecfbfae62ac9cba1e0"></a><!-- doxytag: member="dmxdpms.c::dpmsGeneration" ref="a7bb06fe7454077ecfbfae62ac9cba1e0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSWakeup </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">unsigned long <a class="el" href="dmxdpms_8c.html#a7bb06fe7454077ecfbfae62ac9cba1e0">dpmsGeneration</a> = 0<code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d45a784084cd5cdef646499d5298254"></a><!-- doxytag: member="dmxdpms.c::dpmsSupported" ref="a2d45a784084cd5cdef646499d5298254" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="dmxdpms_8c.html#a2d45a784084cd5cdef646499d5298254">dpmsSupported</a> = TRUE<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Called when activity is detected so that DPMS power-saving mode can be deactivated.     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html
deleted file mode 100644
index ff74d3ab5..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxdpms_8h-source.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxdpms.h</h1><a href="dmxdpms_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2003 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Author:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXDPMS_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXDPMS_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#a3">dmxDPMSInit</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#a4">dmxDPMSTerm</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#a5">dmxDPMSWakeup</a>(<span class="keywordtype">void</span>); <span class="comment">/* Call when input is processed */</span>
-00043 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html
index 45b5a6495..d9254f24b 100644
--- a/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8h.html
@@ -6,110 +6,101 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxdpms.h File Reference</h1>
-<p>
-<a href="dmxdpms_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8h.html#a0">dmxDPMSInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8h.html#a1">dmxDPMSTerm</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdpms_8h.html#a2">dmxDPMSWakeup</a> (void)</td></tr>
-
+<p><a href="dmxdpms_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8h.html#a6c93ecabb9ee83027c79f878e143a472">dmxDPMSInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8h.html#a54288399c9ed5293b83d7d508ff2465c">dmxDPMSTerm</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdpms_8h.html#aa996aaa17a07afb7fc613142599505c5">dmxDPMSWakeup</a> (void)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for DPMS extension support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxdpms_8c.html">dmxdpms.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxdpms.h::dmxDPMSInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for DPMS extension support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxdpms_8c.html">dmxdpms.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6c93ecabb9ee83027c79f878e143a472"></a><!-- doxytag: member="dmxdpms.h::dmxDPMSInit" ref="a6c93ecabb9ee83027c79f878e143a472" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDPMSInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in <a class="el" href="dmxdpms_8h.html#a54288399c9ed5293b83d7d508ff2465c">dmxDPMSTerm</a>. </p>
 
-<p>
-Initialize DPMS support. We save the current settings and turn off DPMS. The settings are restored in <a class="el" href="dmxdpms_8h.html#a1">dmxDPMSTerm</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxdpms.h::dmxDPMSTerm" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmx_8h_source.html#l00175">_DMXScreenInfo::savedTimeout</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a54288399c9ed5293b83d7d508ff2465c"></a><!-- doxytag: member="dmxdpms.h::dmxDPMSTerm" ref="a54288399c9ed5293b83d7d508ff2465c" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSTerm </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDPMSTerm </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Terminate DPMS support on <em>dmxScreen</em>. We restore the settings saved in <a class="el" href="dmxdpms_8h.html#a6c93ecabb9ee83027c79f878e143a472">dmxDPMSInit</a>. </p>
 
-<p>
-Terminate DPMS support on <em>dmxScreen</em>. We restore the settings saved in <a class="el" href="dmxdpms_8h.html#a0">dmxDPMSInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxdpms.h::dmxDPMSWakeup" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00176">_DMXScreenInfo::dpmsCapable</a>, <a class="el" href="dmx_8h_source.html#l00177">_DMXScreenInfo::dpmsEnabled</a>, <a class="el" href="dmx_8h_source.html#l00180">_DMXScreenInfo::dpmsOff</a>, <a class="el" href="dmx_8h_source.html#l00178">_DMXScreenInfo::dpmsStandby</a>, <a class="el" href="dmx_8h_source.html#l00179">_DMXScreenInfo::dpmsSuspend</a>, and <a class="el" href="dmx_8h_source.html#l00175">_DMXScreenInfo::savedTimeout</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa996aaa17a07afb7fc613142599505c5"></a><!-- doxytag: member="dmxdpms.h::dmxDPMSWakeup" ref="aa996aaa17a07afb7fc613142599505c5" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDPMSWakeup </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDPMSWakeup </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Called when activity is detected so that DPMS power-saving mode can be deactivated. </p>
 
-<p>
-Called when activity is detected so that DPMS power-saving mode can be deactivated.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html
new file mode 100644
index 000000000..892d60eeb
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxdpms_8h_source.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxdpms.h</h1><a href="dmxdpms_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2003 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Author:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXDPMS_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXDPMS_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#a6c93ecabb9ee83027c79f878e143a472">dmxDPMSInit</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#a54288399c9ed5293b83d7d508ff2465c">dmxDPMSTerm</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdpms_8c.html#aa996aaa17a07afb7fc613142599505c5">dmxDPMSWakeup</a>(<span class="keywordtype">void</span>); <span class="comment">/* Call when input is processed */</span>
+<a name="l00042"></a>00042 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html
index d497e154a..f504a462f 100644
--- a/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8c.html
@@ -6,97 +6,95 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxdummy.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxdummy_8h-source.html">dmxdummy.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdummy_8c.html#a0">dmxDummyKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdummy_8c.html#a1">dmxDummyMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxdummy.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxdummy_8h_source.html">dmxdummy.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdummy_8c.html#a31bf72cac5b5327393423d49a437fc8b">dmxDummyKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdummy_8c.html#a0d9cc243adf2eb5869b9ebcca9125bf4">dmxDummyMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide mouse and keyboard that are sufficient for starting the X server, but that don't actually provide any events. This is useful for testing.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxdummy.c::dmxDummyKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide mouse and keyboard that are sufficient for starting the X server, but that don't actually provide any events. This is useful for testing. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a31bf72cac5b5327393423d49a437fc8b"></a><!-- doxytag: member="dmxdummy.c::dmxDummyKbdGetInfo" ref="a31bf72cac5b5327393423d49a437fc8b" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDummyKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxDummyKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return information about the dummy keyboard device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. The keyboard is set up to have 1 valid key code that is <em>NoSymbol</em> </p>
 
-<p>
-Return information about the dummy keyboard device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. The keyboard is set up to have 1 valid key code that is <em>NoSymbol</em>     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxdummy.c::dmxDummyMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00093">_DMXLocalInitInfo::force</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0d9cc243adf2eb5869b9ebcca9125bf4"></a><!-- doxytag: member="dmxdummy.c::dmxDummyMouGetInfo" ref="a0d9cc243adf2eb5869b9ebcca9125bf4" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDummyMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxDummyMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return information about the dummy mouse device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. They mouse has 3 buttons and two axes. </p>
 
-<p>
-Return information about the dummy mouse device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. They mouse has 3 buttons and two axes.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html
deleted file mode 100644
index 907b0f0aa..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxdummy_8h-source.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxdummy.h</h1><a href="dmxdummy_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXDUMMY_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXDUMMY_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdummy_8c.html#a1">dmxDummyMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdummy_8c.html#a0">dmxDummyKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00043 
-00044 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html
index ca868f943..158731b70 100644
--- a/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8h.html
@@ -6,97 +6,95 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxdummy.h File Reference</h1>
-<p>
-<a href="dmxdummy_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdummy_8h.html#a0">dmxDummyMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxdummy_8h.html#a1">dmxDummyKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
+<p><a href="dmxdummy_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdummy_8h.html#a0d9cc243adf2eb5869b9ebcca9125bf4">dmxDummyMouGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxdummy_8h.html#a31bf72cac5b5327393423d49a437fc8b">dmxDummyKbdGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to dummy input device support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxdummy_8c.html">dmxdummy.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxdummy.h::dmxDummyKbdGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to dummy input device support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxdummy_8c.html">dmxdummy.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a31bf72cac5b5327393423d49a437fc8b"></a><!-- doxytag: member="dmxdummy.h::dmxDummyKbdGetInfo" ref="a31bf72cac5b5327393423d49a437fc8b" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDummyKbdGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxDummyKbdGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return information about the dummy keyboard device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. The keyboard is set up to have 1 valid key code that is <em>NoSymbol</em> </p>
 
-<p>
-Return information about the dummy keyboard device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. The keyboard is set up to have 1 valid key code that is <em>NoSymbol</em>     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxdummy.h::dmxDummyMouGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00093">_DMXLocalInitInfo::force</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0d9cc243adf2eb5869b9ebcca9125bf4"></a><!-- doxytag: member="dmxdummy.h::dmxDummyMouGetInfo" ref="a0d9cc243adf2eb5869b9ebcca9125bf4" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDummyMouGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxDummyMouGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return information about the dummy mouse device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. They mouse has 3 buttons and two axes. </p>
 
-<p>
-Return information about the dummy mouse device specified in <em>pDev</em> into the structure pointed to by <em>info</em>. They mouse has 3 buttons and two axes.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html
new file mode 100644
index 000000000..0eff00785
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxdummy_8h_source.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxdummy.h</h1><a href="dmxdummy_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXDUMMY_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXDUMMY_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdummy_8c.html#a0d9cc243adf2eb5869b9ebcca9125bf4">dmxDummyMouGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxdummy_8c.html#a31bf72cac5b5327393423d49a437fc8b">dmxDummyKbdGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00042"></a>00042 
+<a name="l00043"></a>00043 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8c.html b/xorg-server/hw/dmx/doc/html/dmxeq_8c.html
deleted file mode 100644
index ccf71b829..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxeq_8c.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxeq.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxeq_8h-source.html">dmxeq.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxdpms_8h-source.html">dmxdpms.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-<code>#include "XIproto.h"</code><br>
-<code>#include "extinit.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__Event.html">_Event</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html">_EventQueue</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a4">QUEUE_SIZE</a>&nbsp;&nbsp;&nbsp;256</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__Event.html">_Event</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a5">EventRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__Event.html">_Event</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a6">EventPtr</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__EventQueue.html">_EventQueue</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a7">EventQueueRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__EventQueue.html">_EventQueue</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a8">EventQueuePtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a13">dmxeqEnqueue</a> (xEvent *e)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a14">dmxeqSwitchScreen</a> (ScreenPtr pScreen, Bool fromDIX)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8c.html#a16">dmxeqProcessInputEvents</a> (void)</td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides an event queue that knows about XInput events. All of the code is based on mi/mieq.c and was modified as little as possible to provide XInput event support (the copyright and some of the comments are from The Open Group, Keith Packard, MIT X Consortium). (Another example of similar code is provided in hw/xfree86/common/xf86Xinput.c.)<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxeq.c::QUEUE_SIZE" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define QUEUE_SIZE&nbsp;&nbsp;&nbsp;256
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The size of our queue. (The queue provided by mi/mieq.c has a size of 256.)     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxeq.c::EventPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__Event.html">_Event</a> * <a class="el" href="struct__Event.html">EventPtr</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Information about the event.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxeq.c::EventQueuePtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__EventQueue.html">_EventQueue</a> * <a class="el" href="struct__EventQueue.html">EventQueuePtr</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxeq.c::EventQueueRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__EventQueue.html">_EventQueue</a>  <a class="el" href="struct__EventQueue.html">EventQueueRec</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Event queue.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxeq.c::EventRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__Event.html">_Event</a>  <a class="el" href="struct__Event.html">EventRec</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Information about the event.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a13" doxytag="dmxeq.c::dmxeqEnqueue" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxeqEnqueue </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">xEvent *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>e</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function adds an event to the end of the queue. If the event is an XInput event, then the next event (the valuator event) is also stored in the queue. If the new event has a time before the time of the last event currently on the queue, then the time is updated for the new event.<p>
-Must be reentrant with ProcessInputEvents. Assumption: dmxeqEnqueue will never be interrupted. If this is called from both signal handlers and regular code, make sure the signal is suspended when called from regular code.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxeq.c::dmxeqProcessInputEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxeqProcessInputEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called from <a class="el" href="dmxinput_8c.html#a2">ProcessInputEvents()</a> to remove events from the queue and process them.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxeq.c::dmxeqSwitchScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxeqSwitchScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>fromDIX</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make <em>pScreen</em> the new screen for enqueueing events. If <em>fromDIX</em> is TRUE, also make <em>pScreen</em> the new screen for dequeuing events.     </td>
-  </tr>
-</table>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html
deleted file mode 100644
index dc73d8e2a..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxeq_8h-source.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxeq.h</h1><a href="dmxeq_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00040 <span class="preprocessor">#ifndef _DMXEQ_H_</span>
-00041 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEQ_H_</span>
-00042 <span class="preprocessor"></span><span class="keyword">extern</span> Bool dmxeqInit(DevicePtr pKbd, DevicePtr pPtr);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxeq_8c.html#a16">dmxeqProcessInputEvents</a>(<span class="keywordtype">void</span>);
-00044 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxeq_8h.html b/xorg-server/hw/dmx/doc/html/dmxeq_8h.html
deleted file mode 100644
index 255528ce9..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxeq_8h.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxeq.h File Reference</h1>
-<p>
-<a href="dmxeq_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxeq_8h.html#a1">dmxeqProcessInputEvents</a> (void)</td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to the event queue support. Some of these functions are included in <a class="el" href="dmxinput_8h.html">dmxinput.h</a>, since they are used by top-level .c files. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxeq_8c.html">dmxeq.c</a> <p>
-<a class="el" href="dmxinput_8h.html">dmxinput.h</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxeq.h::dmxeqProcessInputEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxeqProcessInputEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called from <a class="el" href="dmxinput_8c.html#a2">ProcessInputEvents()</a> to remove events from the queue and process them.     </td>
-  </tr>
-</table>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8c.html b/xorg-server/hw/dmx/doc/html/dmxevents_8c.html
index 105749a00..ad24bc82a 100644
--- a/xorg-server/hw/dmx/doc/html/dmxevents_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxevents_8c.html
@@ -6,270 +6,1084 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxevents.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxevents_8h-source.html">dmxevents.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmotion_8h-source.html">dmxmotion.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxeq_8h-source.html">dmxeq.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsigio_8h-source.html">dmxsigio.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmap_8h-source.html">dmxmap.h</a>"</code><br>
-<code>#include "keysym.h"</code><br>
-<code>#include "opaque.h"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "XIstubs.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8c.html#a21">dmxGetGlobalPosition</a> (int *x, int *y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8c.html#a22">dmxInvalidateGlobalPosition</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8c.html#a23">dmxMotion</a> (DevicePtr pDev, int *v, int firstAxes, int axesCount, DMXMotionType type, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8c.html#a27">dmxEnqueue</a> (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8c.html#a28">dmxCheckSpecialKeys</a> (DevicePtr pDev, KeySym keySym)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxevents.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxevents_8h_source.html">dmxevents.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmotion_8h_source.html">dmxmotion.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsigio_8h_source.html">dmxsigio.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmap_8h_source.html">dmxmap.h</a>&quot;</code><br/>
+<code>#include &lt;X11/keysym.h&gt;</code><br/>
+<code>#include &quot;opaque.h&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;mi.h&quot;</code><br/>
+<code>#include &quot;exglobals.h&quot;</code><br/>
+<code>#include &quot;xkbsrv.h&quot;</code><br/>
+<code>#include &quot;XIstubs.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a21de6bc79e2465ef06f9bc1c3fb8071f">DMX_EVENTS_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#adf6865b0bc7ad370c94e3b8682262c13">DMXDBG0</a>(f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a302a2c9f84249eee79404eb601d085ab">DMXDBG1</a>(f, a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a1056d63499cee76ebe297c19637f2b79">DMXDBG2</a>(f, a, b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a6c6714b899194081b94edb722ca1c4bc">DMXDBG3</a>(f, a, b, c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a8ffd07ee80777c394a6ff32d1021347d">DMXDBG4</a>(f, a, b, c, d)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a753eef37715b6379d7d65e34a23d2e03">DMXDBG5</a>(f, a, b, c, d, e)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#af703e1a00a515e2507f7d2a354429a24">DMXDBG6</a>(f, a, b, c, d, e, g)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ab45c7f6cc47b2c786215ca0276d37d91">DMXDBG7</a>(f, a, b, c, d, e, g, h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>&nbsp;&nbsp;&nbsp;32</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a4424526939b87a780233ad69fdf26c62">EXTRACT_VALUATORS</a>(ke, valuators)</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a7a2de6e9697964a96939e03501fd5d29">dmxApplyFunctions</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a382acebe1e5e976d7edc31fc27fcdd6f">dmxCheckFunctionKeys</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int type, KeySym keySym)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a8bb7b5687d93b86df921eef6b7c28052">dmxFindFirstScreen</a> (int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ad423328e9c289737154464bd6830a1ad">enqueueMotion</a> (DevicePtr pDev, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> (DevicePtr pDev, int x, int y, int delta, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a8463e76279fff9479a552b69c4754273">dmxExtMotion</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int *v, int firstAxis, int axesCount, <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ae0083a2b1547708473cbc75ebf0006ae">dmxTranslateAndEnqueueExtEvent</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, XEvent *e, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ac8d5c0981946c42f016d4e839eb358e1">dmxGetButtonMapping</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int button)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a0cb75edbb0cabbfd89b40309907bdee3">dmxGetGlobalPosition</a> (int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a344419a01be02621ec99942c6cfd45ea">dmxInvalidateGlobalPosition</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ae08f1801d0215396a7f39bd083ddca11">dmxMotion</a> (DevicePtr pDev, int *v, int firstAxes, int axesCount, <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static KeySym&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a7e514e6fbb9cec592d987dd82cc5905b">dmxKeyCodeToKeySym</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, KeyCode keyCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static KeyCode&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a074632ff8623562fa5c99b19a629eb07">dmxKeySymToKeyCode</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, KeySym keySym, int tryFirst)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a76dff4df3c759055dfb6b74423868e9b">dmxFixup</a> (DevicePtr pDev, int detail, KeySym keySym)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#ac678be4d489b749fea88a8f0e9045499">dmxEnqueue</a> (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a082f21151ec3d66b75d4613a3612c755">dmxCheckSpecialKeys</a> (DevicePtr pDev, KeySym keySym)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a6f6d88e8d30622451b8e9fe4ba22c811">dmxGlobalX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#abbf8898981b5b2ac573e68e1a9386f08">dmxGlobalY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8c.html#a1ae34b930e721372a403fbbe2111a221">dmxGlobalInvalid</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide support and helper functions for enqueing events received by the low-level input drivers.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a28" doxytag="dmxevents.c::dmxCheckSpecialKeys" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide support and helper functions for enqueing events received by the low-level input drivers. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a21de6bc79e2465ef06f9bc1c3fb8071f"></a><!-- doxytag: member="dmxevents.c::DMX_EVENTS_DEBUG" ref="a21de6bc79e2465ef06f9bc1c3fb8071f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCheckSpecialKeys </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define DMX_EVENTS_DEBUG&nbsp;&nbsp;&nbsp;0</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a144e2f1a618a0d14e2c9ce4fda50104a"></a><!-- doxytag: member="dmxevents.c::DMX_MAX_AXES" ref="a144e2f1a618a0d14e2c9ce4fda50104a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define DMX_MAX_AXES&nbsp;&nbsp;&nbsp;32</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adf6865b0bc7ad370c94e3b8682262c13"></a><!-- doxytag: member="dmxevents.c::DMXDBG0" ref="adf6865b0bc7ad370c94e3b8682262c13" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a302a2c9f84249eee79404eb601d085ab"></a><!-- doxytag: member="dmxevents.c::DMXDBG1" ref="a302a2c9f84249eee79404eb601d085ab" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1056d63499cee76ebe297c19637f2b79"></a><!-- doxytag: member="dmxevents.c::DMXDBG2" ref="a1056d63499cee76ebe297c19637f2b79" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>KeySym&nbsp;</td>
-          <td class="mdname" nowrap> <em>keySym</em></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a6c6714b899194081b94edb722ca1c4bc"></a><!-- doxytag: member="dmxevents.c::DMXDBG3" ref="a6c6714b899194081b94edb722ca1c4bc" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxevents.c::dmxEnqueue" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8ffd07ee80777c394a6ff32d1021347d"></a><!-- doxytag: member="dmxevents.c::DMXDBG4" ref="a8ffd07ee80777c394a6ff32d1021347d" args="(f, a, b, c, d)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG4</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxEnqueue </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">d&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a753eef37715b6379d7d65e34a23d2e03"></a><!-- doxytag: member="dmxevents.c::DMXDBG5" ref="a753eef37715b6379d7d65e34a23d2e03" args="(f, a, b, c, d, e)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define DMXDBG5</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>detail</em>, </td>
+          <td class="paramtype">d, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af703e1a00a515e2507f7d2a354429a24"></a><!-- doxytag: member="dmxevents.c::DMXDBG6" ref="af703e1a00a515e2507f7d2a354429a24" args="(f, a, b, c, d, e, g)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG6</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>KeySym&nbsp;</td>
-          <td class="mdname" nowrap> <em>keySym</em>, </td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>XEvent *&nbsp;</td>
-          <td class="mdname" nowrap> <em>e</em>, </td>
+          <td class="paramtype">c, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">e, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="ab45c7f6cc47b2c786215ca0276d37d91"></a><!-- doxytag: member="dmxevents.c::DMXDBG7" ref="ab45c7f6cc47b2c786215ca0276d37d91" args="(f, a, b, c, d, e, g, h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMXDBG7</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">g, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">h&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Enqueue a non-motion event from the <em>pDev</em> device with the specified <em>type</em> and <em>detail</em>. If the event is a KeyPress or KeyRelease event, then the <em>keySym</em> is also specified.<p>
-If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <a class="el" href="dmxinput_8h.html#a24">dmxeqEnqueue()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxevents.c::dmxGetGlobalPosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a4424526939b87a780233ad69fdf26c62"></a><!-- doxytag: member="dmxevents.c::EXTRACT_VALUATORS" ref="a4424526939b87a780233ad69fdf26c62" args="(ke, valuators)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetGlobalPosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">#define EXTRACT_VALUATORS</td>
+          <td>(</td>
+          <td class="paramtype">ke, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">valuators&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">valuators[0]       = ke-&gt;axis_data[0]; \
+        valuators[1]       = ke-&gt;axis_data[1]; \
+        valuators[2]       = ke-&gt;axis_data[2]; \
+        valuators[3]       = ke-&gt;axis_data[3]; \
+        valuators[4]       = ke-&gt;axis_data[4]; \
+        valuators[5]       = ke-&gt;axis_data[5]; \
+</pre></div>
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a7a2de6e9697964a96939e03501fd5d29"></a><!-- doxytag: member="dmxevents.c::dmxApplyFunctions" ref="a7a2de6e9697964a96939e03501fd5d29" args="(DMXInputInfo *dmxInput, DMXFunctionType f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxApplyFunctions </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>&nbsp;</td>
+          <td class="paramname"> <em>f</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00221">_DMXLocalInputInfo::functions</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a382acebe1e5e976d7edc31fc27fcdd6f"></a><!-- doxytag: member="dmxevents.c::dmxCheckFunctionKeys" ref="a382acebe1e5e976d7edc31fc27fcdd6f" args="(DMXLocalInputInfoPtr dmxLocal, int type, KeySym keySym)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxCheckFunctionKeys </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return DMX's notion of the pointer position in the global coordinate space.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxevents.c::dmxInvalidateGlobalPosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00058">DMX_FUNCTION_FINE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00056">DMX_FUNCTION_GRAB</a>, <a class="el" href="dmxinputinit_8h_source.html#l00057">DMX_FUNCTION_TERMINATE</a>, <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>, <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00236">_DMXLocalInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a082f21151ec3d66b75d4613a3612c755"></a><!-- doxytag: member="dmxevents.c::dmxCheckSpecialKeys" ref="a082f21151ec3d66b75d4613a3612c755" args="(DevicePtr pDev, KeySym keySym)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInvalidateGlobalPosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCheckSpecialKeys </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned. </p>
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxcommon_8h_source.html#l00087">GETDMXINPUTFROMPDEV</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="adf2928cf693dab61adafad503e81d2dc"></a><!-- doxytag: member="dmxevents.c::dmxCoreMotion" ref="adf2928cf693dab61adafad503e81d2dc" args="(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCoreMotion </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>delta</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Invalidate the global position for #dmxCoreMotion.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxevents.c::dmxMotion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxevents_8c_source.html#l00064">dmxGlobalInvalid</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsigio_8c_source.html#l00087">dmxSigioBlock()</a>, <a class="el" href="dmxsigio_8c_source.html#l00097">dmxSigioUnblock()</a>, <a class="el" href="dmxevents_8c_source.html#l00174">enqueueMotion()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00209">_DMXLocalInputInfo::update_position</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac678be4d489b749fea88a8f0e9045499"></a><!-- doxytag: member="dmxevents.c::dmxEnqueue" ref="ac678be4d489b749fea88a8f0e9045499" args="(DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxEnqueue </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>detail</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>e</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Enqueue an event from the <em>pDev</em> device with the specified <em>type</em> and <em>detail</em>. If the event is a KeyPress or KeyRelease event, then the <em>keySym</em> is also specified.</p>
+<p>FIXME: make the code do what the comment says, or remove this comment. If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to dmxeqEnqueue(). </p>
+
+<p>References <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxlog_8c_source.html#l00307">dmxEventName()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, <a class="el" href="dmxevents_8c_source.html#l00520">dmxGetButtonMapping()</a>, <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxcommon_8h_source.html#l00087">GETDMXINPUTFROMPDEV</a>, <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>, and <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8463e76279fff9479a552b69c4754273"></a><!-- doxytag: member="dmxevents.c::dmxExtMotion" ref="a8463e76279fff9479a552b69c4754273" args="(DMXLocalInputInfoPtr dmxLocal, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxExtMotion </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>firstAxis</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMotion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>axesCount</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">DeviceMotionNotify</a>, <a class="el" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">DeviceValuator</a>, <a class="el" href="dmxevents_8c_source.html#l00280">DMX_MAX_AXES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxsigio_8c_source.html#l00087">dmxSigioBlock()</a>, <a class="el" href="dmxsigio_8c_source.html#l00097">dmxSigioUnblock()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00237">_DMXLocalInputInfo::lastX</a>, <a class="el" href="dmxinputinit_8h_source.html#l00237">_DMXLocalInputInfo::lastY</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00209">_DMXLocalInputInfo::update_position</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8bb7b5687d93b86df921eef6b7c28052"></a><!-- doxytag: member="dmxevents.c::dmxFindFirstScreen" ref="a8bb7b5687d93b86df921eef6b7c28052" args="(int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxFindFirstScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, and <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a76dff4df3c759055dfb6b74423868e9b"></a><!-- doxytag: member="dmxevents.c::dmxFixup" ref="a76dff4df3c759055dfb6b74423868e9b" args="(DevicePtr pDev, int detail, KeySym keySym)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxFixup </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>firstAxes</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>detail</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>axesCount</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>, <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxcommon_8h_source.html#l00084">GETDMXLOCALFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac8d5c0981946c42f016d4e839eb358e1"></a><!-- doxytag: member="dmxevents.c::dmxGetButtonMapping" ref="ac8d5c0981946c42f016d4e839eb358e1" args="(DMXLocalInputInfoPtr dmxLocal, int button)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxGetButtonMapping </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>button</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXMotionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0cb75edbb0cabbfd89b40309907bdee3"></a><!-- doxytag: member="dmxevents.c::dmxGetGlobalPosition" ref="a0cb75edbb0cabbfd89b40309907bdee3" args="(int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetGlobalPosition </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Return DMX's notion of the pointer position in the global coordinate space. </p>
+
+<p>References <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, and <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a344419a01be02621ec99942c6cfd45ea"></a><!-- doxytag: member="dmxevents.c::dmxInvalidateGlobalPosition" ref="a344419a01be02621ec99942c6cfd45ea" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxInvalidateGlobalPosition </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Invalidate the global position for <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a>. </p>
+
+<p>References <a class="el" href="dmxevents_8c_source.html#l00064">dmxGlobalInvalid</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7e514e6fbb9cec592d987dd82cc5905b"></a><!-- doxytag: member="dmxevents.c::dmxKeyCodeToKeySym" ref="a7e514e6fbb9cec592d987dd82cc5905b" args="(DMXLocalInputInfoPtr dmxLocal, KeyCode keyCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static KeySym dmxKeyCodeToKeySym </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeyCode&nbsp;</td>
+          <td class="paramname"> <em>keyCode</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Enqueue a motion event for <em>pDev</em>. The <em>v</em> vector has length <em>axesCount</em>, and contains values for each of the axes, starting at <em>firstAxes</em>.<p>
-The <em>type</em> of the motion may be <em>DMX_RELATIVE</em>, <em>DMX_ABSOLUTE</em>, or <em>DMX_ABSOLUTE_CONFINED</em> (in the latter case, the pointer will not be allowed to move outside the global boundaires).<p>
-If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <a class="el" href="dmxinput_8h.html#a24">dmxeqEnqueue()</a>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, and <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a074632ff8623562fa5c99b19a629eb07"></a><!-- doxytag: member="dmxevents.c::dmxKeySymToKeyCode" ref="a074632ff8623562fa5c99b19a629eb07" args="(DMXLocalInputInfoPtr dmxLocal, KeySym keySym, int tryFirst)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static KeyCode dmxKeySymToKeyCode </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>tryFirst</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00108">DMXDBG3</a>, <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae08f1801d0215396a7f39bd083ddca11"></a><!-- doxytag: member="dmxevents.c::dmxMotion" ref="ae08f1801d0215396a7f39bd083ddca11" args="(DevicePtr pDev, int *v, int firstAxes, int axesCount, DMXMotionType type, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxMotion </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>firstAxes</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>axesCount</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Enqueue a motion event for <em>pDev</em>. The <em>v</em> vector has length <em>axesCount</em>, and contains values for each of the axes, starting at <em>firstAxes</em>.</p>
+<p>The <em>type</em> of the motion may be <em>DMX_RELATIVE</em>, <em>DMX_ABSOLUTE</em>, or <em>DMX_ABSOLUTE_CONFINED</em> (in the latter case, the pointer will not be allowed to move outside the global boundaires).</p>
+<p>If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <em><a class="el" href="dmxevents_8c.html#ad423328e9c289737154464bd6830a1ad">enqueueMotion()</a></em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00078">DMX_ABSOLUTE_CONFINED</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>, and <a class="el" href="dmxcommon_8h_source.html#l00084">GETDMXLOCALFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0083a2b1547708473cbc75ebf0006ae"></a><!-- doxytag: member="dmxevents.c::dmxTranslateAndEnqueueExtEvent" ref="ae0083a2b1547708473cbc75ebf0006ae" args="(DMXLocalInputInfoPtr dmxLocal, XEvent *e, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxTranslateAndEnqueueExtEvent </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>e</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">ChangeDeviceNotify</a>, <a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">DeviceFocusIn</a>, <a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">DeviceFocusOut</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">DeviceMappingNotify</a>, <a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">DeviceStateNotify</a>, <a class="el" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">DeviceValuator</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>, <a class="el" href="dmxsigio_8c_source.html#l00087">dmxSigioBlock()</a>, <a class="el" href="dmxsigio_8c_source.html#l00097">dmxSigioUnblock()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxevents_8c.html#a4424526939b87a780233ad69fdf26c62">EXTRACT_VALUATORS</a>, <a class="el" href="dmxinputinit_8h_source.html#l00236">_DMXLocalInputInfo::inputIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>, <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad423328e9c289737154464bd6830a1ad"></a><!-- doxytag: member="dmxevents.c::enqueueMotion" ref="ad423328e9c289737154464bd6830a1ad" args="(DevicePtr pDev, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void enqueueMotion </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Enqueue a motion event. </p>
+
+<p>References <a class="el" href="dmxcommon_8h_source.html#l00084">GETDMXLOCALFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a1ae34b930e721372a403fbbe2111a221"></a><!-- doxytag: member="dmxevents.c::dmxGlobalInvalid" ref="a1ae34b930e721372a403fbbe2111a221" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxevents_8c.html#a1ae34b930e721372a403fbbe2111a221">dmxGlobalInvalid</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00541">dmxInvalidateGlobalPosition()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6f6d88e8d30622451b8e9fe4ba22c811"></a><!-- doxytag: member="dmxevents.c::dmxGlobalX" ref="a6f6d88e8d30622451b8e9fe4ba22c811" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxevents_8c.html#a6f6d88e8d30622451b8e9fe4ba22c811">dmxGlobalX</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, and <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abbf8898981b5b2ac573e68e1a9386f08"></a><!-- doxytag: member="dmxevents.c::dmxGlobalY" ref="abbf8898981b5b2ac573e68e1a9386f08" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxevents_8c.html#abbf8898981b5b2ac573e68e1a9386f08">dmxGlobalY</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00534">dmxGetGlobalPosition()</a>, and <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html
deleted file mode 100644
index ead3c2d9f..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxevents_8h-source.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxevents.h</h1><a href="dmxevents_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXEVENTS_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEVENTS_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#a23">dmxMotion</a>(DevicePtr pDev, <span class="keywordtype">int</span> *v, <span class="keywordtype">int</span> firstAxis, <span class="keywordtype">int</span> axesCount,
-00042                       DMXMotionType type, DMXBlockType block);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#a27">dmxEnqueue</a>(DevicePtr pDev, <span class="keywordtype">int</span> type, <span class="keywordtype">int</span> detail, KeySym keySym,
-00044                        XEvent *e, DMXBlockType block);
-00045 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxevents_8c.html#a28">dmxCheckSpecialKeys</a>(DevicePtr pDev, KeySym keySym);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#a22">dmxInvalidateGlobalPosition</a>(<span class="keywordtype">void</span>);
-00047 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h.html
index 2aa5910d1..bbf1da023 100644
--- a/xorg-server/hw/dmx/doc/html/dmxevents_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxevents_8h.html
@@ -6,219 +6,207 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxevents.h File Reference</h1>
-<p>
-<a href="dmxevents_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8h.html#a0">dmxMotion</a> (DevicePtr pDev, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8h.html#a1">dmxEnqueue</a> (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8h.html#a2">dmxCheckSpecialKeys</a> (DevicePtr pDev, KeySym keySym)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxevents_8h.html#a3">dmxInvalidateGlobalPosition</a> (void)</td></tr>
-
+<p><a href="dmxevents_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8h.html#ac96a9f0e7f2a31881224b4a8e620239a">dmxMotion</a> (DevicePtr pDev, int *v, int firstAxis, int axesCount, <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8h.html#ac678be4d489b749fea88a8f0e9045499">dmxEnqueue</a> (DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8h.html#a082f21151ec3d66b75d4613a3612c755">dmxCheckSpecialKeys</a> (DevicePtr pDev, KeySym keySym)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxevents_8h.html#a344419a01be02621ec99942c6cfd45ea">dmxInvalidateGlobalPosition</a> (void)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to event processing functions. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxevents_8h.html">dmxevents.h</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxevents.h::dmxCheckSpecialKeys" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to event processing functions. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxevents_8h.html">dmxevents.h</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a082f21151ec3d66b75d4613a3612c755"></a><!-- doxytag: member="dmxevents.h::dmxCheckSpecialKeys" ref="a082f21151ec3d66b75d4613a3612c755" args="(DevicePtr pDev, KeySym keySym)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCheckSpecialKeys </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">int dmxCheckSpecialKeys </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeySym&nbsp;</td>
-          <td class="mdname" nowrap> <em>keySym</em></td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned. </p>
 
-<p>
-A pointer to this routine is passed to low-level input drivers so that all special keychecking is unified to this file. This function returns 0 if no special keys have been pressed. If the user has requested termination of the DMX server, -1 is returned. If the user has requested a switch to a VT, then the (1-based) number of that VT is returned.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxevents.h::dmxEnqueue" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxcommon_8h_source.html#l00087">GETDMXINPUTFROMPDEV</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac678be4d489b749fea88a8f0e9045499"></a><!-- doxytag: member="dmxevents.h::dmxEnqueue" ref="ac678be4d489b749fea88a8f0e9045499" args="(DevicePtr pDev, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxEnqueue </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxEnqueue </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>detail</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>detail</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeySym&nbsp;</td>
-          <td class="mdname" nowrap> <em>keySym</em>, </td>
+          <td class="paramtype">KeySym&nbsp;</td>
+          <td class="paramname"> <em>keySym</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>XEvent *&nbsp;</td>
-          <td class="mdname" nowrap> <em>e</em>, </td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>e</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Enqueue an event from the <em>pDev</em> device with the specified <em>type</em> and <em>detail</em>. If the event is a KeyPress or KeyRelease event, then the <em>keySym</em> is also specified.</p>
+<p>FIXME: make the code do what the comment says, or remove this comment. If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to dmxeqEnqueue(). </p>
 
-<p>
-Enqueue a non-motion event from the <em>pDev</em> device with the specified <em>type</em> and <em>detail</em>. If the event is a KeyPress or KeyRelease event, then the <em>keySym</em> is also specified.<p>
-If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <a class="el" href="dmxinput_8h.html#a24">dmxeqEnqueue()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxevents.h::dmxInvalidateGlobalPosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxInvalidateGlobalPosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxcursor_8c_source.html#l00107">DMXDBG2</a>, <a class="el" href="dmxlog_8c_source.html#l00307">dmxEventName()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, <a class="el" href="dmxevents_8c_source.html#l00520">dmxGetButtonMapping()</a>, <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCoreKeyboard</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxcommon_8h_source.html#l00087">GETDMXINPUTFROMPDEV</a>, <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">ProximityIn</a>, and <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">ProximityOut</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a344419a01be02621ec99942c6cfd45ea"></a><!-- doxytag: member="dmxevents.h::dmxInvalidateGlobalPosition" ref="a344419a01be02621ec99942c6cfd45ea" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInvalidateGlobalPosition </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Invalidate the global position for <a class="el" href="dmxevents_8c.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a>. </p>
 
-<p>
-Invalidate the global position for #dmxCoreMotion.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxevents.h::dmxMotion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxevents_8c_source.html#l00064">dmxGlobalInvalid</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac96a9f0e7f2a31881224b4a8e620239a"></a><!-- doxytag: member="dmxevents.h::dmxMotion" ref="ac96a9f0e7f2a31881224b4a8e620239a" args="(DevicePtr pDev, int *v, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMotion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void dmxMotion </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>firstAxes</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>firstAxes</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>axesCount</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>axesCount</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXMotionType&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXBlockType&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Enqueue a motion event for <em>pDev</em>. The <em>v</em> vector has length <em>axesCount</em>, and contains values for each of the axes, starting at <em>firstAxes</em>.</p>
+<p>The <em>type</em> of the motion may be <em>DMX_RELATIVE</em>, <em>DMX_ABSOLUTE</em>, or <em>DMX_ABSOLUTE_CONFINED</em> (in the latter case, the pointer will not be allowed to move outside the global boundaires).</p>
+<p>If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <em><a class="el" href="dmxevents_8c.html#ad423328e9c289737154464bd6830a1ad">enqueueMotion()</a></em>. </p>
 
-<p>
-Enqueue a motion event for <em>pDev</em>. The <em>v</em> vector has length <em>axesCount</em>, and contains values for each of the axes, starting at <em>firstAxes</em>.<p>
-The <em>type</em> of the motion may be <em>DMX_RELATIVE</em>, <em>DMX_ABSOLUTE</em>, or <em>DMX_ABSOLUTE_CONFINED</em> (in the latter case, the pointer will not be allowed to move outside the global boundaires).<p>
-If <em>block</em> is set to <em>DMX_BLOCK</em>, then the SIGIO handler will be blocked around calls to <a class="el" href="dmxinput_8h.html#a24">dmxeqEnqueue()</a>.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00078">DMX_ABSOLUTE_CONFINED</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>, and <a class="el" href="dmxcommon_8h_source.html#l00084">GETDMXLOCALFROMPDEV</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html
new file mode 100644
index 000000000..7e430c086
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxevents_8h_source.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxevents.h</h1><a href="dmxevents_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXEVENTS_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEVENTS_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#ae08f1801d0215396a7f39bd083ddca11">dmxMotion</a>(DevicePtr pDev, <span class="keywordtype">int</span> *v, <span class="keywordtype">int</span> firstAxis, <span class="keywordtype">int</span> axesCount,
+<a name="l00041"></a>00041                       <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#ac678be4d489b749fea88a8f0e9045499">dmxEnqueue</a>(DevicePtr pDev, <span class="keywordtype">int</span> type, <span class="keywordtype">int</span> detail, KeySym keySym,
+<a name="l00043"></a>00043                        XEvent *e, <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxevents_8c.html#a082f21151ec3d66b75d4613a3612c755">dmxCheckSpecialKeys</a>(DevicePtr pDev, KeySym keySym);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxevents_8c.html#a344419a01be02621ec99942c6cfd45ea">dmxInvalidateGlobalPosition</a>(<span class="keywordtype">void</span>);
+<a name="l00046"></a>00046 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html
deleted file mode 100644
index e18f0f785..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxext_8h-source.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxext.h</h1><a href="dmxext_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00040 <span class="preprocessor">#ifndef _DMXEXT_H_</span>
-00041 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEXT_H_</span>
-00042 <span class="preprocessor"></span>
-00043 <span class="comment">/* These values must be larger than LastExtensionError.</span>
-00044 <span class="comment">   The values in dmxext.h and dmxproto.h *MUST* match. */</span>
-00045 <span class="preprocessor">#define DmxBadXinerama         1001</span>
-00046 <span class="preprocessor"></span><span class="preprocessor">#define DmxBadValue            1002</span>
-00047 <span class="preprocessor"></span><span class="preprocessor">#define DmxBadReply            1003</span>
-00048 <span class="preprocessor"></span>
-00049 <span class="preprocessor">#define DMXScreenWindowWidth   (1L&lt;&lt;0)</span>
-00050 <span class="preprocessor"></span><span class="preprocessor">#define DMXScreenWindowHeight  (1L&lt;&lt;1)</span>
-00051 <span class="preprocessor"></span><span class="preprocessor">#define DMXScreenWindowXoffset (1L&lt;&lt;2)</span>
-00052 <span class="preprocessor"></span><span class="preprocessor">#define DMXScreenWindowYoffset (1L&lt;&lt;3)</span>
-00053 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowWidth     (1L&lt;&lt;4)</span>
-00054 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowHeight    (1L&lt;&lt;5)</span>
-00055 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowXoffset   (1L&lt;&lt;6)</span>
-00056 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowYoffset   (1L&lt;&lt;7)</span>
-00057 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowXorigin   (1L&lt;&lt;8)</span>
-00058 <span class="preprocessor"></span><span class="preprocessor">#define DMXRootWindowYorigin   (1L&lt;&lt;9)</span>
-00059 <span class="preprocessor"></span>
-00060 <span class="preprocessor">#define DMXDesktopWidth        (1L&lt;&lt;0)</span>
-00061 <span class="preprocessor"></span><span class="preprocessor">#define DMXDesktopHeight       (1L&lt;&lt;1)</span>
-00062 <span class="preprocessor"></span><span class="preprocessor">#define DMXDesktopShiftX       (1L&lt;&lt;2)</span>
-00063 <span class="preprocessor"></span><span class="preprocessor">#define DMXDesktopShiftY       (1L&lt;&lt;3)</span>
-00064 <span class="preprocessor"></span>
-00065 <span class="preprocessor">#define DMXInputType           (1L&lt;&lt;0)</span>
-00066 <span class="preprocessor"></span><span class="preprocessor">#define DMXInputPhysicalScreen (1L&lt;&lt;1)</span>
-00067 <span class="preprocessor"></span><span class="preprocessor">#define DMXInputSendsCore      (1L&lt;&lt;2)</span>
-00068 <span class="preprocessor"></span>
-00069 <span class="preprocessor">#ifndef _DMX_SERVER_</span>
-00070 <span class="preprocessor"></span>
-<a name="l00073"></a><a class="code" href="structDMXScreenAttributes.html">00073</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00074     <span class="keywordtype">char</span>         *displayName;
-00075     <span class="keywordtype">int</span>          logicalScreen;
-00076 
-00077     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowWidth;    <span class="comment">/* displayName's coordinate system */</span>
-00078     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowHeight;   <span class="comment">/* displayName's coordinate system */</span>
-00079     <span class="keywordtype">int</span>          screenWindowXoffset;  <span class="comment">/* displayName's coordinate system */</span>
-00080     <span class="keywordtype">int</span>          screenWindowYoffset;  <span class="comment">/* displayName's coordinate system */</span>
-00081 
-00082     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowWidth;      <span class="comment">/* screenWindow's coordinate system */</span>
-00083     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowHeight;     <span class="comment">/* screenWindow's coordinate system */</span>
-00084     <span class="keywordtype">int</span>          rootWindowXoffset;    <span class="comment">/* screenWindow's coordinate system */</span>
-00085     <span class="keywordtype">int</span>          rootWindowYoffset;    <span class="comment">/* screenWindow's coordinate system */</span>
-00086 
-00087     <span class="keywordtype">int</span>          rootWindowXorigin;    <span class="comment">/* global coordinate system */</span>
-00088     <span class="keywordtype">int</span>          rootWindowYorigin;    <span class="comment">/* global coordinate system */</span>
-00089 } <a class="code" href="structDMXScreenAttributes.html">DMXScreenAttributes</a>;
-00090 
-<a name="l00093"></a><a class="code" href="structDMXWindowAttributes.html">00093</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00094     <span class="keywordtype">int</span>          screen;
-00095     Window       window;
-00096     XRectangle   pos, vis;
-00097 } <a class="code" href="structDMXWindowAttributes.html">DMXWindowAttributes</a>;
-00098 
-<a name="l00101"></a><a class="code" href="structDMXDesktopAttributes.html">00101</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00102     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> width;         <span class="comment">/* global coordinate system */</span>
-00103     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> height;        <span class="comment">/* global coordinate system */</span>
-00104     <span class="keywordtype">int</span>          shiftX;        <span class="comment">/* global coordinate system */</span>
-00105     <span class="keywordtype">int</span>          shiftY;        <span class="comment">/* global coordinate system */</span>
-00106 } <a class="code" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a>;
-00107 
-<a name="l00110"></a><a class="code" href="dmxext_8h.html#a41">00110</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00111     DMXLocalInputType,
-00112     DMXConsoleInputType,
-00113     DMXBackendInputType
-00114 } <a class="code" href="dmxext_8h.html#a41">DMXInputEnum</a>;
-00115 
-<a name="l00118"></a><a class="code" href="structDMXInputAttributes.html">00118</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00119     <a class="code" href="dmxext_8h.html#a41">DMXInputEnum</a> inputType;
-00120     <span class="keywordtype">int</span>          physicalScreen;
-00121     <span class="keywordtype">int</span>          physicalId;
-00122     Bool         isCore;
-00123     Bool         sendsCore;
-00124     <span class="keyword">const</span> <span class="keywordtype">char</span>   *name;
-00125     Bool         detached;
-00126 } <a class="code" href="structDMXInputAttributes.html">DMXInputAttributes</a>;
-00127 
-00128 _XFUNCPROTOBEGIN
-00129 
-00130 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a10">DMXQueryExtension</a>(Display *dpy,
-00131                               <span class="keywordtype">int</span> *event_basep, <span class="keywordtype">int</span> *error_basep);
-00132 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a11">DMXQueryVersion</a>(Display *dpy, <span class="keywordtype">int</span> *major_version,
-00133                             <span class="keywordtype">int</span> *minor_version, <span class="keywordtype">int</span> *patch_version);
-00134 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a12">DMXSync</a>(Display *dpy);
-00135 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a13">DMXForceWindowCreation</a>(Display *dpy, Window window);
-00136 
-00137 
-00138 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a14">DMXGetScreenCount</a>(Display *dpy, <span class="keywordtype">int</span> *screen_count);
-00139 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a15">DMXGetScreenAttributes</a>(Display *dpy,
-00140                                    <span class="keywordtype">int</span> screen,
-00141                                    <a class="code" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr);
-00142 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="lib_2dmx_2dmx_8c.html#a20">DMXChangeScreensAttributes</a>(Display *dpy,
-00143                                        <span class="keywordtype">int</span> screen_count,
-00144                                        <span class="keywordtype">int</span> *screens,
-00145                                        <span class="keywordtype">int</span> mask_count,
-00146                                        <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *masks,
-00147                                        <a class="code" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr, <span class="comment">/* vector */</span>
-00148                                        <span class="keywordtype">int</span> *error_screen);
-00149 
-00150 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a21">DMXAddScreen</a>(Display *dpy,
-00151                          <span class="keyword">const</span> <span class="keywordtype">char</span> *displayName,
-00152                          <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> mask,
-00153                          <a class="code" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr,
-00154                          <span class="keywordtype">int</span> *screen);
-00155 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a22">DMXRemoveScreen</a>(Display *dpy, <span class="keywordtype">int</span> screen);
-00156 
-00157 <span class="comment">/* Call DMXGetScreenWindowCount and allocate info to that size.  Pass</span>
-00158 <span class="comment"> * the size in available_count.  This call can generate a large amount</span>
-00159 <span class="comment"> * of wire traffic and should not be used called with available_count=0</span>
-00160 <span class="comment"> * just to determine the screen_count value -- use DMXGetScreenCount</span>
-00161 <span class="comment"> * instead.  NOTE: Also see DMX protocol specification (DMXSpec.txt) for</span>
-00162 <span class="comment"> * usage of DMXSync to flush pending commands. */</span>
-00163 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a23">DMXGetWindowAttributes</a>(Display *dpy, Window window,
-00164                                    <span class="keywordtype">int</span> *screen_count, <span class="keywordtype">int</span> available_count,
-00165                                    <a class="code" href="structDMXWindowAttributes.html">DMXWindowAttributes</a> *attr);
-00166 
-00167 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a24">DMXGetDesktopAttributes</a>(Display *dpy, <a class="code" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr);
-00168 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="lib_2dmx_2dmx_8c.html#a27">DMXChangeDesktopAttributes</a>(Display *dpy,
-00169                                        <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> mask,
-00170                                        <a class="code" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr);
-00171 
-00172 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a28">DMXGetInputCount</a>(Display *dpy, <span class="keywordtype">int</span> *input_count);
-00173 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a29">DMXGetInputAttributes</a>(Display *dpy, <span class="keywordtype">int</span> id,
-00174                                   <a class="code" href="structDMXInputAttributes.html">DMXInputAttributes</a> *attr);
-00175 
-00176 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a>(Display *dpy,
-00177                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> mask,
-00178                         <a class="code" href="structDMXInputAttributes.html">DMXInputAttributes</a> *attr,
-00179                         <span class="keywordtype">int</span> *id);
-00180 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a33">DMXRemoveInput</a>(Display *dpy, <span class="keywordtype">int</span> id);
-00181 
-00182 <span class="comment">/* These are helper functions that call DMXAddInput. */</span>
-00183 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a31">DMXAddBackendInput</a>(Display *dpy, <span class="keywordtype">int</span> screen, <span class="keywordtype">int</span> sendsCore,
-00184                                <span class="keywordtype">int</span> *newId);
-00185 <span class="keyword">extern</span> Bool <a class="code" href="lib_2dmx_2dmx_8c.html#a32">DMXAddConsoleInput</a>(Display *dpy, <span class="keyword">const</span> <span class="keywordtype">char</span> *name, <span class="keywordtype">int</span> sendsCore,
-00186                                <span class="keywordtype">int</span> *newId);
-00187 
-00188 _XFUNCPROTOEND
-00189 <span class="preprocessor">#endif</span>
-00190 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxext_8h.html b/xorg-server/hw/dmx/doc/html/dmxext_8h.html
deleted file mode 100644
index eb143283f..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxext_8h.html
+++ /dev/null
@@ -1,926 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxext.h File Reference</h1>
-<p>
-<a href="dmxext_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a></td></tr>
-
-<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a41">DMXInputEnum</a> </td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>_XFUNCPROTOBEGIN Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a23">DMXQueryExtension</a> (Display *dpy, int *event_basep, int *error_basep)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a24">DMXQueryVersion</a> (Display *dpy, int *major_version, int *minor_version, int *patch_version)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a25">DMXSync</a> (Display *dpy)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a26">DMXForceWindowCreation</a> (Display *dpy, Window window)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a27">DMXGetScreenCount</a> (Display *dpy, int *screen_count)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a28">DMXGetScreenAttributes</a> (Display *dpy, int screen, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a29">DMXChangeScreensAttributes</a> (Display *dpy, int screen_count, int *screens, int mask_count, unsigned int *masks, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr, int *error_screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a30">DMXAddScreen</a> (Display *dpy, const  char *displayName, unsigned int mask, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr, int *screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a31">DMXRemoveScreen</a> (Display *dpy, int screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a32">DMXGetWindowAttributes</a> (Display *dpy, Window window, int *screen_count, int available_count, <a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a33">DMXGetDesktopAttributes</a> (Display *dpy, <a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a34">DMXChangeDesktopAttributes</a> (Display *dpy, unsigned int mask, <a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a35">DMXGetInputCount</a> (Display *dpy, int *input_count)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a36">DMXGetInputAttributes</a> (Display *dpy, int id, <a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a37">DMXAddInput</a> (Display *dpy, unsigned int mask, <a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *attr, int *id)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a38">DMXRemoveInput</a> (Display *dpy, int id)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a39">DMXAddBackendInput</a> (Display *dpy, int screen, int sendsCore, int *newId)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxext_8h.html#a40">DMXAddConsoleInput</a> (Display *dpy, const  char *name, int sendsCore, int *newId)</td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file describes the interface to the client-side libdmx.a library. All DMX-aware client-side applications should include this file.<hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a41" doxytag="dmxext.h::DMXInputEnum" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> enum <a class="el" href="dmxext_8h.html#a41">DMXInputEnum</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Enumeration for the #inputType field in the <a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> structure.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a39" doxytag="dmxext.h::DMXAddBackendInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddBackendInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sendsCore</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>newId</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add backend input (a helper function that calls <a class="el" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a40" doxytag="dmxext.h::DMXAddConsoleInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddConsoleInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sendsCore</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>newId</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add console input (a helper function that calls <a class="el" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a37" doxytag="dmxext.h::DMXAddInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add input.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="dmxext.h::DMXAddScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>displayName</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add a screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a34" doxytag="dmxext.h::DMXChangeDesktopAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int DMXChangeDesktopAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the global bounding box and origin offset.<p>
-Available in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxext.h::DMXChangeScreensAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int DMXChangeScreensAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screens</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>masks</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attrs</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>error_screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change geometries and positions of the DMX screen and root windows on the back-end X server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxext.h::DMXForceWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXForceWindowCreation </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>Window&nbsp;</td>
-          <td class="mdname" nowrap> <em>window</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The creation of the specified <em>window</em> will be forced.<p>
-Available in DMX Protocol Version 1.2 Reply added in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="dmxext.h::DMXGetDesktopAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetDesktopAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetDesktopAttributes protocol request returns information correctly, the information will be placed in <em>attr</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a36" doxytag="dmxext.h::DMXGetInputAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetInputAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>inf</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetInputAttributes protocol request returns information about the input device with the specified <em>id</em>, information about the input device will be placed in <em>inf</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.1     </td>
-  </tr>
-</table>
-<a class="anchor" name="a35" doxytag="dmxext.h::DMXGetInputCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetInputCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>input_count</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetInputCount protocol request returns the input count, the value will be placed in <em>input_count</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.1     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxext.h::DMXGetScreenAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetScreenAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>physical_screen</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetScreenAttributes protocol request returns information for the specified <em>physical_screen</em>, information about the screen will be placed in <em>attr</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0; Modified in Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxext.h::DMXGetScreenCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetScreenCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetScreenCount protocol request returns the screen count, the value will be placed in <em>screen_count</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="dmxext.h::DMXGetWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>Window&nbsp;</td>
-          <td class="mdname" nowrap> <em>window</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>available_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>inf</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetWindowAttributes protocol request returns information about the specified <em>window</em>, the number of screens for which information is available will be returned in <em>screen_count</em> and information about the first <em>available_count</em> of those screens will be placed in <em>inf</em>. Because this call transports a great deal of information over the wire, please call <a class="el" href="lib_2dmx_2dmx_8c.html#a14">DMXGetScreenCount</a> first, and make sure <em>inf</em> is that large.<p>
-Note that if the specified <em>window</em> has not yet been mapped when <a class="el" href="lib_2dmx_2dmx_8c.html#a23">DMXGetWindowAttributes</a> is called, then a subsequent XMapWindow call might be buffered in xlib while requests directly to the back-end X servers are processed. This race condition can be solved by calling <a class="el" href="lib_2dmx_2dmx_8c.html#a12">DMXSync</a> before talking directly to the back-end X servers.<p>
-Available in DMX Protocol Version 1.0, but not working correctly until DMX Protocol Version 1.4     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxext.h::DMXQueryExtension" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> _XFUNCPROTOBEGIN Bool DMXQueryExtension </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>event_basep</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>error_basep</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the server has the DMX extension, the event and error bases will be placed in <em>event_basep</em> and <em>error_basep</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxext.h::DMXQueryVersion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXQueryVersion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>majorVersion</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>minorVersion</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>patchVersion</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXQueryVersion protocol request returns version information from the server, <em>majorVersion</em>, <em>minorVersion</em>, and <em>patchVersion</em> are filled in with the appropriate information and True is returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a38" doxytag="dmxext.h::DMXRemoveInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXRemoveInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove an input.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a31" doxytag="dmxext.h::DMXRemoveScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXRemoveScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove a screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxext.h::DMXSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dpy</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Flush all pending dmxSync requests in DMX server.<p>
-Available in DMX Protocol Version 1.5     </td>
-  </tr>
-</table>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
index 6bcf8f133..fe4cbcd9c 100644
--- a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
@@ -6,419 +6,841 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxextension.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinit_8h-source.html">dmxinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgc_8h-source.html">dmxgc.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxscrinit_8h-source.html">dmxscrinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">input/dmxinputinit.h</a>"</code><br>
-<code>#include "windowstr.h"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>"</code><br>
-<code>#include "cursorstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a1">dmxGetScreenAttributes</a> (int physical, DMXScreenAttributesPtr attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a2">dmxGetWindowAttributes</a> (WindowPtr pWindow, DMXWindowAttributesPtr attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a4">dmxGetInputCount</a> (void)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxextension.c File Reference</h1><code>#include &lt;stdlib.h&gt;</code><br/>
+<code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinit_8h_source.html">dmxinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgc_8h_source.html">dmxgc.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxscrinit_8h_source.html">dmxscrinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">input/dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/dmxproto.h&gt;</code><br/>
+<code>#include &quot;cursorstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#ab4180bb82b058d071e2f72c2e18534b7">dmxGetScreenAttributes</a> (int physical, <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a81cd222e07016da8ee5c87c44a03312a">dmxGetWindowAttributes</a> (WindowPtr pWindow, <a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a314e23c5608a9bdaa5f8b8846f7458fc">dmxGetDesktopAttributes</a> (<a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a7e2b64de1aef77d43ee78d3a8187f651">dmxGetInputCount</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a3bde3bbb52470b5eb185805d861e6216">dmxGetInputAttributes</a> (int deviceId, <a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a2bf59b5de92ff76381543139f7b2c8fa">dmxAdjustCursorBoundaries</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a6b0b38eb49c6be097a59dbcdd6dacb51">dmxAddInput</a> (<a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a> attr, int *id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a6125541332383040aa07fa1ef310d38d">dmxRemoveInput</a> (int id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a1317039ecdb6f4eca7c1e5cea884657e">dmxGetNumScreens</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a1780283a6dd8f6d66e802b0c9b916f48">dmxForceWindowCreation</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#af7927d9de14425779c5de40312407203">dmxFlushPendingSyncs</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a602b3c05cd619a8b00d91315009ebc5d">dmxUpdateScreenResources</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a335fb276d4398515aa93ed1b3652dfd5">dmxBECreateScratchGCs</a> (int scrnNum)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a8c94ba784e540d8a5fba70373f1167f4">dmxBERestorePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a6ce8486d2aa17ed2ca5375b127b6189f">dmxBECreateResources</a> (pointer value, XID id, RESTYPE type, pointer n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a3d9d96382bf12f21023b8983412073ac">dmxBECreateWindowTree</a> (int idx)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#afa9f0ee11cd56a66fe5925a283c18188">dmxForceExposures</a> (int idx)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#abeb7f9d39d2cfa3b57c7ab9942fcea69">dmxCompareScreens</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *new, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *old)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a83d7548ed24086d9fb08866ec94735e2">dmxBERestoreRenderPict</a> (pointer value, XID id, pointer n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a8b7fceafa86db60728ce58fd33f2a646">dmxBERestoreRenderGlyph</a> (pointer value, XID id, pointer n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a3962840388f9bcf96fb17294a413d8cb">dmxAttachScreen</a> (int idx, <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a3dee225e6bc7fa7f8684ebc5b4f96884">dmxBESavePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#aaf05373ce6271205b865799a1c2a588f">dmxBEDestroyResources</a> (pointer value, XID id, RESTYPE type, pointer n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#ada568e54996488fca996405eb68c1b8b">dmxBEDestroyScratchGCs</a> (int scrnNum)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a30620fb306cff3ee44d6de43aa97346a">dmxBEDestroyWindowTree</a> (int idx)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a027f2cb3fe32b06f3ca3b04df8336299">dmxDetachScreen</a> (int idx)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">FontPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">defaultFont</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides the only interface to the X server extension support in programs/Xserver/Xext. Those programs should only include dmxext.h </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6b0b38eb49c6be097a59dbcdd6dacb51"></a><!-- doxytag: member="dmxextension.c::dmxAddInput" ref="a6b0b38eb49c6be097a59dbcdd6dacb51" args="(DMXInputAttributesPtr attr, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxAddInput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Add an input with the specified attributes. If the input is added, the physical id is returned in <em>deviceId</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a5">dmxGetInputAttributes</a> (int deviceId, DMXInputAttributesPtr attr)</td></tr>
+<p>References <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxextension_8h_source.html#l00082">DMXInputAttributesRec::inputType</a>, <a class="el" href="dmxextension_8h_source.html#l00081">DMXInputAttributesRec::name</a>, <a class="el" href="dmxextension_8h_source.html#l00083">DMXInputAttributesRec::physicalScreen</a>, and <a class="el" href="dmxextension_8h_source.html#l00086">DMXInputAttributesRec::sendsCore</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a7">dmxAddInput</a> (DMXInputAttributesPtr attr, int *id)</td></tr>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00815">ProcDMXAddInput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a8">dmxRemoveInput</a> (int id)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a2bf59b5de92ff76381543139f7b2c8fa"></a><!-- doxytag: member="dmxextension.c::dmxAdjustCursorBoundaries" ref="a2bf59b5de92ff76381543139f7b2c8fa" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxAdjustCursorBoundaries </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reinitialized the cursor boundaries. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned long&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a9">dmxGetNumScreens</a> (void)</td></tr>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxcb_8h_source.html#l00047">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00950">dmxInputLateReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00937">dmxInputReInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a10">dmxForceWindowCreation</a> (WindowPtr pWindow)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a11">dmxFlushPendingSyncs</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a3962840388f9bcf96fb17294a413d8cb"></a><!-- doxytag: member="dmxextension.c::dmxAttachScreen" ref="a3962840388f9bcf96fb17294a413d8cb" args="(int idx, DMXScreenAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxAttachScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reattach previously detached back-end screen. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a18">dmxAttachScreen</a> (int idx, DMXScreenAttributesPtr attr)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">defaultFont</a>, <a class="el" href="dmxextension_8h_source.html#l00045">DMXScreenAttributesRec::displayName</a>, <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00677">dmxBECreateScratchGCs()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00476">dmxCheckForWM()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxextension_8h.html#a63c06d493f7fbe70e235c97a622efca9">dmxConfigureScreenWindows()</a>, <a class="el" href="dmxextension_8c_source.html#l00986">dmxForceExposures()</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00204">dmxSetErrorHandler()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8c.html#a23">dmxDetachScreen</a> (int idx)</td></tr>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides the only interface to the X server extension support in programs/Xserver/Xext. Those programs should only include <a class="el" href="dmxext_8h.html">dmxext.h</a><hr><h2>Function Documentation</h2>
-<a class="anchor" name="a7" doxytag="dmxextension.c::dmxAddInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a6ce8486d2aa17ed2ca5375b127b6189f"></a><!-- doxytag: member="dmxextension.c::dmxBECreateResources" ref="a6ce8486d2aa17ed2ca5375b127b6189f" args="(pointer value, XID id, RESTYPE type, pointer n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxAddInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DMXInputAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
+          <td class="memname">static void dmxBECreateResources </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">XID&nbsp;</td>
+          <td class="paramname"> <em>id</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">RESTYPE&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create resources on the back-end server. This function is called from <a class="el" href="dmxextension_8c.html#a3962840388f9bcf96fb17294a413d8cb">dmxAttachScreen()</a> via the dix layer's FindAllResources function. It walks all resources, compares them to the screen number passed in as <em>n</em> and calls the appropriate DMX function to create the associated resource on the back-end server. </p>
+
+<p>References <a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">defaultFont</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, and <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a335fb276d4398515aa93ed1b3652dfd5"></a><!-- doxytag: member="dmxextension.c::dmxBECreateScratchGCs" ref="a335fb276d4398515aa93ed1b3652dfd5" args="(int scrnNum)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBECreateScratchGCs </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnNum</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add an input with the specified attributes. If the input is added, the physical id is returned in <em>deviceId</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxextension.c::dmxAttachScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create the scratch GCs per depth. </p>
+
+<p>References <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3d9d96382bf12f21023b8983412073ac"></a><!-- doxytag: member="dmxextension.c::dmxBECreateWindowTree" ref="a3d9d96382bf12f21023b8983412073ac" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBECreateWindowTree </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create window hierachy on back-end server. The window tree is created in a special order (bottom most subwindow first) so that the <a class="el" href="dmxwindow_8c.html#a85749ac991a90590437409977222d827">dmxCreateNonRootWindow()</a> function does not need to recursively call itself to create each window's parents. This is required so that we have the opportunity to create each window's border and background pixmaps (where appropriate) before the window is created. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00049">_dmxWinPriv::cmap</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, <a class="el" href="dmx_8h_source.html#l00141">_DMXScreenInfo::rootWin</a>, <a class="el" href="dmxwindow_8h_source.html#l00050">_dmxWinPriv::visual</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaf05373ce6271205b865799a1c2a588f"></a><!-- doxytag: member="dmxextension.c::dmxBEDestroyResources" ref="aaf05373ce6271205b865799a1c2a588f" args="(pointer value, XID id, RESTYPE type, pointer n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxAttachScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="memname">static void dmxBEDestroyResources </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">XID&nbsp;</td>
+          <td class="paramname"> <em>id</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DMXScreenAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td class="paramtype">RESTYPE&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reattach previously detached back-end screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxextension.c::dmxDetachScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy resources on the back-end server. This function is called from <a class="el" href="dmxextension_8c.html#a027f2cb3fe32b06f3ca3b04df8336299">dmxDetachScreen()</a> via the dix layer's FindAllResources function. It walks all resources, compares them to the screen number passed in as <em>n</em> and calls the appropriate DMX function to free the associated resource on the back-end server. </p>
+
+<p>References <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, and <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ada568e54996488fca996405eb68c1b8b"></a><!-- doxytag: member="dmxextension.c::dmxBEDestroyScratchGCs" ref="ada568e54996488fca996405eb68c1b8b" args="(int scrnNum)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxDetachScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxBEDestroyScratchGCs </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>scrnNum</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy the scratch GCs that are created per depth. </p>
 
+<p>References <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a30620fb306cff3ee44d6de43aa97346a"></a><!-- doxytag: member="dmxextension.c::dmxBEDestroyWindowTree" ref="a30620fb306cff3ee44d6de43aa97346a" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBEDestroyWindowTree </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detach back-end screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxextension.c::dmxFlushPendingSyncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy window hierachy on back-end server. To ensure that all XDestroyWindow() calls succeed, they must be performed in a bottom up order so that windows are not destroyed before their children. XDestroyWindow(), which is called from <a class="el" href="dmxwindow_8c.html#a978ad158f0c814ca10dc965c5f7b74c2">dmxBEDestroyWindow()</a>, will destroy a window as well as all of it's children. </p>
+
+<p>References <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, and <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8c94ba784e540d8a5fba70373f1167f4"></a><!-- doxytag: member="dmxextension.c::dmxBERestorePixmap" ref="a8c94ba784e540d8a5fba70373f1167f4" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFlushPendingSyncs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxBERestorePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Restore the pixmap image either from another screen or from an image that was saved when the screen was previously detached. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>, and <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a8b7fceafa86db60728ce58fd33f2a646"></a><!-- doxytag: member="dmxextension.c::dmxBERestoreRenderGlyph" ref="a8b7fceafa86db60728ce58fd33f2a646" args="(pointer value, XID id, pointer n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBERestoreRenderGlyph </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XID&nbsp;</td>
+          <td class="paramname"> <em>id</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Flush pending syncs for all screens.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxextension.c::dmxForceWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Restore Render's glyphs </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>, and <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a83d7548ed24086d9fb08866ec94735e2"></a><!-- doxytag: member="dmxextension.c::dmxBERestoreRenderPict" ref="a83d7548ed24086d9fb08866ec94735e2" args="(pointer value, XID id, pointer n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxForceWindowCreation </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxBERestoreRenderPict </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XID&nbsp;</td>
+          <td class="paramname"> <em>id</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Restore Render's picture </p>
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, and <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a3dee225e6bc7fa7f8684ebc5b4f96884"></a><!-- doxytag: member="dmxextension.c::dmxBESavePixmap" ref="a3dee225e6bc7fa7f8684ebc5b4f96884" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBESavePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make sure that <a class="el" href="dmxwindow_8h.html#a14">dmxCreateAndRealizeWindow</a> has been called for <em>pWindow</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxextension.c::dmxGetInputAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Save the pixmap image only when there is not another screen with that pixmap from which the image can be read when the screen is reattached. To do this, we first try to find a pixmap on another screen corresponding to the one we are trying to save. If we find one, then we do not need to save the image data since during reattachment, the image data can be read from that other pixmap. However, if we do not find one, then we need to save the image data. The common case for these are for the default stipple and root tile. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abeb7f9d39d2cfa3b57c7ab9942fcea69"></a><!-- doxytag: member="dmxextension.c::dmxCompareScreens" ref="abeb7f9d39d2cfa3b57c7ab9942fcea69" args="(DMXScreenInfo *new, DMXScreenInfo *old)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxGetInputAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>deviceId</em>, </td>
+          <td class="memname">static Bool dmxCompareScreens </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>new</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXInputAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>old</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Compare the new and old screens to see if they are compatible. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a027f2cb3fe32b06f3ca3b04df8336299"></a><!-- doxytag: member="dmxextension.c::dmxDetachScreen" ref="a027f2cb3fe32b06f3ca3b04df8336299" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxDetachScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return information about the device with id = <em>deviceId</em>. This information is primarily for the <a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html#a58">ProcDMXGetInputAttributes()</a> function, which does not have access to the appropriate data structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxextension.c::dmxGetInputCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Detach back-end screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01506">dmxBEDestroyScratchGCs()</a>, <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00513">ProcDMXRemoveScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af7927d9de14425779c5de40312407203"></a><!-- doxytag: member="dmxextension.c::dmxFlushPendingSyncs" ref="af7927d9de14425779c5de40312407203" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxGetInputCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxFlushPendingSyncs </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Flush pending syncs for all screens. </p>
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>, <a class="el" href="dmx_8c_source.html#l00602">ProcDMXGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00241">ProcDMXSync()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="afa9f0ee11cd56a66fe5925a283c18188"></a><!-- doxytag: member="dmxextension.c::dmxForceExposures" ref="afa9f0ee11cd56a66fe5925a283c18188" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxForceExposures </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the total number of devices, not just <a class="el" href="dmxinput_8h.html#a4">dmxNumInputs</a>. The number returned should be the same as that returned by XListInputDevices.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxextension.c::dmxGetNumScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1780283a6dd8f6d66e802b0c9b916f48"></a><!-- doxytag: member="dmxextension.c::dmxForceWindowCreation" ref="a1780283a6dd8f6d66e802b0c9b916f48" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> unsigned long dmxGetNumScreens </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxForceWindowCreation </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make sure that <a class="el" href="dmxwindow_8h.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow</a> has been called for <em>pWindow</em>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a314e23c5608a9bdaa5f8b8846f7458fc"></a><!-- doxytag: member="dmxextension.c::dmxGetDesktopAttributes" ref="a314e23c5608a9bdaa5f8b8846f7458fc" args="(DMXDesktopAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetDesktopAttributes </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the value of <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a> -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxextension.c::dmxGetScreenAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00074">DMXDesktopAttributesRec::height</a>, <a class="el" href="dmxextension_8h_source.html#l00075">DMXDesktopAttributesRec::shiftX</a>, <a class="el" href="dmxextension_8h_source.html#l00076">DMXDesktopAttributesRec::shiftY</a>, and <a class="el" href="dmxextension_8h_source.html#l00073">DMXDesktopAttributesRec::width</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00714">ProcDMXChangeDesktopAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3bde3bbb52470b5eb185805d861e6216"></a><!-- doxytag: member="dmxextension.c::dmxGetInputAttributes" ref="a3bde3bbb52470b5eb185805d861e6216" args="(int deviceId, DMXInputAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxGetScreenAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>physical</em>, </td>
+          <td class="memname">int dmxGetInputAttributes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>deviceId</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXScreenAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Return information about the device with id = <em>deviceId</em>. This information is primarily for the <a class="el" href="dmx_8c.html#accc76dc52a070ec95d7330357645d175">ProcDMXGetInputAttributes()</a> function, which does not have access to the appropriate data structure. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxextension_8h_source.html#l00087">DMXInputAttributesRec::detached</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00071">DMX_LOCAL_TYPE_BACKEND</a>, <a class="el" href="dmxinputinit_8h_source.html#l00072">DMX_LOCAL_TYPE_COMMON</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00069">DMX_LOCAL_TYPE_LOCAL</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxextension_8h_source.html#l00082">DMXInputAttributesRec::inputType</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxextension_8h_source.html#l00085">DMXInputAttributesRec::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxextension_8h_source.html#l00081">DMXInputAttributesRec::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxextension_8h_source.html#l00084">DMXInputAttributesRec::physicalId</a>, <a class="el" href="dmxextension_8h_source.html#l00083">DMXInputAttributesRec::physicalScreen</a>, <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxextension_8h_source.html#l00086">DMXInputAttributesRec::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7e2b64de1aef77d43ee78d3a8187f651"></a><!-- doxytag: member="dmxextension.c::dmxGetInputCount" ref="a7e2b64de1aef77d43ee78d3a8187f651" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int dmxGetInputCount </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Return the total number of devices, not just <a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a>. The number returned should be the same as that returned by XListInputDevices. </p>
 
+<p>References <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, and <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmx_8c_source.html#l00757">ProcDMXGetInputCount()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1317039ecdb6f4eca7c1e5cea884657e"></a><!-- doxytag: member="dmxextension.c::dmxGetNumScreens" ref="a1317039ecdb6f4eca7c1e5cea884657e" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long dmxGetNumScreens </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine provides information to the DMX protocol extension about a particular screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxextension.c::dmxGetWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return the value of <a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a> -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays). </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00312">ProcDMXGetScreenCount()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab4180bb82b058d071e2f72c2e18534b7"></a><!-- doxytag: member="dmxextension.c::dmxGetScreenAttributes" ref="ab4180bb82b058d071e2f72c2e18534b7" args="(int physical, DMXScreenAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxGetWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">Bool dmxGetScreenAttributes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>physical</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXWindowAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine provides information to the DMX protocol extension about a particular screen. </p>
+
+<p>References <a class="el" href="dmxextension_8h_source.html#l00045">DMXScreenAttributesRec::displayName</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxextension_8h_source.html#l00046">DMXScreenAttributesRec::logicalScreen</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00054">DMXScreenAttributesRec::rootWindowHeight</a>, <a class="el" href="dmxextension_8h_source.html#l00053">DMXScreenAttributesRec::rootWindowWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00055">DMXScreenAttributesRec::rootWindowXoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00058">DMXScreenAttributesRec::rootWindowXorigin</a>, <a class="el" href="dmxextension_8h_source.html#l00056">DMXScreenAttributesRec::rootWindowYoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00059">DMXScreenAttributesRec::rootWindowYorigin</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmxextension_8h_source.html#l00049">DMXScreenAttributesRec::screenWindowHeight</a>, <a class="el" href="dmxextension_8h_source.html#l00048">DMXScreenAttributesRec::screenWindowWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00050">DMXScreenAttributesRec::screenWindowXoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00051">DMXScreenAttributesRec::screenWindowYoffset</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>, <a class="el" href="dmx_8c_source.html#l00389">ProcDMXChangeScreensAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a81cd222e07016da8ee5c87c44a03312a"></a><!-- doxytag: member="dmxextension.c::dmxGetWindowAttributes" ref="a81cd222e07016da8ee5c87c44a03312a" args="(WindowPtr pWindow, DMXWindowAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">Bool dmxGetWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype"><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine provides information to the DMX protocol extension about a particular window. </p>
 
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, <a class="el" href="dmxextension_8h_source.html#l00066">DMXWindowAttributesRec::pos</a>, <a class="el" href="dmxextension_8h_source.html#l00064">DMXWindowAttributesRec::screen</a>, <a class="el" href="dmxextension_8h_source.html#l00067">DMXWindowAttributesRec::vis</a>, <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>, and <a class="el" href="dmxextension_8h_source.html#l00065">DMXWindowAttributesRec::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6125541332383040aa07fa1ef310d38d"></a><!-- doxytag: member="dmxextension.c::dmxRemoveInput" ref="a6125541332383040aa07fa1ef310d38d" args="(int id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxRemoveInput </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine provides information to the DMX protocol extension about a particular window.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxextension.c::dmxRemoveInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Remove the input with physical id <em>id</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l01209">dmxInputDetachId()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00866">ProcDMXRemoveInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a602b3c05cd619a8b00d91315009ebc5d"></a><!-- doxytag: member="dmxextension.c::dmxUpdateScreenResources" ref="a602b3c05cd619a8b00d91315009ebc5d" args="(ScreenPtr pScreen, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxUpdateScreenResources </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> int dmxRemoveInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>id</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Update DMX's screen resources to match those of the newly moved and/or resized "root" window. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00105">_DMXScreenInfo::beYDPI</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a7decb269dc8674114f44964a88a68063"></a><!-- doxytag: member="dmxextension.c::defaultFont" ref="a7decb269dc8674114f44964a88a68063" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">FontPtr <a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">defaultFont</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove the input with physical id <em>id</em>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html
deleted file mode 100644
index 4fd796af5..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxextension_8h-source.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxextension.h</h1><a href="dmxextension_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Author:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00033 <span class="comment"> *</span>
-00034 <span class="comment"> */</span>
-00035 
-00040 <span class="preprocessor">#ifndef _DMXEXTENSION_H_</span>
-00041 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEXTENSION_H_</span>
-00042 <span class="preprocessor"></span>
-<a name="l00045"></a><a class="code" href="structDMXScreenAttributesRec.html">00045</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00046     <span class="keyword">const</span> <span class="keywordtype">char</span>   *displayName;
-00047     <span class="keywordtype">int</span>          logicalScreen;
-00048 
-00049     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowWidth;    <span class="comment">/* displayName's coordinate system */</span>
-00050     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowHeight;   <span class="comment">/* displayName's coordinate system */</span>
-00051     <span class="keywordtype">int</span>          screenWindowXoffset;  <span class="comment">/* displayName's coordinate system */</span>
-00052     <span class="keywordtype">int</span>          screenWindowYoffset;  <span class="comment">/* displayName's coordinate system */</span>
-00053 
-00054     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowWidth;      <span class="comment">/* screenWindow's coordinate system */</span>
-00055     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowHeight;     <span class="comment">/* screenWindow's coordinate system */</span>
-00056     <span class="keywordtype">int</span>          rootWindowXoffset;    <span class="comment">/* screenWindow's coordinate system */</span>
-00057     <span class="keywordtype">int</span>          rootWindowYoffset;    <span class="comment">/* screenWindow's coordinate system */</span>
-00058 
-00059     <span class="keywordtype">int</span>          rootWindowXorigin;    <span class="comment">/* global coordinate system */</span>
-00060     <span class="keywordtype">int</span>          rootWindowYorigin;    <span class="comment">/* global coordinate system */</span>
-00061 } <a class="code" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a>, *DMXScreenAttributesPtr;
-00062 
-<a name="l00064"></a><a class="code" href="structDMXWindowAttributesRec.html">00064</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00065     <span class="keywordtype">int</span>          screen;
-00066     Window       window;
-00067     xRectangle   pos;
-00068     xRectangle   vis;
-00069 } <a class="code" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a>, *DMXWindowAttributesPtr;
-00070 
-<a name="l00073"></a><a class="code" href="structDMXDesktopAttributesRec.html">00073</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00074     <span class="keywordtype">int</span>          width;
-00075     <span class="keywordtype">int</span>          height;
-00076     <span class="keywordtype">int</span>          shiftX;
-00077     <span class="keywordtype">int</span>          shiftY;
-00078 } <a class="code" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a>, *DMXDesktopAttributesPtr;
-00079 
-<a name="l00081"></a><a class="code" href="structDMXInputAttributesRec.html">00081</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00082     <span class="keyword">const</span> <span class="keywordtype">char</span>   *name;
-00083     <span class="keywordtype">int</span>          inputType;
-00084     <span class="keywordtype">int</span>          physicalScreen;
-00085     <span class="keywordtype">int</span>          physicalId;
-00086     <span class="keywordtype">int</span>          isCore;
-00087     <span class="keywordtype">int</span>          sendsCore;
-00088     <span class="keywordtype">int</span>          detached;
-00089 } <a class="code" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a>, *DMXInputAttributesPtr;
-00090 
-00091 
-00092 <span class="keyword">extern</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="dmxextension_8c.html#a9">dmxGetNumScreens</a>(<span class="keywordtype">void</span>);
-00093 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#a10">dmxForceWindowCreation</a>(WindowPtr pWindow);
-00094 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#a11">dmxFlushPendingSyncs</a>(<span class="keywordtype">void</span>);
-00095 <span class="keyword">extern</span> Bool          <a class="code" href="dmxextension_8c.html#a1">dmxGetScreenAttributes</a>(<span class="keywordtype">int</span> physical,
-00096                                             DMXScreenAttributesPtr attr);
-00097 <span class="keyword">extern</span> Bool          <a class="code" href="dmxextension_8c.html#a2">dmxGetWindowAttributes</a>(WindowPtr pWindow,
-00098                                             DMXWindowAttributesPtr attr);
-00099 <span class="keyword">extern</span> <span class="keywordtype">void</span>          dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr);
-00100 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a4">dmxGetInputCount</a>(<span class="keywordtype">void</span>);
-00101 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a5">dmxGetInputAttributes</a>(<span class="keywordtype">int</span> deviceId,
-00102                                            DMXInputAttributesPtr attr);
-00103 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a7">dmxAddInput</a>(DMXInputAttributesPtr attr, <span class="keywordtype">int</span> *deviceId);
-00104 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a8">dmxRemoveInput</a>(<span class="keywordtype">int</span> deviceId);
-00105 
-00106 <span class="keyword">extern</span> <span class="keywordtype">int</span>           dmxConfigureScreenWindows(<span class="keywordtype">int</span> nscreens,
-00107                                                CARD32 *screens,
-00108                                                DMXScreenAttributesPtr attribs,
-00109                                                <span class="keywordtype">int</span> *errorScreen);
-00110 
-00111 <span class="keyword">extern</span> <span class="keywordtype">int</span>           dmxConfigureDesktop(DMXDesktopAttributesPtr attribs);
-00112 
-00113 <span class="comment">/* dmxUpdateScreenResources exposed for dmxCreateWindow in dmxwindow.c */</span>
-00114 <span class="keyword">extern</span> <span class="keywordtype">void</span>          dmxUpdateScreenResources(ScreenPtr pScreen,
-00115                                               <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
-00116 
-00117 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a18">dmxAttachScreen</a>(<span class="keywordtype">int</span> idx, DMXScreenAttributesPtr attr);
-00118 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a23">dmxDetachScreen</a>(<span class="keywordtype">int</span> idx);
-00119 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
index 41cdcd3eb..7e0167c36 100644
--- a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
@@ -6,412 +6,546 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxextension.h File Reference</h1>
-<p>
-<a href="dmxextension_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned long&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a4">dmxGetNumScreens</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a5">dmxForceWindowCreation</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a6">dmxFlushPendingSyncs</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a7">dmxGetScreenAttributes</a> (int physical, DMXScreenAttributesPtr attr)</td></tr>
+<p><a href="dmxextension_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a></td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a0e47929486368da1a7513c7d2305f24f">DMXScreenAttributesPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#ad22f823435ccab00deb798c2e080fbe1">DMXWindowAttributesPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a96ae1d459f8d65cbc2204f324cbe8b72">DMXDesktopAttributesPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#af665732621edf76f4bd259d14eb99164">DMXInputAttributesPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a1317039ecdb6f4eca7c1e5cea884657e">dmxGetNumScreens</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a1780283a6dd8f6d66e802b0c9b916f48">dmxForceWindowCreation</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#af7927d9de14425779c5de40312407203">dmxFlushPendingSyncs</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#ab4180bb82b058d071e2f72c2e18534b7">dmxGetScreenAttributes</a> (int physical, <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a81cd222e07016da8ee5c87c44a03312a">dmxGetWindowAttributes</a> (WindowPtr pWindow, <a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a314e23c5608a9bdaa5f8b8846f7458fc">dmxGetDesktopAttributes</a> (<a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a7e2b64de1aef77d43ee78d3a8187f651">dmxGetInputCount</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a3bde3bbb52470b5eb185805d861e6216">dmxGetInputAttributes</a> (int deviceId, <a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#af5d146634762aff17b8c45c4794d33e3">dmxAddInput</a> (<a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a> attr, int *deviceId)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a55936739d6df4e5b8a048d5d34c6cd39">dmxRemoveInput</a> (int deviceId)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a63c06d493f7fbe70e235c97a622efca9">dmxConfigureScreenWindows</a> (int nscreens, CARD32 *screens, <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a> attribs, int *errorScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a0aa0eb777a77d62cd3070c642ae0b0aa">dmxConfigureDesktop</a> (<a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a> attribs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a602b3c05cd619a8b00d91315009ebc5d">dmxUpdateScreenResources</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a3962840388f9bcf96fb17294a413d8cb">dmxAttachScreen</a> (int idx, <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a> attr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxextension_8h.html#a027f2cb3fe32b06f3ca3b04df8336299">dmxDetachScreen</a> (int idx)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for DMX extension support. These routines are called by function in Xserver/Xext/dmx.c. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxextension_8c.html">dmxextension.c</a> </dd></dl>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a96ae1d459f8d65cbc2204f324cbe8b72"></a><!-- doxytag: member="dmxextension.h::DMXDesktopAttributesPtr" ref="a96ae1d459f8d65cbc2204f324cbe8b72" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef  struct <a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a> * <a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af665732621edf76f4bd259d14eb99164"></a><!-- doxytag: member="dmxextension.h::DMXInputAttributesPtr" ref="af665732621edf76f4bd259d14eb99164" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef  struct <a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a> * <a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0e47929486368da1a7513c7d2305f24f"></a><!-- doxytag: member="dmxextension.h::DMXScreenAttributesPtr" ref="a0e47929486368da1a7513c7d2305f24f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef  struct <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a> * <a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad22f823435ccab00deb798c2e080fbe1"></a><!-- doxytag: member="dmxextension.h::DMXWindowAttributesPtr" ref="ad22f823435ccab00deb798c2e080fbe1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef  struct <a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a> * <a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="af5d146634762aff17b8c45c4794d33e3"></a><!-- doxytag: member="dmxextension.h::dmxAddInput" ref="af5d146634762aff17b8c45c4794d33e3" args="(DMXInputAttributesPtr attr, int *deviceId)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxAddInput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Add an input with the specified attributes. If the input is added, the physical id is returned in <em>deviceId</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a8">dmxGetWindowAttributes</a> (WindowPtr pWindow, DMXWindowAttributesPtr attr)</td></tr>
+<p>References <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxextension_8h_source.html#l00082">DMXInputAttributesRec::inputType</a>, <a class="el" href="dmxextension_8h_source.html#l00081">DMXInputAttributesRec::name</a>, <a class="el" href="dmxextension_8h_source.html#l00083">DMXInputAttributesRec::physicalScreen</a>, and <a class="el" href="dmxextension_8h_source.html#l00086">DMXInputAttributesRec::sendsCore</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a10">dmxGetInputCount</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00815">ProcDMXAddInput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a11">dmxGetInputAttributes</a> (int deviceId, DMXInputAttributesPtr attr)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a3962840388f9bcf96fb17294a413d8cb"></a><!-- doxytag: member="dmxextension.h::dmxAttachScreen" ref="a3962840388f9bcf96fb17294a413d8cb" args="(int idx, DMXScreenAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxAttachScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reattach previously detached back-end screen. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a12">dmxAddInput</a> (DMXInputAttributesPtr attr, int *deviceId)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">defaultFont</a>, <a class="el" href="dmxextension_8h_source.html#l00045">DMXScreenAttributesRec::displayName</a>, <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00677">dmxBECreateScratchGCs()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00476">dmxCheckForWM()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxextension_8h.html#a63c06d493f7fbe70e235c97a622efca9">dmxConfigureScreenWindows()</a>, <a class="el" href="dmxextension_8c_source.html#l00986">dmxForceExposures()</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00204">dmxSetErrorHandler()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a13">dmxRemoveInput</a> (int deviceId)</td></tr>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a17">dmxAttachScreen</a> (int idx, DMXScreenAttributesPtr attr)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a0aa0eb777a77d62cd3070c642ae0b0aa"></a><!-- doxytag: member="dmxextension.h::dmxConfigureDesktop" ref="a0aa0eb777a77d62cd3070c642ae0b0aa" args="(DMXDesktopAttributesPtr attribs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxConfigureDesktop </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attribs</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxextension_8h.html#a18">dmxDetachScreen</a> (int idx)</td></tr>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00714">ProcDMXChangeDesktopAttributes()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for DMX extension support. These routines are called by function in Xserver/Xext/dmx.c. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxextension_8c.html">dmxextension.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a12" doxytag="dmxextension.h::dmxAddInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a63c06d493f7fbe70e235c97a622efca9"></a><!-- doxytag: member="dmxextension.h::dmxConfigureScreenWindows" ref="a63c06d493f7fbe70e235c97a622efca9" args="(int nscreens, CARD32 *screens, DMXScreenAttributesPtr attribs, int *errorScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxAddInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DMXInputAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
+          <td class="memname">int dmxConfigureScreenWindows </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nscreens</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
+          <td class="paramtype">CARD32 *&nbsp;</td>
+          <td class="paramname"> <em>screens</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attribs</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add an input with the specified attributes. If the input is added, the physical id is returned in <em>deviceId</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxextension.h::dmxAttachScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxAttachScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>errorScreen</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXScreenAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmx_8c_source.html#l00389">ProcDMXChangeScreensAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a027f2cb3fe32b06f3ca3b04df8336299"></a><!-- doxytag: member="dmxextension.h::dmxDetachScreen" ref="a027f2cb3fe32b06f3ca3b04df8336299" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int dmxDetachScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reattach previously detached back-end screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxextension.h::dmxDetachScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Detach back-end screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01506">dmxBEDestroyScratchGCs()</a>, <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00513">ProcDMXRemoveScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af7927d9de14425779c5de40312407203"></a><!-- doxytag: member="dmxextension.h::dmxFlushPendingSyncs" ref="af7927d9de14425779c5de40312407203" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxDetachScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxFlushPendingSyncs </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detach back-end screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxextension.h::dmxFlushPendingSyncs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Flush pending syncs for all screens. </p>
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>, <a class="el" href="dmx_8c_source.html#l00602">ProcDMXGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00241">ProcDMXSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1780283a6dd8f6d66e802b0c9b916f48"></a><!-- doxytag: member="dmxextension.h::dmxForceWindowCreation" ref="a1780283a6dd8f6d66e802b0c9b916f48" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFlushPendingSyncs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxForceWindowCreation </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Flush pending syncs for all screens.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxextension.h::dmxForceWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Make sure that <a class="el" href="dmxwindow_8h.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow</a> has been called for <em>pWindow</em>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a314e23c5608a9bdaa5f8b8846f7458fc"></a><!-- doxytag: member="dmxextension.h::dmxGetDesktopAttributes" ref="a314e23c5608a9bdaa5f8b8846f7458fc" args="(DMXDesktopAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxForceWindowCreation </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxGetDesktopAttributes </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make sure that <a class="el" href="dmxwindow_8h.html#a14">dmxCreateAndRealizeWindow</a> has been called for <em>pWindow</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxextension.h::dmxGetInputAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00074">DMXDesktopAttributesRec::height</a>, <a class="el" href="dmxextension_8h_source.html#l00075">DMXDesktopAttributesRec::shiftX</a>, <a class="el" href="dmxextension_8h_source.html#l00076">DMXDesktopAttributesRec::shiftY</a>, and <a class="el" href="dmxextension_8h_source.html#l00073">DMXDesktopAttributesRec::width</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00714">ProcDMXChangeDesktopAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3bde3bbb52470b5eb185805d861e6216"></a><!-- doxytag: member="dmxextension.h::dmxGetInputAttributes" ref="a3bde3bbb52470b5eb185805d861e6216" args="(int deviceId, DMXInputAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxGetInputAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>deviceId</em>, </td>
+          <td class="memname">int dmxGetInputAttributes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>deviceId</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DMXInputAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td class="paramtype"><a class="el" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return information about the device with id = <em>deviceId</em>. This information is primarily for the <a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html#a58">ProcDMXGetInputAttributes()</a> function, which does not have access to the appropriate data structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxextension.h::dmxGetInputCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return information about the device with id = <em>deviceId</em>. This information is primarily for the <a class="el" href="dmx_8c.html#accc76dc52a070ec95d7330357645d175">ProcDMXGetInputAttributes()</a> function, which does not have access to the appropriate data structure. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxextension_8h_source.html#l00087">DMXInputAttributesRec::detached</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00071">DMX_LOCAL_TYPE_BACKEND</a>, <a class="el" href="dmxinputinit_8h_source.html#l00072">DMX_LOCAL_TYPE_COMMON</a>, <a class="el" href="dmxinputinit_8h_source.html#l00070">DMX_LOCAL_TYPE_CONSOLE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00069">DMX_LOCAL_TYPE_LOCAL</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00185">_DMXLocalInputInfo::extType</a>, <a class="el" href="dmxextension_8h_source.html#l00082">DMXInputAttributesRec::inputType</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxextension_8h_source.html#l00085">DMXInputAttributesRec::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxextension_8h_source.html#l00081">DMXInputAttributesRec::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxextension_8h_source.html#l00084">DMXInputAttributesRec::physicalId</a>, <a class="el" href="dmxextension_8h_source.html#l00083">DMXInputAttributesRec::physicalScreen</a>, <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxextension_8h_source.html#l00086">DMXInputAttributesRec::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7e2b64de1aef77d43ee78d3a8187f651"></a><!-- doxytag: member="dmxextension.h::dmxGetInputCount" ref="a7e2b64de1aef77d43ee78d3a8187f651" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxGetInputCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxGetInputCount </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the total number of devices, not just <a class="el" href="dmxinput_8h.html#a4">dmxNumInputs</a>. The number returned should be the same as that returned by XListInputDevices.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxextension.h::dmxGetNumScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return the total number of devices, not just <a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a>. The number returned should be the same as that returned by XListInputDevices. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, and <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmx_8c_source.html#l00757">ProcDMXGetInputCount()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1317039ecdb6f4eca7c1e5cea884657e"></a><!-- doxytag: member="dmxextension.h::dmxGetNumScreens" ref="a1317039ecdb6f4eca7c1e5cea884657e" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> unsigned long dmxGetNumScreens </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">unsigned long dmxGetNumScreens </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return the value of <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a> -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxextension.h::dmxGetScreenAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Return the value of <a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a> -- the total number of backend screens in use (these are logical screens and may be larger than the number of backend displays). </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00312">ProcDMXGetScreenCount()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab4180bb82b058d071e2f72c2e18534b7"></a><!-- doxytag: member="dmxextension.h::dmxGetScreenAttributes" ref="ab4180bb82b058d071e2f72c2e18534b7" args="(int physical, DMXScreenAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxGetScreenAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>physical</em>, </td>
+          <td class="memname">Bool dmxGetScreenAttributes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>physical</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>DMXScreenAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine provides information to the DMX protocol extension about a particular screen. </p>
+
+<p>References <a class="el" href="dmxextension_8h_source.html#l00045">DMXScreenAttributesRec::displayName</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxextension_8h_source.html#l00046">DMXScreenAttributesRec::logicalScreen</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00054">DMXScreenAttributesRec::rootWindowHeight</a>, <a class="el" href="dmxextension_8h_source.html#l00053">DMXScreenAttributesRec::rootWindowWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00055">DMXScreenAttributesRec::rootWindowXoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00058">DMXScreenAttributesRec::rootWindowXorigin</a>, <a class="el" href="dmxextension_8h_source.html#l00056">DMXScreenAttributesRec::rootWindowYoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00059">DMXScreenAttributesRec::rootWindowYorigin</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmxextension_8h_source.html#l00049">DMXScreenAttributesRec::screenWindowHeight</a>, <a class="el" href="dmxextension_8h_source.html#l00048">DMXScreenAttributesRec::screenWindowWidth</a>, <a class="el" href="dmxextension_8h_source.html#l00050">DMXScreenAttributesRec::screenWindowXoffset</a>, <a class="el" href="dmxextension_8h_source.html#l00051">DMXScreenAttributesRec::screenWindowYoffset</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, and <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>, <a class="el" href="dmx_8c_source.html#l00389">ProcDMXChangeScreensAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a81cd222e07016da8ee5c87c44a03312a"></a><!-- doxytag: member="dmxextension.h::dmxGetWindowAttributes" ref="a81cd222e07016da8ee5c87c44a03312a" args="(WindowPtr pWindow, DMXWindowAttributesPtr attr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">Bool dmxGetWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype"><a class="el" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>attr</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine provides information to the DMX protocol extension about a particular window. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, <a class="el" href="dmxextension_8h_source.html#l00066">DMXWindowAttributesRec::pos</a>, <a class="el" href="dmxextension_8h_source.html#l00064">DMXWindowAttributesRec::screen</a>, <a class="el" href="dmxextension_8h_source.html#l00067">DMXWindowAttributesRec::vis</a>, <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>, and <a class="el" href="dmxextension_8h_source.html#l00065">DMXWindowAttributesRec::window</a>.</p>
 
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a55936739d6df4e5b8a048d5d34c6cd39"></a><!-- doxytag: member="dmxextension.h::dmxRemoveInput" ref="a55936739d6df4e5b8a048d5d34c6cd39" args="(int deviceId)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxRemoveInput </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine provides information to the DMX protocol extension about a particular screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxextension.h::dmxGetWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Remove the input with physical id <em>id</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l01209">dmxInputDetachId()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00866">ProcDMXRemoveInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a602b3c05cd619a8b00d91315009ebc5d"></a><!-- doxytag: member="dmxextension.h::dmxUpdateScreenResources" ref="a602b3c05cd619a8b00d91315009ebc5d" args="(ScreenPtr pScreen, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxGetWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxUpdateScreenResources </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DMXWindowAttributesPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine provides information to the DMX protocol extension about a particular window.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxextension.h::dmxRemoveInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxRemoveInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>id</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove the input with physical id <em>id</em>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Update DMX's screen resources to match those of the newly moved and/or resized "root" window. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00105">_DMXScreenInfo::beYDPI</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html
new file mode 100644
index 000000000..b2cd168ec
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxextension_8h_source.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxextension.h</h1><a href="dmxextension_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Author:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *</span>
+<a name="l00033"></a>00033 <span class="comment"> */</span>
+<a name="l00034"></a>00034 
+<a name="l00039"></a>00039 <span class="preprocessor">#ifndef _DMXEXTENSION_H_</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span><span class="preprocessor">#define _DMXEXTENSION_H_</span>
+<a name="l00041"></a>00041 <span class="preprocessor"></span>
+<a name="l00044"></a><a class="code" href="structDMXScreenAttributesRec.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00045"></a><a class="code" href="structDMXScreenAttributesRec.html#a665be893e5ec84e6b7df834036e39975">00045</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>   *displayName;
+<a name="l00046"></a><a class="code" href="structDMXScreenAttributesRec.html#aac840a53c344858b34667e01a952910e">00046</a>     <span class="keywordtype">int</span>          logicalScreen;
+<a name="l00047"></a>00047 
+<a name="l00048"></a><a class="code" href="structDMXScreenAttributesRec.html#a3b31eedad2369d6c63fd62133cda8fe2">00048</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowWidth;    <span class="comment">/* displayName&apos;s coordinate system */</span>
+<a name="l00049"></a><a class="code" href="structDMXScreenAttributesRec.html#af3066508831f1b6698b39d6bdf172110">00049</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> screenWindowHeight;   <span class="comment">/* displayName&apos;s coordinate system */</span>
+<a name="l00050"></a><a class="code" href="structDMXScreenAttributesRec.html#a3ab6942e75daddab2bce4854979978cb">00050</a>     <span class="keywordtype">int</span>          screenWindowXoffset;  <span class="comment">/* displayName&apos;s coordinate system */</span>
+<a name="l00051"></a><a class="code" href="structDMXScreenAttributesRec.html#a332d04af8d7c0bd09e51cc4df006569a">00051</a>     <span class="keywordtype">int</span>          screenWindowYoffset;  <span class="comment">/* displayName&apos;s coordinate system */</span>
+<a name="l00052"></a>00052 
+<a name="l00053"></a><a class="code" href="structDMXScreenAttributesRec.html#a53f8bc0cdd9a69851ea5a2c14b6a14a1">00053</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowWidth;      <span class="comment">/* screenWindow&apos;s coordinate system */</span>
+<a name="l00054"></a><a class="code" href="structDMXScreenAttributesRec.html#a8508290530961305566fd94990bd2c37">00054</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rootWindowHeight;     <span class="comment">/* screenWindow&apos;s coordinate system */</span>
+<a name="l00055"></a><a class="code" href="structDMXScreenAttributesRec.html#a5db5a54083e2624b8f58af3b111c8648">00055</a>     <span class="keywordtype">int</span>          rootWindowXoffset;    <span class="comment">/* screenWindow&apos;s coordinate system */</span>
+<a name="l00056"></a><a class="code" href="structDMXScreenAttributesRec.html#a86291b3521d1fecb31ba3f88084b0ef5">00056</a>     <span class="keywordtype">int</span>          rootWindowYoffset;    <span class="comment">/* screenWindow&apos;s coordinate system */</span>
+<a name="l00057"></a>00057 
+<a name="l00058"></a><a class="code" href="structDMXScreenAttributesRec.html#ae9cab06391a7353165ee5e6ebe385eb8">00058</a>     <span class="keywordtype">int</span>          rootWindowXorigin;    <span class="comment">/* global coordinate system */</span>
+<a name="l00059"></a><a class="code" href="structDMXScreenAttributesRec.html#adba7900b874fd0da70981001b9667c83">00059</a>     <span class="keywordtype">int</span>          rootWindowYorigin;    <span class="comment">/* global coordinate system */</span>
+<a name="l00060"></a>00060 } <a class="code" href="structDMXScreenAttributesRec.html">DMXScreenAttributesRec</a>, *<a class="code" href="structDMXScreenAttributesRec.html">DMXScreenAttributesPtr</a>;
+<a name="l00061"></a>00061 
+<a name="l00063"></a><a class="code" href="structDMXWindowAttributesRec.html">00063</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00064"></a><a class="code" href="structDMXWindowAttributesRec.html#a4a1dec7a3e658352f4764b4cbcfba15a">00064</a>     <span class="keywordtype">int</span>          screen;
+<a name="l00065"></a><a class="code" href="structDMXWindowAttributesRec.html#a782667f9b11d69c0d32149b03713fa46">00065</a>     Window       window;
+<a name="l00066"></a><a class="code" href="structDMXWindowAttributesRec.html#a73d55840c5f9f2577d5a51712c30cedf">00066</a>     xRectangle   <a class="code" href="dmxprint_8c.html#a1910d262855b71da353ed0d07a6c7823">pos</a>;
+<a name="l00067"></a><a class="code" href="structDMXWindowAttributesRec.html#a0397906d1b5c5fee806755ce6f06049e">00067</a>     xRectangle   vis;
+<a name="l00068"></a>00068 } <a class="code" href="structDMXWindowAttributesRec.html">DMXWindowAttributesRec</a>, *<a class="code" href="structDMXWindowAttributesRec.html">DMXWindowAttributesPtr</a>;
+<a name="l00069"></a>00069 
+<a name="l00072"></a><a class="code" href="structDMXDesktopAttributesRec.html">00072</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00073"></a><a class="code" href="structDMXDesktopAttributesRec.html#af1d25c0a82bd838fa97b22333892321f">00073</a>     <span class="keywordtype">int</span>          width;
+<a name="l00074"></a><a class="code" href="structDMXDesktopAttributesRec.html#a7385888bade151dfb3cf953f2b3952ad">00074</a>     <span class="keywordtype">int</span>          height;
+<a name="l00075"></a><a class="code" href="structDMXDesktopAttributesRec.html#a6d3460904e38d14e4c857164901dd0ff">00075</a>     <span class="keywordtype">int</span>          shiftX;
+<a name="l00076"></a><a class="code" href="structDMXDesktopAttributesRec.html#a66acb1156ef40a2bc377943d50e0f52f">00076</a>     <span class="keywordtype">int</span>          shiftY;
+<a name="l00077"></a>00077 } <a class="code" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesRec</a>, *<a class="code" href="structDMXDesktopAttributesRec.html">DMXDesktopAttributesPtr</a>;
+<a name="l00078"></a>00078 
+<a name="l00080"></a><a class="code" href="structDMXInputAttributesRec.html">00080</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00081"></a><a class="code" href="structDMXInputAttributesRec.html#ace2798f784b97234c901ef3380f06b93">00081</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>   *name;
+<a name="l00082"></a><a class="code" href="structDMXInputAttributesRec.html#aba63d1a444ff736beababf9ca1f00ec3">00082</a>     <span class="keywordtype">int</span>          inputType;
+<a name="l00083"></a><a class="code" href="structDMXInputAttributesRec.html#a3eb115af0ab845d41902894d6de3bb20">00083</a>     <span class="keywordtype">int</span>          physicalScreen;
+<a name="l00084"></a><a class="code" href="structDMXInputAttributesRec.html#aecefabab0214492770a1eaaf7659cd1c">00084</a>     <span class="keywordtype">int</span>          physicalId;
+<a name="l00085"></a><a class="code" href="structDMXInputAttributesRec.html#adb896b223fa01c660fa71a4911993d63">00085</a>     <span class="keywordtype">int</span>          isCore;
+<a name="l00086"></a><a class="code" href="structDMXInputAttributesRec.html#a7628a7913aa4f69220807605442fa4ca">00086</a>     <span class="keywordtype">int</span>          sendsCore;
+<a name="l00087"></a><a class="code" href="structDMXInputAttributesRec.html#a114bb5da1e75bd500655a17cbfb99f1f">00087</a>     <span class="keywordtype">int</span>          detached;
+<a name="l00088"></a>00088 } <a class="code" href="structDMXInputAttributesRec.html">DMXInputAttributesRec</a>, *<a class="code" href="structDMXInputAttributesRec.html">DMXInputAttributesPtr</a>;
+<a name="l00089"></a>00089 
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091 <span class="keyword">extern</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="dmxextension_8c.html#a1317039ecdb6f4eca7c1e5cea884657e">dmxGetNumScreens</a>(<span class="keywordtype">void</span>);
+<a name="l00092"></a>00092 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#a1780283a6dd8f6d66e802b0c9b916f48">dmxForceWindowCreation</a>(WindowPtr pWindow);
+<a name="l00093"></a>00093 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#af7927d9de14425779c5de40312407203">dmxFlushPendingSyncs</a>(<span class="keywordtype">void</span>);
+<a name="l00094"></a>00094 <span class="keyword">extern</span> Bool          <a class="code" href="dmxextension_8c.html#ab4180bb82b058d071e2f72c2e18534b7">dmxGetScreenAttributes</a>(<span class="keywordtype">int</span> physical,
+<a name="l00095"></a>00095                                             DMXScreenAttributesPtr attr);
+<a name="l00096"></a>00096 <span class="keyword">extern</span> Bool          <a class="code" href="dmxextension_8c.html#a81cd222e07016da8ee5c87c44a03312a">dmxGetWindowAttributes</a>(WindowPtr pWindow,
+<a name="l00097"></a>00097                                             DMXWindowAttributesPtr attr);
+<a name="l00098"></a>00098 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#a314e23c5608a9bdaa5f8b8846f7458fc">dmxGetDesktopAttributes</a>(DMXDesktopAttributesPtr attr);
+<a name="l00099"></a>00099 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a7e2b64de1aef77d43ee78d3a8187f651">dmxGetInputCount</a>(<span class="keywordtype">void</span>);
+<a name="l00100"></a>00100 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a3bde3bbb52470b5eb185805d861e6216">dmxGetInputAttributes</a>(<span class="keywordtype">int</span> deviceId,
+<a name="l00101"></a>00101                                            DMXInputAttributesPtr attr);
+<a name="l00102"></a>00102 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a6b0b38eb49c6be097a59dbcdd6dacb51">dmxAddInput</a>(DMXInputAttributesPtr attr, <span class="keywordtype">int</span> *deviceId);
+<a name="l00103"></a>00103 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a6125541332383040aa07fa1ef310d38d">dmxRemoveInput</a>(<span class="keywordtype">int</span> deviceId);
+<a name="l00104"></a>00104 
+<a name="l00105"></a>00105 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8h.html#a63c06d493f7fbe70e235c97a622efca9">dmxConfigureScreenWindows</a>(<span class="keywordtype">int</span> nscreens,
+<a name="l00106"></a>00106                                                CARD32 *screens,
+<a name="l00107"></a>00107                                                DMXScreenAttributesPtr attribs,
+<a name="l00108"></a>00108                                                <span class="keywordtype">int</span> *errorScreen);
+<a name="l00109"></a>00109 
+<a name="l00110"></a>00110 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8h.html#a0aa0eb777a77d62cd3070c642ae0b0aa">dmxConfigureDesktop</a>(DMXDesktopAttributesPtr attribs);
+<a name="l00111"></a>00111 
+<a name="l00112"></a>00112 <span class="comment">/* dmxUpdateScreenResources exposed for dmxCreateWindow in dmxwindow.c */</span>
+<a name="l00113"></a>00113 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxextension_8c.html#a602b3c05cd619a8b00d91315009ebc5d">dmxUpdateScreenResources</a>(ScreenPtr pScreen,
+<a name="l00114"></a>00114                                               <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
+<a name="l00115"></a>00115 
+<a name="l00116"></a>00116 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a3962840388f9bcf96fb17294a413d8cb">dmxAttachScreen</a>(<span class="keywordtype">int</span> idx, DMXScreenAttributesPtr attr);
+<a name="l00117"></a>00117 <span class="keyword">extern</span> <span class="keywordtype">int</span>           <a class="code" href="dmxextension_8c.html#a027f2cb3fe32b06f3ca3b04df8336299">dmxDetachScreen</a>(<span class="keywordtype">int</span> idx);
+<a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8c.html b/xorg-server/hw/dmx/doc/html/dmxfont_8c.html
index b1c6c9f87..b1768ae01 100644
--- a/xorg-server/hw/dmx/doc/html/dmxfont_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxfont_8c.html
@@ -6,243 +6,453 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxfont.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "fontstruct.h"</code><br>
-<code>#include "dixfont.h"</code><br>
-<code>#include "dixstruct.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a10">dmxInitFonts</a> (void)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxfont.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &lt;X11/fonts/fontstruct.h&gt;</code><br/>
+<code>#include &quot;dixfont.h&quot;</code><br/>
+<code>#include &quot;dixstruct.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#af802427439f07d76ba970ca41f6dd7c1">DMX_FONTPATH_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#aba35600742d4d57b9dd9fb9dde973707">dmxFontErrorHandler</a> (Display *dpy, XErrorEvent *ev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#ae81f188178a0d01ea67b6685cdbe493c">dmxGetFontPath</a> (int *npaths)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a287e0fab77b9351a96fbc08fb5ec7e25">dmxFreeFontPath</a> (char **fp)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a177c3268bf91715dc536db6b6f8eed72">dmxCheckFontPathElement</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, char *fp)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#ad20ddd111e4a45bf1bdfd45744946c72">dmxSetFontPath</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a3d2eb9a1b065a02dbe58ee4e85ff6247">dmxCheckFontPath</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, int *error)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#ac76f86a537e6d719d712d11f310b8989">dmxProcSetFontPath</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a2d9cf629a70ed7c46a38dac9611b6527">dmxInitFonts</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#ab6bdac52e012fec9bd43eaa9667f9785">dmxResetFonts</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#ad24fe115ec27d050da7a4cb47d7ce52f">dmxBELoadFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a0119b47dedc04962e24f5b7d86f5cd92">dmxRealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#afadf46b46a1f3da085c96849c885a41e">dmxBEFreeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a9d0df8388cd6cd1a5d7b77dcf9aaa69f">dmxUnrealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a> [256])(ClientPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8c.html#a9c9ed2980702f901796479788b6b8f66">dmxFontLastError</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for fonts. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="af802427439f07d76ba970ca41f6dd7c1"></a><!-- doxytag: member="dmxfont.c::DMX_FONTPATH_DEBUG" ref="af802427439f07d76ba970ca41f6dd7c1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_FONTPATH_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="afadf46b46a1f3da085c96849c885a41e"></a><!-- doxytag: member="dmxfont.c::dmxBEFreeFont" ref="afadf46b46a1f3da085c96849c885a41e" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEFreeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free <em>pFont</em> on the back-end associated with <em>pScreen</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a11">dmxResetFonts</a> (void)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a12">dmxBELoadFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a13">dmxRealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ad24fe115ec27d050da7a4cb47d7ce52f"></a><!-- doxytag: member="dmxfont.c::dmxBELoadFont" ref="ad24fe115ec27d050da7a4cb47d7ce52f" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBELoadFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Load the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a14">dmxBEFreeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxinit_8c_source.html#l00094">dmxFontPath</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxfont_8c_source.html#l00092">dmxFreeFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00062">dmxGetFontPath()</a>, <a class="el" href="dmxinit_8c_source.html#l00118">dmxIgnoreBadFontPaths</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8c.html#a15">dmxUnrealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, and <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for fonts.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a14" doxytag="dmxfont.c::dmxBEFreeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a3d2eb9a1b065a02dbe58ee4e85ff6247"></a><!-- doxytag: member="dmxfont.c::dmxCheckFontPath" ref="a3d2eb9a1b065a02dbe58ee4e85ff6247" args="(DMXScreenInfo *dmxScreen, int *error)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">static int dmxCheckFontPath </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>error</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free <em>pFont</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxfont.c::dmxBELoadFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a177c3268bf91715dc536db6b6f8eed72"></a><!-- doxytag: member="dmxfont.c::dmxCheckFontPathElement" ref="a177c3268bf91715dc536db6b6f8eed72" args="(DMXScreenInfo *dmxScreen, char *fp)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBELoadFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">static Bool dmxCheckFontPathElement </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>fp</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00055">dmxFontErrorHandler()</a>, <a class="el" href="dmxfont_8c_source.html#l00053">dmxFontLastError</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aba35600742d4d57b9dd9fb9dde973707"></a><!-- doxytag: member="dmxfont.c::dmxFontErrorHandler" ref="aba35600742d4d57b9dd9fb9dde973707" args="(Display *dpy, XErrorEvent *ev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxFontErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">XErrorEvent *&nbsp;</td>
+          <td class="paramname"> <em>ev</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxfont_8c_source.html#l00053">dmxFontLastError</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, and <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a287e0fab77b9351a96fbc08fb5ec7e25"></a><!-- doxytag: member="dmxfont.c::dmxFreeFontPath" ref="a287e0fab77b9351a96fbc08fb5ec7e25" args="(char **fp)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxFreeFontPath </td>
+          <td>(</td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>fp</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Load the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxfont.c::dmxInitFonts" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, and <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae81f188178a0d01ea67b6685cdbe493c"></a><!-- doxytag: member="dmxfont.c::dmxGetFontPath" ref="ae81f188178a0d01ea67b6685cdbe493c" args="(int *npaths)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitFonts </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static char** dmxGetFontPath </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>npaths</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, and <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, and <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d9cf629a70ed7c46a38dac9611b6527"></a><!-- doxytag: member="dmxfont.c::dmxInitFonts" ref="a2d9cf629a70ed7c46a38dac9611b6527" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInitFonts </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxfont.c::dmxRealizeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized. </p>
+
+<p>References <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, and <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac76f86a537e6d719d712d11f310b8989"></a><!-- doxytag: member="dmxfont.c::dmxProcSetFontPath" ref="ac76f86a537e6d719d712d11f310b8989" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxRealizeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">static int dmxProcSetFontPath </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxfont_8c_source.html#l00147">dmxCheckFontPath()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00228">dmxInitFonts()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0119b47dedc04962e24f5b7d86f5cd92"></a><!-- doxytag: member="dmxfont.c::dmxRealizeFont" ref="a0119b47dedc04962e24f5b7d86f5cd92" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">Bool dmxRealizeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Realize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxfont.c::dmxResetFonts" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Realize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, and <a class="el" href="dmxfont_8h_source.html#l00044">_dmxFontPriv::refcnt</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab6bdac52e012fec9bd43eaa9667f9785"></a><!-- doxytag: member="dmxfont.c::dmxResetFonts" ref="ab6bdac52e012fec9bd43eaa9667f9785" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResetFonts </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxResetFonts </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reset font support by restoring the original ProcVector function pointers. </p>
+
+<p>References <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad20ddd111e4a45bf1bdfd45744946c72"></a><!-- doxytag: member="dmxfont.c::dmxSetFontPath" ref="ad20ddd111e4a45bf1bdfd45744946c72" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxSetFontPath </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reset font support by restoring the original ProcVector function pointers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxfont.c::dmxUnrealizeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00055">dmxFontErrorHandler()</a>, <a class="el" href="dmxfont_8c_source.html#l00053">dmxFontLastError</a>, <a class="el" href="dmxfont_8c_source.html#l00092">dmxFreeFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00062">dmxGetFontPath()</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, and <a class="el" href="dmxfont_8c_source.html#l00147">dmxCheckFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d0df8388cd6cd1a5d7b77dcf9aaa69f"></a><!-- doxytag: member="dmxfont.c::dmxUnrealizeFont" ref="a9d0df8388cd6cd1a5d7b77dcf9aaa69f" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxUnrealizeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxUnrealizeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Unrealize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, and <a class="el" href="dmxfont_8h_source.html#l00044">_dmxFontPriv::refcnt</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a9c9ed2980702f901796479788b6b8f66"></a><!-- doxytag: member="dmxfont.c::dmxFontLastError" ref="a9c9ed2980702f901796479788b6b8f66" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxfont_8c.html#a9c9ed2980702f901796479788b6b8f66">dmxFontLastError</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Unrealize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxfont_8c_source.html#l00055">dmxFontErrorHandler()</a>, and <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a306f6e316020fcda44fb35e1c96f2bd3"></a><!-- doxytag: member="dmxfont.c::dmxSaveProcVector" ref="a306f6e316020fcda44fb35e1c96f2bd3" args="[256])(ClientPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int(* <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a>[256])(ClientPtr)<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00228">dmxInitFonts()</a>, and <a class="el" href="dmxfont_8c_source.html#l00240">dmxResetFonts()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html
deleted file mode 100644
index 18412915d..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxfont_8h-source.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxfont.h</h1><a href="dmxfont_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXFONT_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXFONT_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "fontstruct.h"</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__dmxFontPriv.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxFontPriv.html">_dmxFontPriv</a> {
-00045     <span class="keywordtype">int</span>          refcnt;
-00046     XFontStruct **font;
-00047 } <a class="code" href="struct__dmxFontPriv.html">dmxFontPrivRec</a>, *<a class="code" href="struct__dmxFontPriv.html">dmxFontPrivPtr</a>;
-00048 
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxfont_8c.html#a10">dmxInitFonts</a>(<span class="keywordtype">void</span>);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxfont_8c.html#a11">dmxResetFonts</a>(<span class="keywordtype">void</span>);
-00051 
-00052 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a13">dmxRealizeFont</a>(ScreenPtr pScreen, FontPtr pFont);
-00053 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a15">dmxUnrealizeFont</a>(ScreenPtr pScreen, FontPtr pFont);
-00054 
-00055 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a12">dmxBELoadFont</a>(ScreenPtr pScreen, FontPtr pFont);
-00056 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a14">dmxBEFreeFont</a>(ScreenPtr pScreen, FontPtr pFont);
-00057 
-<a name="l00058"></a><a class="code" href="dmxfont_8h.html#a2">00058</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxfont_8h.html#a2">dmxFontPrivateIndex</a>;
-00059 
-00060 <span class="preprocessor">#endif </span><span class="comment">/* DMXFONT_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h.html
index 503e94697..72b0b35b2 100644
--- a/xorg-server/hw/dmx/doc/html/dmxfont_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxfont_8h.html
@@ -6,319 +6,266 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxfont.h File Reference</h1><code>#include "fontstruct.h"</code><br>
-
-<p>
-<a href="dmxfont_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a0">dmxFontPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a1">dmxFontPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a3">dmxInitFonts</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a4">dmxResetFonts</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a5">dmxRealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a6">dmxUnrealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a7">dmxBELoadFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a8">dmxBEFreeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxfont_8h.html#a2">dmxFontPrivateIndex</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxfont.h File Reference</h1><code>#include &lt;X11/fonts/fontstruct.h&gt;</code><br/>
 
+<p><a href="dmxfont_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a></td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a06305f429e61106b149a71e28db42541">dmxFontPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a79b4c89f92d4b1c88343b39bc681ef2a">dmxFontPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a2d9cf629a70ed7c46a38dac9611b6527">dmxInitFonts</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#ab6bdac52e012fec9bd43eaa9667f9785">dmxResetFonts</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a0119b47dedc04962e24f5b7d86f5cd92">dmxRealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a9d0df8388cd6cd1a5d7b77dcf9aaa69f">dmxUnrealizeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#ad24fe115ec27d050da7a4cb47d7ce52f">dmxBELoadFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#afadf46b46a1f3da085c96849c885a41e">dmxBEFreeFont</a> (ScreenPtr pScreen, FontPtr pFont)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxfont_8h.html#a4e2a5b2ae34073156aef6b406552657f">dmxFontPrivateIndex</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for font-related functions. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxfont_8c.html">dmxfont.c</a></dd></dl>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxfont.h::dmxFontPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for font-related functions. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxfont_8c.html">dmxfont.c</a> </dd></dl>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a79b4c89f92d4b1c88343b39bc681ef2a"></a><!-- doxytag: member="dmxfont.h::dmxFontPrivPtr" ref="a79b4c89f92d4b1c88343b39bc681ef2a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a> * <a class="el" href="struct__dmxFontPriv.html">dmxFontPrivPtr</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a> * <a class="el" href="struct__dmxFontPriv.html">dmxFontPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Font private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxfont.h::dmxFontPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a06305f429e61106b149a71e28db42541"></a><!-- doxytag: member="dmxfont.h::dmxFontPrivRec" ref="a06305f429e61106b149a71e28db42541" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>  <a class="el" href="struct__dmxFontPriv.html">dmxFontPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxFontPriv.html">_dmxFontPriv</a>  <a class="el" href="struct__dmxFontPriv.html">dmxFontPrivRec</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Font private area. </p>
 
-<p>
-Font private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxfont.h::dmxBEFreeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="afadf46b46a1f3da085c96849c885a41e"></a><!-- doxytag: member="dmxfont.h::dmxBEFreeFont" ref="afadf46b46a1f3da085c96849c885a41e" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxBEFreeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Free <em>pFont</em> on the back-end associated with <em>pScreen</em>. </p>
 
-<p>
-Free <em>pFont</em> on the back-end associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxfont.h::dmxBELoadFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad24fe115ec27d050da7a4cb47d7ce52f"></a><!-- doxytag: member="dmxfont.h::dmxBELoadFont" ref="ad24fe115ec27d050da7a4cb47d7ce52f" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBELoadFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxBELoadFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Load the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded. </p>
 
-<p>
-Load the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. When a font is loaded, the font path on back-end server is first initialized to that specified on the command line with the -fontpath options, and then the font is loaded.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxfont.h::dmxInitFonts" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxinit_8c_source.html#l00094">dmxFontPath</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxfont_8c_source.html#l00092">dmxFreeFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00062">dmxGetFontPath()</a>, <a class="el" href="dmxinit_8c_source.html#l00118">dmxIgnoreBadFontPaths</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, and <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d9cf629a70ed7c46a38dac9611b6527"></a><!-- doxytag: member="dmxfont.h::dmxInitFonts" ref="a2d9cf629a70ed7c46a38dac9611b6527" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitFonts </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInitFonts </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized. </p>
 
-<p>
-Initialize font support. In addition to the screen function call pointers, DMX also hooks in at the ProcVector[] level. Here the old ProcVector function pointers are saved and the new ProcVector function pointers are initialized.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxfont.h::dmxRealizeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, and <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0119b47dedc04962e24f5b7d86f5cd92"></a><!-- doxytag: member="dmxfont.h::dmxRealizeFont" ref="a0119b47dedc04962e24f5b7d86f5cd92" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxRealizeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxRealizeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Realize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. </p>
 
-<p>
-Realize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxfont.h::dmxResetFonts" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, and <a class="el" href="dmxfont_8h_source.html#l00044">_dmxFontPriv::refcnt</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab6bdac52e012fec9bd43eaa9667f9785"></a><!-- doxytag: member="dmxfont.h::dmxResetFonts" ref="ab6bdac52e012fec9bd43eaa9667f9785" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResetFonts </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxResetFonts </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Reset font support by restoring the original ProcVector function pointers. </p>
 
-<p>
-Reset font support by restoring the original ProcVector function pointers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxfont.h::dmxUnrealizeFont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxSaveProcVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d0df8388cd6cd1a5d7b77dcf9aaa69f"></a><!-- doxytag: member="dmxfont.h::dmxUnrealizeFont" ref="a9d0df8388cd6cd1a5d7b77dcf9aaa69f" args="(ScreenPtr pScreen, FontPtr pFont)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxUnrealizeFont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxUnrealizeFont </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>FontPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFont</em></td>
+          <td class="paramtype">FontPtr&nbsp;</td>
+          <td class="paramname"> <em>pFont</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Unrealize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>. </p>
 
-<p>
-Unrealize the font, <em>pFont</em>, on the back-end server associated with <em>pScreen</em>.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxfont.h::dmxFontPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, and <a class="el" href="dmxfont_8h_source.html#l00044">_dmxFontPriv::refcnt</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a4e2a5b2ae34073156aef6b406552657f"></a><!-- doxytag: member="dmxfont.h::dmxFontPrivateIndex" ref="a4e2a5b2ae34073156aef6b406552657f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a4">dmxFontPrivateIndex</a>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#a4e2a5b2ae34073156aef6b406552657f">dmxFontPrivateIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Private index for Fonts </p>
 
-<p>
-Private index for Fonts     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html
new file mode 100644
index 000000000..be962052f
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxfont_8h_source.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxfont.h</h1><a href="dmxfont_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXFONT_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXFONT_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &lt;X11/fonts/fontstruct.h&gt;</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__dmxFontPriv.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxFontPriv.html">_dmxFontPriv</a> {
+<a name="l00044"></a><a class="code" href="struct__dmxFontPriv.html#ae91826e69c75c08b5febfaf97d4f3cad">00044</a>     <span class="keywordtype">int</span>          <a class="code" href="struct__dmxFontPriv.html#ae91826e69c75c08b5febfaf97d4f3cad">refcnt</a>;
+<a name="l00045"></a><a class="code" href="struct__dmxFontPriv.html#a2676c12db834b65989761a611ae8568f">00045</a>     XFontStruct **<a class="code" href="struct__dmxFontPriv.html#a2676c12db834b65989761a611ae8568f">font</a>;
+<a name="l00046"></a>00046 } <a class="code" href="struct__dmxFontPriv.html">dmxFontPrivRec</a>, *<a class="code" href="struct__dmxFontPriv.html">dmxFontPrivPtr</a>;
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxfont_8c.html#a2d9cf629a70ed7c46a38dac9611b6527">dmxInitFonts</a>(<span class="keywordtype">void</span>);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxfont_8c.html#ab6bdac52e012fec9bd43eaa9667f9785">dmxResetFonts</a>(<span class="keywordtype">void</span>);
+<a name="l00050"></a>00050 
+<a name="l00051"></a>00051 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a0119b47dedc04962e24f5b7d86f5cd92">dmxRealizeFont</a>(ScreenPtr pScreen, FontPtr pFont);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#a9d0df8388cd6cd1a5d7b77dcf9aaa69f">dmxUnrealizeFont</a>(ScreenPtr pScreen, FontPtr pFont);
+<a name="l00053"></a>00053 
+<a name="l00054"></a>00054 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#ad24fe115ec27d050da7a4cb47d7ce52f">dmxBELoadFont</a>(ScreenPtr pScreen, FontPtr pFont);
+<a name="l00055"></a>00055 <span class="keyword">extern</span> Bool <a class="code" href="dmxfont_8c.html#afadf46b46a1f3da085c96849c885a41e">dmxBEFreeFont</a>(ScreenPtr pScreen, FontPtr pFont);
+<a name="l00056"></a>00056 
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxfont_8h.html#a4e2a5b2ae34073156aef6b406552657f">dmxFontPrivateIndex</a>;
+<a name="l00058"></a>00058 
+<a name="l00059"></a>00059 <span class="preprocessor">#endif </span><span class="comment">/* DMXFONT_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8c.html b/xorg-server/hw/dmx/doc/html/dmxgc_8c.html
index 1102958ed..0d14817e1 100644
--- a/xorg-server/hw/dmx/doc/html/dmxgc_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxgc_8c.html
@@ -6,442 +6,432 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxgc.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgc_8h-source.html">dmxgc.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgcops_8h-source.html">dmxgcops.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>"</code><br>
-<code>#include "gcstruct.h"</code><br>
-<code>#include "pixmapstr.h"</code><br>
-<code>#include "migc.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a2">dmxInitGC</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a3">dmxBECreateGC</a> (ScreenPtr pScreen, GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a4">dmxCreateGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a5">dmxValidateGC</a> (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a6">dmxChangeGC</a> (GCPtr pGC, unsigned long mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a7">dmxCopyGC</a> (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a8">dmxBEFreeGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a9">dmxDestroyGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a10">dmxChangeClip</a> (GCPtr pGC, int type, pointer pvalue, int nrects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a11">dmxDestroyClip</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8c.html#a12">dmxCopyClip</a> (GCPtr pGCDst, GCPtr pGCSrc)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxgc.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgc_8h_source.html">dmxgc.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgcops_8h_source.html">dmxgcops.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&quot;</code><br/>
+<code>#include &quot;gcstruct.h&quot;</code><br/>
+<code>#include &quot;pixmapstr.h&quot;</code><br/>
+<code>#include &quot;migc.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a3f58b7fe15764f42dfdcf6b9dfdd9146">dmxInitGC</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a69cbe2a62465699d0bb5b2a6e187fa3b">dmxBECreateGC</a> (ScreenPtr pScreen, GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a6a6b54ac639feed4b767ba31647ac6f8">dmxCreateGC</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#ad34a918e727baa65bea235ac16b5e08f">dmxValidateGC</a> (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#af07df8b118bf78f1ce4b96fa1d0a2401">dmxChangeGC</a> (GCPtr pGC, unsigned long mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a5a4221a9f3552a0abfe0e968991120bf">dmxCopyGC</a> (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a17c700daf344c32c6daecaf19d19f6a8">dmxBEFreeGC</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a7f33d96c7308bec0eb74822316c7ff23">dmxDestroyGC</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a1e0e73f84cf8b03259b4077dd0246b59">dmxChangeClip</a> (GCPtr pGC, int type, pointer pvalue, int nrects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a7661a8add19b4d73e7b5fe6f39ff7cc0">dmxDestroyClip</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#ae4af2d27e1d593d35696f0bb52fd8302">dmxCopyClip</a> (GCPtr pGCDst, GCPtr pGCSrc)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static GCFuncs&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a3c6b012a9ca843b7f1083a151030c400">dmxGCFuncs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static GCOps&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8c.html#a4688e83670c13b303cba5309eaf23424">dmxGCOps</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for GCs.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxgc.c::dmxBECreateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for GCs. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a69cbe2a62465699d0bb5b2a6e187fa3b"></a><!-- doxytag: member="dmxgc.c::dmxBECreateGC" ref="a69cbe2a62465699d0bb5b2a6e187fa3b" args="(ScreenPtr pScreen, GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxBECreateGC </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create the GC on the back-end server. </p>
 
-<p>
-Create the GC on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxgc.c::dmxBEFreeGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, and <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00677">dmxBECreateScratchGCs()</a>, and <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a17c700daf344c32c6daecaf19d19f6a8"></a><!-- doxytag: member="dmxgc.c::dmxBEFreeGC" ref="a17c700daf344c32c6daecaf19d19f6a8" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreeGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Free the <em>pGC</em> on the back-end server. </p>
 
-<p>
-Free the <em>pGC</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxgc.c::dmxChangeClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01506">dmxBEDestroyScratchGCs()</a>, and <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1e0e73f84cf8b03259b4077dd0246b59"></a><!-- doxytag: member="dmxgc.c::dmxChangeClip" ref="a1e0e73f84cf8b03259b4077dd0246b59" args="(GCPtr pGC, int type, pointer pvalue, int nrects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxChangeClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pvalue</em>, </td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pvalue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrects</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the clip rects for a GC.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxgc.c::dmxChangeGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the clip rects for a GC. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af07df8b118bf78f1ce4b96fa1d0a2401"></a><!-- doxytag: member="dmxgc.c::dmxChangeGC" ref="af07df8b118bf78f1ce4b96fa1d0a2401" args="(GCPtr pGC, unsigned long mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxChangeGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set the values in the graphics context on the back-end server associated with <em>pGC's</em> screen. </p>
 
-<p>
-Set the values in the graphics context on the back-end server associated with <em>pGC's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxgc.c::dmxCopyClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, <a class="el" href="dmxgc_8h_source.html#l00047">_dmxGCPriv::msc</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae4af2d27e1d593d35696f0bb52fd8302"></a><!-- doxytag: member="dmxgc.c::dmxCopyClip" ref="ae4af2d27e1d593d35696f0bb52fd8302" args="(GCPtr pGCDst, GCPtr pGCSrc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCDst</em>, </td>
+          <td class="memname">void dmxCopyClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCSrc</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCSrc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy a GC's clip rects.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxgc.c::dmxCopyGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Copy a GC's clip rects. </p>
+
+<p>References <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, and <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5a4221a9f3552a0abfe0e968991120bf"></a><!-- doxytag: member="dmxgc.c::dmxCopyGC" ref="a5a4221a9f3552a0abfe0e968991120bf" args="(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCSrc</em>, </td>
+          <td class="memname">void dmxCopyGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>changes</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>changes</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCDst</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCDst</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy <em>pGCSrc</em> to <em>pGCDst</em> on the back-end server associated with <em>pGCSrc's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxgc.c::dmxCreateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Copy <em>pGCSrc</em> to <em>pGCDst</em> on the back-end server associated with <em>pGCSrc's</em> screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a6b54ac639feed4b767ba31647ac6f8"></a><!-- doxytag: member="dmxgc.c::dmxCreateGC" ref="a6a6b54ac639feed4b767ba31647ac6f8" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a graphics context on the back-end server associated /a pGC's screen. </p>
 
-<p>
-Create a graphics context on the back-end server associated /a pGC's screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxgc.c::dmxDestroyClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00052">dmxGCFuncs</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxgc_8h_source.html#l00045">_dmxGCPriv::funcs</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, <a class="el" href="dmxgc_8h_source.html#l00047">_dmxGCPriv::msc</a>, and <a class="el" href="dmxgc_8h_source.html#l00044">_dmxGCPriv::ops</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7661a8add19b4d73e7b5fe6f39ff7cc0"></a><!-- doxytag: member="dmxgc.c::dmxDestroyClip" ref="a7661a8add19b4d73e7b5fe6f39ff7cc0" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a GC's clip rects.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxgc.c::dmxDestroyGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy a GC's clip rects. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7f33d96c7308bec0eb74822316c7ff23"></a><!-- doxytag: member="dmxgc.c::dmxDestroyGC" ref="a7f33d96c7308bec0eb74822316c7ff23" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the graphics context, <em>pGC</em> and free the corresponding GC on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxgc.c::dmxInitGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the graphics context, <em>pGC</em> and free the corresponding GC on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3f58b7fe15764f42dfdcf6b9dfdd9146"></a><!-- doxytag: member="dmxgc.c::dmxInitGC" ref="a3f58b7fe15764f42dfdcf6b9dfdd9146" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxInitGC </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize the GC on <em>pScreen</em> </p>
 
-<p>
-Initialize the GC on <em>pScreen</em>, which currently involves allocating the GC private associated with this screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxgc.c::dmxValidateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00071">dmxGCPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad34a918e727baa65bea235ac16b5e08f"></a><!-- doxytag: member="dmxgc.c::dmxValidateGC" ref="ad34a918e727baa65bea235ac16b5e08f" args="(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxValidateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxValidateGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>changes</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>changes</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em></td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Validate a graphics context, <em>pGC</em>, locally in the DMX server and recompute the composite clip, if necessary.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Validate a graphics context, <em>pGC</em>, locally in the DMX server and recompute the composite clip, if necessary. </p>
+
+<p>References <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, and <a class="el" href="dmxgc_8h_source.html#l00044">_dmxGCPriv::ops</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a3c6b012a9ca843b7f1083a151030c400"></a><!-- doxytag: member="dmxgc.c::dmxGCFuncs" ref="a3c6b012a9ca843b7f1083a151030c400" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GCFuncs <a class="el" href="dmxgc_8c.html#a3c6b012a9ca843b7f1083a151030c400">dmxGCFuncs</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <a class="code" href="dmxgc_8c.html#ad34a918e727baa65bea235ac16b5e08f">dmxValidateGC</a>,
+    <a class="code" href="dmxgc_8c.html#af07df8b118bf78f1ce4b96fa1d0a2401">dmxChangeGC</a>,
+    <a class="code" href="dmxgc_8c.html#a5a4221a9f3552a0abfe0e968991120bf">dmxCopyGC</a>,
+    <a class="code" href="dmxgc_8c.html#a7f33d96c7308bec0eb74822316c7ff23">dmxDestroyGC</a>,
+    <a class="code" href="dmxgc_8c.html#a1e0e73f84cf8b03259b4077dd0246b59">dmxChangeClip</a>,
+    <a class="code" href="dmxgc_8c.html#a7661a8add19b4d73e7b5fe6f39ff7cc0">dmxDestroyClip</a>,
+    <a class="code" href="dmxgc_8c.html#ae4af2d27e1d593d35696f0bb52fd8302">dmxCopyClip</a>,
+}
+</pre></div>
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4688e83670c13b303cba5309eaf23424"></a><!-- doxytag: member="dmxgc.c::dmxGCOps" ref="a4688e83670c13b303cba5309eaf23424" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GCOps <a class="el" href="dmxgc_8c.html#a4688e83670c13b303cba5309eaf23424">dmxGCOps</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <a class="code" href="dmxgcops_8c.html#aa70a52ce25b894154a610b0f3fc130cf">dmxFillSpans</a>,
+    <a class="code" href="dmxgcops_8c.html#a5fa3b658c712aa8a4f48a27eca05730d">dmxSetSpans</a>,
+    <a class="code" href="dmxgcops_8c.html#ae1e930ec29cf8bd07acd6ccee4a548a3">dmxPutImage</a>,
+    <a class="code" href="dmxgcops_8c.html#a9165fc8e2f98c6d4d82154a1b52b7c0f">dmxCopyArea</a>,
+    <a class="code" href="dmxgcops_8c.html#aa6b3b34e3b0e151d5b2d5f081f6d6e0f">dmxCopyPlane</a>,
+    <a class="code" href="dmxgcops_8c.html#a03892f8e655a4bb743a264f121b096c6">dmxPolyPoint</a>,
+    <a class="code" href="dmxgcops_8c.html#abd3dea8c777a8e39ffbf2b9fa8e1405e">dmxPolylines</a>,
+    <a class="code" href="dmxgcops_8c.html#a9592aeb83549cbe036a47e9ac90dbf36">dmxPolySegment</a>,
+    <a class="code" href="dmxgcops_8c.html#a6bc862a4f475154ff9ff5f30a0ffcf89">dmxPolyRectangle</a>,
+    <a class="code" href="dmxgcops_8c.html#a7c4ff7ddf5b1a31d11e9124dc18f69f0">dmxPolyArc</a>,
+    <a class="code" href="dmxgcops_8c.html#a4c24d2a2ddb121d2281084dd4f1361a6">dmxFillPolygon</a>,
+    <a class="code" href="dmxgcops_8c.html#a7d7eee30be7b445772f875b8cc1c8e0a">dmxPolyFillRect</a>,
+    <a class="code" href="dmxgcops_8c.html#a5488891f016532e40ba5e31466fb67fd">dmxPolyFillArc</a>,
+    <a class="code" href="dmxgcops_8c.html#a9b3a993a29bb01745ddbf7bd9ff97ef5">dmxPolyText8</a>,
+    <a class="code" href="dmxgcops_8c.html#a2fe37b5892867df4c29292c975c17e52">dmxPolyText16</a>,
+    <a class="code" href="dmxgcops_8c.html#a1fc863ca944469fc34d78db948f14053">dmxImageText8</a>,
+    <a class="code" href="dmxgcops_8c.html#acb19f9ef082c76f281679994057fafe1">dmxImageText16</a>,
+    <a class="code" href="dmxgcops_8c.html#a3feeb20d71e2368e436633eddf4b13ac">dmxImageGlyphBlt</a>,
+    <a class="code" href="dmxgcops_8c.html#ae1200c166d613547b34d0adf04d152ea">dmxPolyGlyphBlt</a>,
+    <a class="code" href="dmxgcops_8c.html#a2ca1093683e50ef80846d76a83d2f102">dmxPushPixels</a>
+}
+</pre></div>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html
deleted file mode 100644
index 9e1df9e31..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxgc_8h-source.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxgc.h</h1><a href="dmxgc_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXGC_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXGC_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "gcstruct.h"</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__dmxGCPriv.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxGCPriv.html">_dmxGCPriv</a> {
-00045     GCOps   *ops;
-00046     GCFuncs *funcs;
-00047     XlibGC   gc;
-00048     Bool     msc;
-00049 } <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivRec</a>, *<a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>;
-00050 
-00051 
-00052 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a2">dmxInitGC</a>(ScreenPtr pScreen);
-00053 
-00054 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a4">dmxCreateGC</a>(GCPtr pGC);
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a5">dmxValidateGC</a>(GCPtr pGC, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> changes,
-00056                           DrawablePtr pDrawable);
-00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a6">dmxChangeGC</a>(GCPtr pGC, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> mask);
-00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a7">dmxCopyGC</a>(GCPtr pGCSrc, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> changes, GCPtr pGCDst);
-00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a9">dmxDestroyGC</a>(GCPtr pGC);
-00060 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a10">dmxChangeClip</a>(GCPtr pGC, <span class="keywordtype">int</span> type, pointer pvalue, <span class="keywordtype">int</span> nrects);
-00061 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a11">dmxDestroyClip</a>(GCPtr pGC);
-00062 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a12">dmxCopyClip</a>(GCPtr pGCDst, GCPtr pGCSrc);
-00063 
-00064 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a3">dmxBECreateGC</a>(ScreenPtr pScreen, GCPtr pGC);
-00065 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a8">dmxBEFreeGC</a>(GCPtr pGC);
-00066 
-<a name="l00068"></a><a class="code" href="dmxgc_8h.html#a5">00068</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxgc_8h.html#a5">dmxGCPrivateIndex</a>;
-00069 
-<a name="l00071"></a><a class="code" href="dmxgc_8h.html#a0">00071</a> <span class="preprocessor">#define DMX_GET_GC_PRIV(_pGC)                                           \</span>
-00072 <span class="preprocessor">    (dmxGCPrivPtr)(_pGC)-&gt;devPrivates[dmxGCPrivateIndex].ptr</span>
-00073 <span class="preprocessor"></span>
-00074 <span class="preprocessor">#define DMX_GC_FUNC_PROLOGUE(_pGC)                                      \</span>
-00075 <span class="preprocessor">do {                                                                    \</span>
-00076 <span class="preprocessor">    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \</span>
-00077 <span class="preprocessor">    DMX_UNWRAP(funcs, _pGCPriv, (_pGC));                                \</span>
-00078 <span class="preprocessor">    if (_pGCPriv-&gt;ops)                                                  \</span>
-00079 <span class="preprocessor">        DMX_UNWRAP(ops, _pGCPriv, (_pGC));                              \</span>
-00080 <span class="preprocessor">} while (0)</span>
-00081 <span class="preprocessor"></span>
-00082 <span class="preprocessor">#define DMX_GC_FUNC_EPILOGUE(_pGC)                                      \</span>
-00083 <span class="preprocessor">do {                                                                    \</span>
-00084 <span class="preprocessor">    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \</span>
-00085 <span class="preprocessor">    DMX_WRAP(funcs, &amp;dmxGCFuncs, _pGCPriv, (_pGC));                     \</span>
-00086 <span class="preprocessor">    if (_pGCPriv-&gt;ops)                                                  \</span>
-00087 <span class="preprocessor">        DMX_WRAP(ops, &amp;dmxGCOps, _pGCPriv, (_pGC));                     \</span>
-00088 <span class="preprocessor">} while (0)</span>
-00089 <span class="preprocessor"></span>
-00090 <span class="preprocessor">#endif </span><span class="comment">/* DMXGC_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h.html
index f16d40d02..3341c2b68 100644
--- a/xorg-server/hw/dmx/doc/html/dmxgc_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxgc_8h.html
@@ -6,547 +6,498 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxgc.h File Reference</h1><code>#include "gcstruct.h"</code><br>
-
-<p>
-<a href="dmxgc_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a0">DMX_GET_GC_PRIV</a>(_pGC)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>)(_pGC)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a2">dmxGCPrivateIndex</a>].ptr</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a3">dmxGCPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a4">dmxGCPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a6">dmxInitGC</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a7">dmxCreateGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a8">dmxValidateGC</a> (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a9">dmxChangeGC</a> (GCPtr pGC, unsigned long mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a10">dmxCopyGC</a> (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a11">dmxDestroyGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a12">dmxChangeClip</a> (GCPtr pGC, int type, pointer pvalue, int nrects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a13">dmxDestroyClip</a> (GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a14">dmxCopyClip</a> (GCPtr pGCDst, GCPtr pGCSrc)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a15">dmxBECreateGC</a> (ScreenPtr pScreen, GCPtr pGC)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a16">dmxBEFreeGC</a> (GCPtr pGC)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgc_8h.html#a5">dmxGCPrivateIndex</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxgc.h File Reference</h1><code>#include &quot;gcstruct.h&quot;</code><br/>
+
+<p><a href="dmxgc_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">DMX_GET_GC_PRIV</a>(_pGC)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>)dixLookupPrivate(&amp;(_pGC)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#aa4d5583f3d6876e1fb96226ec9aa281a">DMX_GC_FUNC_PROLOGUE</a>(_pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#aa69b8c93d609c2be2d8680388477d5a4">DMX_GC_FUNC_EPILOGUE</a>(_pGC)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a2d7a664f045bba899390f66832c1ccf8">dmxGCPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a234db372824505de585d75173374f566">dmxGCPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a3f58b7fe15764f42dfdcf6b9dfdd9146">dmxInitGC</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a6a6b54ac639feed4b767ba31647ac6f8">dmxCreateGC</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#ad34a918e727baa65bea235ac16b5e08f">dmxValidateGC</a> (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#af07df8b118bf78f1ce4b96fa1d0a2401">dmxChangeGC</a> (GCPtr pGC, unsigned long mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a5a4221a9f3552a0abfe0e968991120bf">dmxCopyGC</a> (GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a7f33d96c7308bec0eb74822316c7ff23">dmxDestroyGC</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a1e0e73f84cf8b03259b4077dd0246b59">dmxChangeClip</a> (GCPtr pGC, int type, pointer pvalue, int nrects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a7661a8add19b4d73e7b5fe6f39ff7cc0">dmxDestroyClip</a> (GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#ae4af2d27e1d593d35696f0bb52fd8302">dmxCopyClip</a> (GCPtr pGCDst, GCPtr pGCSrc)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a69cbe2a62465699d0bb5b2a6e187fa3b">dmxBECreateGC</a> (ScreenPtr pScreen, GCPtr pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#a17c700daf344c32c6daecaf19d19f6a8">dmxBEFreeGC</a> (GCPtr pGC)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgc_8h.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for GC support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxgc_8c.html">dmxgc.c</a></dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxgc.h::DMX_GET_GC_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_GC_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pGC&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>)(_pGC)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a2">dmxGCPrivateIndex</a>].ptr
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for GC support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxgc_8c.html">dmxgc.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="aa69b8c93d609c2be2d8680388477d5a4"></a><!-- doxytag: member="dmxgc.h::DMX_GC_FUNC_EPILOGUE" ref="aa69b8c93d609c2be2d8680388477d5a4" args="(_pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_GC_FUNC_EPILOGUE</td>
+          <td>(</td>
+          <td class="paramtype">_pGC&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get private.     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxgc.h::dmxGCPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a> * <a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
+    <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a> _pGCPriv = <a class="code" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">DMX_GET_GC_PRIV</a>(_pGC);                      \
+    <a class="code" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">DMX_WRAP</a>(funcs, &amp;<a class="code" href="dmxgc_8c.html#a3c6b012a9ca843b7f1083a151030c400">dmxGCFuncs</a>, _pGCPriv, (_pGC));                     \
+    <span class="keywordflow">if</span> (_pGCPriv-&gt;<a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a>)                                                  \
+        <a class="code" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">DMX_WRAP</a>(ops, &amp;<a class="code" href="dmxgc_8c.html#a4688e83670c13b303cba5309eaf23424">dmxGCOps</a>, _pGCPriv, (_pGC));                     \
+} <span class="keywordflow">while</span> (0)
+</pre></div>
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00416">dmxCopyClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>, and <a class="el" href="dmxgc_8c_source.html#l00153">dmxValidateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa4d5583f3d6876e1fb96226ec9aa281a"></a><!-- doxytag: member="dmxgc.h::DMX_GC_FUNC_PROLOGUE" ref="aa4d5583f3d6876e1fb96226ec9aa281a" args="(_pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_GC_FUNC_PROLOGUE</td>
+          <td>(</td>
+          <td class="paramtype">_pGC&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-GC private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxgc.h::dmxGCPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
+    <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a> _pGCPriv = <a class="code" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">DMX_GET_GC_PRIV</a>(_pGC);                      \
+    <a class="code" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">DMX_UNWRAP</a>(funcs, _pGCPriv, (_pGC));                                \
+    <span class="keywordflow">if</span> (_pGCPriv-&gt;<a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a>)                                                  \
+        <a class="code" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">DMX_UNWRAP</a>(ops, _pGCPriv, (_pGC));                              \
+} <span class="keywordflow">while</span> (0)
+</pre></div>
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00416">dmxCopyClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>, and <a class="el" href="dmxgc_8c_source.html#l00153">dmxValidateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a42556da1890b53da10806fbab8174549"></a><!-- doxytag: member="dmxgc.h::DMX_GET_GC_PRIV" ref="a42556da1890b53da10806fbab8174549" args="(_pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>  <a class="el" href="struct__dmxGCPriv.html">dmxGCPrivRec</a>
+          <td class="memname">#define DMX_GET_GC_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pGC&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>)dixLookupPrivate(&amp;(_pGC)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a>)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-GC private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a15" doxytag="dmxgc.h::dmxBECreateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Get private. </p>
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, and <a class="el" href="dmxgc_8c_source.html#l00153">dmxValidateGC()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a234db372824505de585d75173374f566"></a><!-- doxytag: member="dmxgc.h::dmxGCPrivPtr" ref="a234db372824505de585d75173374f566" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a> * <a class="el" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2d7a664f045bba899390f66832c1ccf8"></a><!-- doxytag: member="dmxgc.h::dmxGCPrivRec" ref="a2d7a664f045bba899390f66832c1ccf8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxGCPriv.html">_dmxGCPriv</a>  <a class="el" href="struct__dmxGCPriv.html">dmxGCPrivRec</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>GC private area. </p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a69cbe2a62465699d0bb5b2a6e187fa3b"></a><!-- doxytag: member="dmxgc.h::dmxBECreateGC" ref="a69cbe2a62465699d0bb5b2a6e187fa3b" args="(ScreenPtr pScreen, GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBECreateGC </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create the GC on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxgc.h::dmxBEFreeGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create the GC on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, and <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00677">dmxBECreateScratchGCs()</a>, and <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a17c700daf344c32c6daecaf19d19f6a8"></a><!-- doxytag: member="dmxgc.h::dmxBEFreeGC" ref="a17c700daf344c32c6daecaf19d19f6a8" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreeGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free the <em>pGC</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxgc.h::dmxChangeClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free the <em>pGC</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01506">dmxBEDestroyScratchGCs()</a>, and <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1e0e73f84cf8b03259b4077dd0246b59"></a><!-- doxytag: member="dmxgc.h::dmxChangeClip" ref="a1e0e73f84cf8b03259b4077dd0246b59" args="(GCPtr pGC, int type, pointer pvalue, int nrects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxChangeClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pvalue</em>, </td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pvalue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrects</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the clip rects for a GC.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxgc.h::dmxChangeGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the clip rects for a GC. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af07df8b118bf78f1ce4b96fa1d0a2401"></a><!-- doxytag: member="dmxgc.h::dmxChangeGC" ref="af07df8b118bf78f1ce4b96fa1d0a2401" args="(GCPtr pGC, unsigned long mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxChangeGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the values in the graphics context on the back-end server associated with <em>pGC's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxgc.h::dmxCopyClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set the values in the graphics context on the back-end server associated with <em>pGC's</em> screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxfont_8h_source.html#l00045">_dmxFontPriv::font</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, <a class="el" href="dmxgc_8h_source.html#l00047">_dmxGCPriv::msc</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae4af2d27e1d593d35696f0bb52fd8302"></a><!-- doxytag: member="dmxgc.h::dmxCopyClip" ref="ae4af2d27e1d593d35696f0bb52fd8302" args="(GCPtr pGCDst, GCPtr pGCSrc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCDst</em>, </td>
+          <td class="memname">void dmxCopyClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCSrc</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCSrc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy a GC's clip rects.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxgc.h::dmxCopyGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Copy a GC's clip rects. </p>
+
+<p>References <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, and <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5a4221a9f3552a0abfe0e968991120bf"></a><!-- doxytag: member="dmxgc.h::dmxCopyGC" ref="a5a4221a9f3552a0abfe0e968991120bf" args="(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCSrc</em>, </td>
+          <td class="memname">void dmxCopyGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>changes</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>changes</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGCDst</em></td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGCDst</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy <em>pGCSrc</em> to <em>pGCDst</em> on the back-end server associated with <em>pGCSrc's</em> screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxgc.h::dmxCreateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Copy <em>pGCSrc</em> to <em>pGCDst</em> on the back-end server associated with <em>pGCSrc's</em> screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a6b54ac639feed4b767ba31647ac6f8"></a><!-- doxytag: member="dmxgc.h::dmxCreateGC" ref="a6a6b54ac639feed4b767ba31647ac6f8" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a graphics context on the back-end server associated /a pGC's screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxgc.h::dmxDestroyClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a graphics context on the back-end server associated /a pGC's screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00052">dmxGCFuncs</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxgc_8h_source.html#l00045">_dmxGCPriv::funcs</a>, <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>, <a class="el" href="dmxgc_8h_source.html#l00047">_dmxGCPriv::msc</a>, and <a class="el" href="dmxgc_8h_source.html#l00044">_dmxGCPriv::ops</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7661a8add19b4d73e7b5fe6f39ff7cc0"></a><!-- doxytag: member="dmxgc.h::dmxDestroyClip" ref="a7661a8add19b4d73e7b5fe6f39ff7cc0" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyClip </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a GC's clip rects.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxgc.h::dmxDestroyGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy a GC's clip rects. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7f33d96c7308bec0eb74822316c7ff23"></a><!-- doxytag: member="dmxgc.h::dmxDestroyGC" ref="a7f33d96c7308bec0eb74822316c7ff23" args="(GCPtr pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pGC</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the graphics context, <em>pGC</em> and free the corresponding GC on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxgc.h::dmxInitGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the graphics context, <em>pGC</em> and free the corresponding GC on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3f58b7fe15764f42dfdcf6b9dfdd9146"></a><!-- doxytag: member="dmxgc.h::dmxInitGC" ref="a3f58b7fe15764f42dfdcf6b9dfdd9146" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxInitGC </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the GC on <em>pScreen</em>, which currently involves allocating the GC private associated with this screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxgc.h::dmxValidateGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the GC on <em>pScreen</em> </p>
+
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00071">dmxGCPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad34a918e727baa65bea235ac16b5e08f"></a><!-- doxytag: member="dmxgc.h::dmxValidateGC" ref="ad34a918e727baa65bea235ac16b5e08f" args="(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxValidateGC </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxValidateGC </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>changes</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>changes</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em></td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Validate a graphics context, <em>pGC</em>, locally in the DMX server and recompute the composite clip, if necessary.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxgc.h::dmxGCPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a2">dmxGCPrivateIndex</a>
+</div>
+<div class="memdoc">
+<p>Validate a graphics context, <em>pGC</em>, locally in the DMX server and recompute the composite clip, if necessary. </p>
+
+<p>References <a class="el" href="dmxgc_8h_source.html#l00081">DMX_GC_FUNC_EPILOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00073">DMX_GC_FUNC_PROLOGUE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, and <a class="el" href="dmxgc_8h_source.html#l00044">_dmxGCPriv::ops</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ac268fa35580a060a02ec3ae0ff2b2669"></a><!-- doxytag: member="dmxgc.h::dmxGCPrivateKey" ref="ac268fa35580a060a02ec3ae0ff2b2669" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for GCs     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Private index. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxgc_8c.html">dmxgc.c</a> </dd>
+<dd>
+<a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a></dd></dl>
+<p>Private index for GCs </p>
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00086">dmxInitGC()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html
new file mode 100644
index 000000000..11b8e5a9f
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxgc_8h_source.html
@@ -0,0 +1,119 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxgc.h</h1><a href="dmxgc_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXGC_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXGC_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;gcstruct.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__dmxGCPriv.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxGCPriv.html">_dmxGCPriv</a> {
+<a name="l00044"></a><a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">00044</a>     GCOps   *<a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a>;
+<a name="l00045"></a><a class="code" href="struct__dmxGCPriv.html#a0bcaef15efa842b96d3080342a1018fd">00045</a>     GCFuncs *<a class="code" href="struct__dmxGCPriv.html#a0bcaef15efa842b96d3080342a1018fd">funcs</a>;
+<a name="l00046"></a><a class="code" href="struct__dmxGCPriv.html#a1df255c2a582d3168868747ecea8055f">00046</a>     XlibGC   <a class="code" href="struct__dmxGCPriv.html#a1df255c2a582d3168868747ecea8055f">gc</a>;
+<a name="l00047"></a><a class="code" href="struct__dmxGCPriv.html#afb862aeafa43f8d936f07850b9fd374c">00047</a>     Bool     <a class="code" href="struct__dmxGCPriv.html#afb862aeafa43f8d936f07850b9fd374c">msc</a>;
+<a name="l00048"></a>00048 } <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivRec</a>, *<a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a>;
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050 
+<a name="l00051"></a>00051 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a3f58b7fe15764f42dfdcf6b9dfdd9146">dmxInitGC</a>(ScreenPtr pScreen);
+<a name="l00052"></a>00052 
+<a name="l00053"></a>00053 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a6a6b54ac639feed4b767ba31647ac6f8">dmxCreateGC</a>(GCPtr pGC);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#ad34a918e727baa65bea235ac16b5e08f">dmxValidateGC</a>(GCPtr pGC, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> changes,
+<a name="l00055"></a>00055                           DrawablePtr pDrawable);
+<a name="l00056"></a>00056 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#af07df8b118bf78f1ce4b96fa1d0a2401">dmxChangeGC</a>(GCPtr pGC, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> mask);
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a5a4221a9f3552a0abfe0e968991120bf">dmxCopyGC</a>(GCPtr pGCSrc, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> changes, GCPtr pGCDst);
+<a name="l00058"></a>00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a7f33d96c7308bec0eb74822316c7ff23">dmxDestroyGC</a>(GCPtr pGC);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a1e0e73f84cf8b03259b4077dd0246b59">dmxChangeClip</a>(GCPtr pGC, <span class="keywordtype">int</span> type, pointer pvalue, <span class="keywordtype">int</span> nrects);
+<a name="l00060"></a>00060 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a7661a8add19b4d73e7b5fe6f39ff7cc0">dmxDestroyClip</a>(GCPtr pGC);
+<a name="l00061"></a>00061 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#ae4af2d27e1d593d35696f0bb52fd8302">dmxCopyClip</a>(GCPtr pGCDst, GCPtr pGCSrc);
+<a name="l00062"></a>00062 
+<a name="l00063"></a>00063 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgc_8c.html#a69cbe2a62465699d0bb5b2a6e187fa3b">dmxBECreateGC</a>(ScreenPtr pScreen, GCPtr pGC);
+<a name="l00064"></a>00064 <span class="keyword">extern</span> Bool <a class="code" href="dmxgc_8c.html#a17c700daf344c32c6daecaf19d19f6a8">dmxBEFreeGC</a>(GCPtr pGC);
+<a name="l00065"></a>00065 
+<a name="l00067"></a>00067 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxgc_8h.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a>;
+<a name="l00068"></a>00068 
+<a name="l00070"></a><a class="code" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">00070</a> <span class="preprocessor">#define DMX_GET_GC_PRIV(_pGC)                                           \</span>
+<a name="l00071"></a>00071 <span class="preprocessor">    (dmxGCPrivPtr)dixLookupPrivate(&amp;(_pGC)-&gt;devPrivates, dmxGCPrivateKey)</span>
+<a name="l00072"></a>00072 <span class="preprocessor"></span>
+<a name="l00073"></a><a class="code" href="dmxgc_8h.html#aa4d5583f3d6876e1fb96226ec9aa281a">00073</a> <span class="preprocessor">#define DMX_GC_FUNC_PROLOGUE(_pGC)                                      \</span>
+<a name="l00074"></a>00074 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00075"></a>00075 <span class="preprocessor">    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \</span>
+<a name="l00076"></a>00076 <span class="preprocessor">    DMX_UNWRAP(funcs, _pGCPriv, (_pGC));                                \</span>
+<a name="l00077"></a>00077 <span class="preprocessor">    if (_pGCPriv-&gt;ops)                                                  \</span>
+<a name="l00078"></a>00078 <span class="preprocessor">        DMX_UNWRAP(ops, _pGCPriv, (_pGC));                              \</span>
+<a name="l00079"></a>00079 <span class="preprocessor">} while (0)</span>
+<a name="l00080"></a>00080 <span class="preprocessor"></span>
+<a name="l00081"></a><a class="code" href="dmxgc_8h.html#aa69b8c93d609c2be2d8680388477d5a4">00081</a> <span class="preprocessor">#define DMX_GC_FUNC_EPILOGUE(_pGC)                                      \</span>
+<a name="l00082"></a>00082 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00083"></a>00083 <span class="preprocessor">    dmxGCPrivPtr _pGCPriv = DMX_GET_GC_PRIV(_pGC);                      \</span>
+<a name="l00084"></a>00084 <span class="preprocessor">    DMX_WRAP(funcs, &amp;dmxGCFuncs, _pGCPriv, (_pGC));                     \</span>
+<a name="l00085"></a>00085 <span class="preprocessor">    if (_pGCPriv-&gt;ops)                                                  \</span>
+<a name="l00086"></a>00086 <span class="preprocessor">        DMX_WRAP(ops, &amp;dmxGCOps, _pGCPriv, (_pGC));                     \</span>
+<a name="l00087"></a>00087 <span class="preprocessor">} while (0)</span>
+<a name="l00088"></a>00088 <span class="preprocessor"></span>
+<a name="l00089"></a>00089 <span class="preprocessor">#endif </span><span class="comment">/* DMXGC_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html
index d24b53a2c..42ecb5c79 100644
--- a/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8c.html
@@ -6,1462 +6,1370 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxgcops.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgc_8h-source.html">dmxgc.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgcops_8h-source.html">dmxgcops.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "mi.h"</code><br>
-<code>#include "gcstruct.h"</code><br>
-<code>#include "pixmapstr.h"</code><br>
-<code>#include "dixfontstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a2">dmxFillSpans</a> (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a3">dmxSetSpans</a> (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a4">dmxPutImage</a> (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a5">dmxCopyArea</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a6">dmxCopyPlane</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a7">dmxPolyPoint</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a8">dmxPolylines</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a9">dmxPolySegment</a> (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a10">dmxPolyRectangle</a> (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a11">dmxPolyArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a12">dmxFillPolygon</a> (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a13">dmxPolyFillRect</a> (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a14">dmxPolyFillArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a15">dmxPolyText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a16">dmxPolyText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a17">dmxImageText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a18">dmxImageText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a19">dmxImageGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a20">dmxPolyGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a21">dmxPushPixels</a> (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a22">dmxGetImage</a> (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8c.html#a23">dmxGetSpans</a> (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxgcops.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgc_8h_source.html">dmxgc.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgcops_8h_source.html">dmxgcops.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;mi.h&quot;</code><br/>
+<code>#include &quot;gcstruct.h&quot;</code><br/>
+<code>#include &quot;pixmapstr.h&quot;</code><br/>
+<code>#include &quot;dixfontstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a4e091318ff2a64af06aef315453b88a2">DMX_GCOPS_SET_DRAWABLE</a>(_pDraw, _draw)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a95d43c03eb7e78bbe20269c5e7dc6e14">DMX_GCOPS_OFFSCREEN</a>(_pDraw)</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#aa70a52ce25b894154a610b0f3fc130cf">dmxFillSpans</a> (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a5fa3b658c712aa8a4f48a27eca05730d">dmxSetSpans</a> (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#ae1e930ec29cf8bd07acd6ccee4a548a3">dmxPutImage</a> (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a9165fc8e2f98c6d4d82154a1b52b7c0f">dmxCopyArea</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#aa6b3b34e3b0e151d5b2d5f081f6d6e0f">dmxCopyPlane</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a03892f8e655a4bb743a264f121b096c6">dmxPolyPoint</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#abd3dea8c777a8e39ffbf2b9fa8e1405e">dmxPolylines</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a9592aeb83549cbe036a47e9ac90dbf36">dmxPolySegment</a> (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a6bc862a4f475154ff9ff5f30a0ffcf89">dmxPolyRectangle</a> (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a7c4ff7ddf5b1a31d11e9124dc18f69f0">dmxPolyArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a4c24d2a2ddb121d2281084dd4f1361a6">dmxFillPolygon</a> (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a7d7eee30be7b445772f875b8cc1c8e0a">dmxPolyFillRect</a> (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a5488891f016532e40ba5e31466fb67fd">dmxPolyFillArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a9b3a993a29bb01745ddbf7bd9ff97ef5">dmxPolyText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a2fe37b5892867df4c29292c975c17e52">dmxPolyText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a1fc863ca944469fc34d78db948f14053">dmxImageText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#acb19f9ef082c76f281679994057fafe1">dmxImageText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a3feeb20d71e2368e436633eddf4b13ac">dmxImageGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#ae1200c166d613547b34d0adf04d152ea">dmxPolyGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a2ca1093683e50ef80846d76a83d2f102">dmxPushPixels</a> (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#ad44d59f0e4f0c77ca7278cb5d31f0121">dmxFindAlternatePixmap</a> (DrawablePtr pDrawable, XID *draw)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#ace88d57bbb8edfcdc3e7206e59c1e30f">dmxGetImage</a> (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8c.html#a2a6026c8f03a56ca5ab93dc2c9cf868f">dmxGetSpans</a> (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for GC operations.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxgcops.c::dmxCopyArea" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for GC operations. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a95d43c03eb7e78bbe20269c5e7dc6e14"></a><!-- doxytag: member="dmxgcops.c::DMX_GCOPS_OFFSCREEN" ref="a95d43c03eb7e78bbe20269c5e7dc6e14" args="(_pDraw)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxCopyArea </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="memname">#define DMX_GCOPS_OFFSCREEN</td>
+          <td>(</td>
+          <td class="paramtype">_pDraw&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">(!<a class="code" href="dmx_8h.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a>[(_pDraw)-&gt;pScreen-&gt;myNum].<a class="code" href="struct__DMXScreenInfo.html#a756ade62a55a52f163a42db6de54c244">beDisplay</a> ||                     \
+     (<a class="code" href="dmx_8h.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a> &amp;&amp;                                                \
+      (_pDraw)-&gt;type == DRAWABLE_WINDOW &amp;&amp;                              \
+      (<a class="code" href="dmxwindow_8h.html#afbcb941cf0707b8bfbe0ac5889123ea3">DMX_GET_WINDOW_PRIV</a>((WindowPtr)(_pDraw))-&gt;offscreen ||           \
+       !<a class="code" href="dmxwindow_8h.html#afbcb941cf0707b8bfbe0ac5889123ea3">DMX_GET_WINDOW_PRIV</a>((WindowPtr)(_pDraw))-&gt;window)))
+</pre></div>
+<p>Referenced by <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4e091318ff2a64af06aef315453b88a2"></a><!-- doxytag: member="dmxgcops.c::DMX_GCOPS_SET_DRAWABLE" ref="a4e091318ff2a64af06aef315453b88a2" args="(_pDraw, _draw)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="memname">#define DMX_GCOPS_SET_DRAWABLE</td>
+          <td>(</td>
+          <td class="paramtype">_pDraw, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">_draw&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
+    <span class="keywordflow">if</span> ((_pDraw)-&gt;type == DRAWABLE_WINDOW) {                            \
+        <a class="code" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>  pWinPriv =                                       \
+            <a class="code" href="dmxwindow_8h.html#afbcb941cf0707b8bfbe0ac5889123ea3">DMX_GET_WINDOW_PRIV</a>((WindowPtr)(_pDraw));                   \
+        (_draw) = (Drawable)pWinPriv-&gt;<a class="code" href="struct__dmxWinPriv.html#a9e9f2544f80c5f6988afbc36be92f71f">window</a>;                           \
+    } <span class="keywordflow">else</span> {                                                            \
+        <a class="code" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>  pPixPriv =                                       \
+            <a class="code" href="dmxpixmap_8h.html#add8168a70114703a791f8d154d139e2a">DMX_GET_PIXMAP_PRIV</a>((PixmapPtr)(_pDraw));                   \
+        (_draw) = (Drawable)pPixPriv-&gt;<a class="code" href="struct__dmxPixPriv.html#a7b3f9090169c50760c7a18e801091c2f">pixmap</a>;                           \
+    }                                                                   \
+} <span class="keywordflow">while</span> (0)
+</pre></div>
+<p>Referenced by <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a9165fc8e2f98c6d4d82154a1b52b7c0f"></a><!-- doxytag: member="dmxgcops.c::dmxCopyArea" ref="a9165fc8e2f98c6d4d82154a1b52b7c0f" args="(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcx</em>, </td>
+          <td class="memname">RegionPtr dmxCopyArea </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcy</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dstx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dstx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dsty</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dsty</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Copy area from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible. </p>
 
-<p>
-Copy area from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxgcops.c::dmxCopyPlane" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6b3b34e3b0e151d5b2d5f081f6d6e0f"></a><!-- doxytag: member="dmxgcops.c::dmxCopyPlane" ref="aa6b3b34e3b0e151d5b2d5f081f6d6e0f" args="(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxCopyPlane </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="memname">RegionPtr dmxCopyPlane </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcy</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dstx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dstx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dsty</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dsty</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>bitPlane</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bitPlane</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Copy plane number <em>bitPlane</em> from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible. </p>
 
-<p>
-Copy plane number <em>bitPlane</em> from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxgcops.c::dmxFillPolygon" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4c24d2a2ddb121d2281084dd4f1361a6"></a><!-- doxytag: member="dmxgcops.c::dmxFillPolygon" ref="a4c24d2a2ddb121d2281084dd4f1361a6" args="(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFillPolygon </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxFillPolygon </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>shape</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>shape</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPts</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pPts</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render a filled polygons in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render a filled polygons in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxgcops.c::dmxFillSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa70a52ce25b894154a610b0f3fc130cf"></a><!-- doxytag: member="dmxgcops.c::dmxFillSpans" ref="aa70a52ce25b894154a610b0f3fc130cf" args="(DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFillSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxFillSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nInit</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidthInit</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidthInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fSorted</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fSorted</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill spans -- this function should never be called. </p>
 
-<p>
-Fill spans -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxgcops.c::dmxGetImage" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ad44d59f0e4f0c77ca7278cb5d31f0121"></a><!-- doxytag: member="dmxgcops.c::dmxFindAlternatePixmap" ref="ad44d59f0e4f0c77ca7278cb5d31f0121" args="(DrawablePtr pDrawable, XID *draw)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetImage </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxFindAlternatePixmap </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sx</em>, </td>
+          <td class="paramtype">XID *&nbsp;</td>
+          <td class="paramname"> <em>draw</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sy</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>When Xinerama is active, the client pixmaps are always obtained from screen 0. When screen 0 is detached, the pixmaps must be obtained from any other screen that is not detached. Usually, this is screen 1. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ace88d57bbb8edfcdc3e7206e59c1e30f"></a><!-- doxytag: member="dmxgcops.c::dmxGetImage" ref="ace88d57bbb8edfcdc3e7206e59c1e30f" args="(DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="memname">void dmxGetImage </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sy</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>planeMask</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>planeMask</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdstLine</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pdstLine</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get an image from the back-end server associated with <em>pDrawable's</em> screen. If <em>pDrawable</em> is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of <em>pDrawable</em> that is viewable. If no viewable ancestor is found, then simply return without getting an image. </p>
 
-<p>
-Get an image from the back-end server associated with <em>pDrawable's</em> screen. If <em>pDrawable</em> is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of <em>pDrawable</em> that is viewable. If no viewable ancestor is found, then simply return without getting an image.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxgcops.c::dmxGetSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a6026c8f03a56ca5ab93dc2c9cf868f"></a><!-- doxytag: member="dmxgcops.c::dmxGetSpans" ref="a2a6026c8f03a56ca5ab93dc2c9cf868f" args="(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxGetSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>wMax</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>wMax</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppt</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>ppt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidth</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nspans</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nspans</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdstStart</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pdstStart</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get Spans -- this function should never be called. </p>
 
-<p>
-Get Spans -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxgcops.c::dmxImageGlyphBlt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3feeb20d71e2368e436633eddf4b13ac"></a><!-- doxytag: member="dmxgcops.c::dmxImageGlyphBlt" ref="a3feeb20d71e2368e436633eddf4b13ac" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageGlyphBlt </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageGlyphBlt </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nglyph</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>nglyph</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CharInfoPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppci</em>, </td>
+          <td class="paramtype">CharInfoPtr *&nbsp;</td>
+          <td class="paramname"> <em>ppci</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pglyphBase</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pglyphBase</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Image Glyph Blt -- this function should never be called. </p>
 
-<p>
-Image Glyph Blt -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxgcops.c::dmxImageText16" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="acb19f9ef082c76f281679994057fafe1"></a><!-- doxytag: member="dmxgcops.c::dmxImageText16" ref="acb19f9ef082c76f281679994057fafe1" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageText16 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageText16 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 16-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 16-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxgcops.c::dmxImageText8" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1fc863ca944469fc34d78db948f14053"></a><!-- doxytag: member="dmxgcops.c::dmxImageText8" ref="a1fc863ca944469fc34d78db948f14053" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageText8 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageText8 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 8-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 8-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxgcops.c::dmxPolyArc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c4ff7ddf5b1a31d11e9124dc18f69f0"></a><!-- doxytag: member="dmxgcops.c::dmxPolyArc" ref="a7c4ff7ddf5b1a31d11e9124dc18f69f0" args="(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyArc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyArc </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>narcs</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>narcs</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xArc *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parcs</em></td>
+          <td class="paramtype">xArc *&nbsp;</td>
+          <td class="paramname"> <em>parcs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of arc outlines, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of arc outlines, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxgcops.c::dmxPolyFillArc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5488891f016532e40ba5e31466fb67fd"></a><!-- doxytag: member="dmxgcops.c::dmxPolyFillArc" ref="a5488891f016532e40ba5e31466fb67fd" args="(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyFillArc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyFillArc </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>narcs</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>narcs</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xArc *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parcs</em></td>
+          <td class="paramtype">xArc *&nbsp;</td>
+          <td class="paramname"> <em>parcs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of filled arcs, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of filled arcs, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxgcops.c::dmxPolyFillRect" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7d7eee30be7b445772f875b8cc1c8e0a"></a><!-- doxytag: member="dmxgcops.c::dmxPolyFillRect" ref="a7d7eee30be7b445772f875b8cc1c8e0a" args="(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyFillRect </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyFillRect </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrectFill</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrectFill</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>prectInit</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>prectInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of filled rectangles, <em>prectInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of filled rectangles, <em>prectInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxgcops.c::dmxPolyGlyphBlt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae1200c166d613547b34d0adf04d152ea"></a><!-- doxytag: member="dmxgcops.c::dmxPolyGlyphBlt" ref="ae1200c166d613547b34d0adf04d152ea" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyGlyphBlt </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyGlyphBlt </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nglyph</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>nglyph</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CharInfoPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppci</em>, </td>
+          <td class="paramtype">CharInfoPtr *&nbsp;</td>
+          <td class="paramname"> <em>ppci</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pglyphBase</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pglyphBase</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Poly Glyph Blt -- this function should never be called. </p>
 
-<p>
-Poly Glyph Blt -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxgcops.c::dmxPolylines" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="abd3dea8c777a8e39ffbf2b9fa8e1405e"></a><!-- doxytag: member="dmxgcops.c::dmxPolylines" ref="abd3dea8c777a8e39ffbf2b9fa8e1405e" args="(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolylines </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolylines </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npt</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of connected lines, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of connected lines, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxgcops.c::dmxPolyPoint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a03892f8e655a4bb743a264f121b096c6"></a><!-- doxytag: member="dmxgcops.c::dmxPolyPoint" ref="a03892f8e655a4bb743a264f121b096c6" args="(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyPoint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyPoint </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npt</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of points, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of points, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxgcops.c::dmxPolyRectangle" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6bc862a4f475154ff9ff5f30a0ffcf89"></a><!-- doxytag: member="dmxgcops.c::dmxPolyRectangle" ref="a6bc862a4f475154ff9ff5f30a0ffcf89" args="(DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyRectangle </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyRectangle </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrects</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrects</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRects</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>pRects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of rectangle outlines, <em>pRects</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of rectangle outlines, <em>pRects</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxgcops.c::dmxPolySegment" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9592aeb83549cbe036a47e9ac90dbf36"></a><!-- doxytag: member="dmxgcops.c::dmxPolySegment" ref="a9592aeb83549cbe036a47e9ac90dbf36" args="(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolySegment </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolySegment </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nseg</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nseg</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xSegment *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSegs</em></td>
+          <td class="paramtype">xSegment *&nbsp;</td>
+          <td class="paramname"> <em>pSegs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of disjoint segments, <em>pSegs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of disjoint segments, <em>pSegs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxgcops.c::dmxPolyText16" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2fe37b5892867df4c29292c975c17e52"></a><!-- doxytag: member="dmxgcops.c::dmxPolyText16" ref="a2fe37b5892867df4c29292c975c17e52" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPolyText16 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">int dmxPolyText16 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 16-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 16-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxgcops.c::dmxPolyText8" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9b3a993a29bb01745ddbf7bd9ff97ef5"></a><!-- doxytag: member="dmxgcops.c::dmxPolyText8" ref="a9b3a993a29bb01745ddbf7bd9ff97ef5" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPolyText8 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">int dmxPolyText8 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 8-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 8-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxgcops.c::dmxPushPixels" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2ca1093683e50ef80846d76a83d2f102"></a><!-- doxytag: member="dmxgcops.c::dmxPushPixels" ref="a2ca1093683e50ef80846d76a83d2f102" args="(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPushPixels </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxPushPixels </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PixmapPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBitMap</em>, </td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pBitMap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Push Pixels -- this function should never be called. </p>
 
-<p>
-Push Pixels -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxgcops.c::dmxPutImage" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ae1e930ec29cf8bd07acd6ccee4a548a3"></a><!-- doxytag: member="dmxgcops.c::dmxPutImage" ref="ae1e930ec29cf8bd07acd6ccee4a548a3" args="(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPutImage </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPutImage </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>depth</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>depth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>leftPad</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>leftPad</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBits</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pBits</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Transfer <em>pBits</em> image to back-end server associated with <em>pDrawable's</em> screen. If primitive subdivision optimization is enabled, then only transfer the sections of <em>pBits</em> that are visible (i.e., not-clipped) to the back-end server. </p>
 
-<p>
-Transfer <em>pBits</em> image to back-end server associated with <em>pDrawable's</em> screen. If primitive subdivision optimization is enabled, then only transfer the sections of <em>pBits</em> that are visible (i.e., not-clipped) to the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxgcops.c::dmxSetSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00098">dmxSubdividePrimitives</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5fa3b658c712aa8a4f48a27eca05730d"></a><!-- doxytag: member="dmxgcops.c::dmxSetSpans" ref="a5fa3b658c712aa8a4f48a27eca05730d" args="(DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxSetSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>psrc</em>, </td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>psrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppt</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>ppt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidth</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nspans</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nspans</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fSorted</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fSorted</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set spans -- this function should never be called. </p>
 
-<p>
-Set spans -- this function should never be called.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html
deleted file mode 100644
index b232f0b1b..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxgcops_8h-source.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxgcops.h</h1><a href="dmxgcops_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXGCOPS_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXGCOPS_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a2">dmxFillSpans</a>(DrawablePtr pDrawable, GCPtr pGC,
-00042                          <span class="keywordtype">int</span> nInit, DDXPointPtr pptInit, <span class="keywordtype">int</span> *pwidthInit,
-00043                          <span class="keywordtype">int</span> fSorted);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a3">dmxSetSpans</a>(DrawablePtr pDrawable, GCPtr pGC,
-00045                         <span class="keywordtype">char</span> *psrc, DDXPointPtr ppt, <span class="keywordtype">int</span> *pwidth, <span class="keywordtype">int</span> nspans,
-00046                         <span class="keywordtype">int</span> fSorted);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a4">dmxPutImage</a>(DrawablePtr pDrawable, GCPtr pGC,
-00048                         <span class="keywordtype">int</span> depth, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
-00049                         <span class="keywordtype">int</span> leftPad, <span class="keywordtype">int</span> format, <span class="keywordtype">char</span> *pBits);
-00050 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxgcops_8c.html#a5">dmxCopyArea</a>(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-00051                              <span class="keywordtype">int</span> srcx, <span class="keywordtype">int</span> srcy, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
-00052                              <span class="keywordtype">int</span> dstx, <span class="keywordtype">int</span> dsty);
-00053 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxgcops_8c.html#a6">dmxCopyPlane</a>(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-00054                               <span class="keywordtype">int</span> srcx, <span class="keywordtype">int</span> srcy, <span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height,
-00055                               <span class="keywordtype">int</span> dstx, <span class="keywordtype">int</span> dsty, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bitPlane);
-00056 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a7">dmxPolyPoint</a>(DrawablePtr pDrawable, GCPtr pGC,
-00057                          <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> npt, DDXPointPtr pptInit);
-00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a8">dmxPolylines</a>(DrawablePtr pDrawable, GCPtr pGC,
-00059                          <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> npt, DDXPointPtr pptInit);
-00060 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a9">dmxPolySegment</a>(DrawablePtr pDrawable, GCPtr pGC,
-00061                            <span class="keywordtype">int</span> nseg, xSegment *pSegs);
-00062 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a10">dmxPolyRectangle</a>(DrawablePtr pDrawable, GCPtr pGC,
-00063                              <span class="keywordtype">int</span> nrects, xRectangle *pRects);
-00064 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a11">dmxPolyArc</a>(DrawablePtr pDrawable, GCPtr pGC,
-00065                        <span class="keywordtype">int</span> narcs, xArc *parcs);
-00066 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a12">dmxFillPolygon</a>(DrawablePtr pDrawable, GCPtr pGC,
-00067                            <span class="keywordtype">int</span> shape, <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> count, DDXPointPtr pPts);
-00068 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a13">dmxPolyFillRect</a>(DrawablePtr pDrawable, GCPtr pGC,
-00069                             <span class="keywordtype">int</span> nrectFill, xRectangle *prectInit);
-00070 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a14">dmxPolyFillArc</a>(DrawablePtr pDrawable, GCPtr pGC,
-00071                            <span class="keywordtype">int</span> narcs, xArc *parcs);
-00072 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxgcops_8c.html#a15">dmxPolyText8</a>(DrawablePtr pDrawable, GCPtr pGC,
-00073                         <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">char</span> *chars);
-00074 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxgcops_8c.html#a16">dmxPolyText16</a>(DrawablePtr pDrawable, GCPtr pGC,
-00075                          <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> *chars);
-00076 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a17">dmxImageText8</a>(DrawablePtr pDrawable, GCPtr pGC,
-00077                           <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">char</span> *chars);
-00078 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a18">dmxImageText16</a>(DrawablePtr pDrawable, GCPtr pGC,
-00079                            <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> *chars);
-00080 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a19">dmxImageGlyphBlt</a>(DrawablePtr pDrawable, GCPtr pGC,
-00081                              <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nglyph,
-00082                              CharInfoPtr *ppci, pointer pglyphBase);
-00083 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a20">dmxPolyGlyphBlt</a>(DrawablePtr pDrawable, GCPtr pGC,
-00084                             <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nglyph,
-00085                             CharInfoPtr *ppci, pointer pglyphBase);
-00086 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a21">dmxPushPixels</a>(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-00087                           <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00088 
-00089 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a22">dmxGetImage</a>(DrawablePtr pDrawable, <span class="keywordtype">int</span> sx, <span class="keywordtype">int</span> sy, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
-00090                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> planeMask,
-00091                         <span class="keywordtype">char</span> *pdstLine);
-00092 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a23">dmxGetSpans</a>(DrawablePtr pDrawable, <span class="keywordtype">int</span> wMax,
-00093                         DDXPointPtr ppt, <span class="keywordtype">int</span> *pwidth, <span class="keywordtype">int</span> nspans,
-00094                         <span class="keywordtype">char</span> *pdstStart);
-00095 
-00096 <span class="preprocessor">#endif </span><span class="comment">/* DMXGCOPS_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html
index 1f30f11a4..acaef7d88 100644
--- a/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8h.html
@@ -6,1455 +6,1265 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxgcops.h File Reference</h1>
-<p>
-<a href="dmxgcops_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a0">dmxFillSpans</a> (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a1">dmxSetSpans</a> (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a2">dmxPutImage</a> (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a3">dmxCopyArea</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a4">dmxCopyPlane</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a5">dmxPolyPoint</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a6">dmxPolylines</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a7">dmxPolySegment</a> (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a8">dmxPolyRectangle</a> (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a9">dmxPolyArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a10">dmxFillPolygon</a> (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a11">dmxPolyFillRect</a> (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a12">dmxPolyFillArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a13">dmxPolyText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a14">dmxPolyText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a15">dmxImageText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a16">dmxImageText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a17">dmxImageGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a18">dmxPolyGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a19">dmxPushPixels</a> (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a20">dmxGetImage</a> (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxgcops_8h.html#a21">dmxGetSpans</a> (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)</td></tr>
-
+<p><a href="dmxgcops_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#aa70a52ce25b894154a610b0f3fc130cf">dmxFillSpans</a> (DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a5fa3b658c712aa8a4f48a27eca05730d">dmxSetSpans</a> (DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#ae1e930ec29cf8bd07acd6ccee4a548a3">dmxPutImage</a> (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a9165fc8e2f98c6d4d82154a1b52b7c0f">dmxCopyArea</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#aa6b3b34e3b0e151d5b2d5f081f6d6e0f">dmxCopyPlane</a> (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a03892f8e655a4bb743a264f121b096c6">dmxPolyPoint</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#abd3dea8c777a8e39ffbf2b9fa8e1405e">dmxPolylines</a> (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a9592aeb83549cbe036a47e9ac90dbf36">dmxPolySegment</a> (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a6bc862a4f475154ff9ff5f30a0ffcf89">dmxPolyRectangle</a> (DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a7c4ff7ddf5b1a31d11e9124dc18f69f0">dmxPolyArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a4c24d2a2ddb121d2281084dd4f1361a6">dmxFillPolygon</a> (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a7d7eee30be7b445772f875b8cc1c8e0a">dmxPolyFillRect</a> (DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a5488891f016532e40ba5e31466fb67fd">dmxPolyFillArc</a> (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a9b3a993a29bb01745ddbf7bd9ff97ef5">dmxPolyText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a2fe37b5892867df4c29292c975c17e52">dmxPolyText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a1fc863ca944469fc34d78db948f14053">dmxImageText8</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#acb19f9ef082c76f281679994057fafe1">dmxImageText16</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a3feeb20d71e2368e436633eddf4b13ac">dmxImageGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#ae1200c166d613547b34d0adf04d152ea">dmxPolyGlyphBlt</a> (DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a2ca1093683e50ef80846d76a83d2f102">dmxPushPixels</a> (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#ace88d57bbb8edfcdc3e7206e59c1e30f">dmxGetImage</a> (DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxgcops_8h.html#a2a6026c8f03a56ca5ab93dc2c9cf868f">dmxGetSpans</a> (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for gcops support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxgcops_8c.html">dmxgcops.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxgcops.h::dmxCopyArea" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for gcops support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxgcops_8c.html">dmxgcops.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a9165fc8e2f98c6d4d82154a1b52b7c0f"></a><!-- doxytag: member="dmxgcops.h::dmxCopyArea" ref="a9165fc8e2f98c6d4d82154a1b52b7c0f" args="(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxCopyArea </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="memname">RegionPtr dmxCopyArea </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcy</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dstx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dstx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dsty</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dsty</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Copy area from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible. </p>
 
-<p>
-Copy area from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxgcops.h::dmxCopyPlane" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6b3b34e3b0e151d5b2d5f081f6d6e0f"></a><!-- doxytag: member="dmxgcops.h::dmxCopyPlane" ref="aa6b3b34e3b0e151d5b2d5f081f6d6e0f" args="(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, unsigned long bitPlane)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxCopyPlane </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="memname">RegionPtr dmxCopyPlane </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>srcy</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>srcy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dstx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dstx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>dsty</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>dsty</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>bitPlane</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bitPlane</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Copy plane number <em>bitPlane</em> from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible. </p>
 
-<p>
-Copy plane number <em>bitPlane</em> from <em>pSrc</em> drawable to <em>pDst</em> drawable on the back-end server associated with <em>pSrc</em> drawable's screen. If the offscreen optimization is enabled, only copy when both <em>pSrc</em> and <em>pDst</em> are at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxgcops.h::dmxFillPolygon" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4c24d2a2ddb121d2281084dd4f1361a6"></a><!-- doxytag: member="dmxgcops.h::dmxFillPolygon" ref="a4c24d2a2ddb121d2281084dd4f1361a6" args="(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr pPts)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFillPolygon </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxFillPolygon </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>shape</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>shape</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPts</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pPts</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render a filled polygons in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render a filled polygons in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxgcops.h::dmxFillSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa70a52ce25b894154a610b0f3fc130cf"></a><!-- doxytag: member="dmxgcops.h::dmxFillSpans" ref="aa70a52ce25b894154a610b0f3fc130cf" args="(DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, int *pwidthInit, int fSorted)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxFillSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxFillSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nInit</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidthInit</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidthInit</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fSorted</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fSorted</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill spans -- this function should never be called. </p>
 
-<p>
-Fill spans -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxgcops.h::dmxGetImage" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ace88d57bbb8edfcdc3e7206e59c1e30f"></a><!-- doxytag: member="dmxgcops.h::dmxGetImage" ref="ace88d57bbb8edfcdc3e7206e59c1e30f" args="(DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char *pdstLine)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetImage </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxGetImage </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sx</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sy</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>planeMask</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>planeMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdstLine</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pdstLine</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get an image from the back-end server associated with <em>pDrawable's</em> screen. If <em>pDrawable</em> is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of <em>pDrawable</em> that is viewable. If no viewable ancestor is found, then simply return without getting an image. </p>
 
-<p>
-Get an image from the back-end server associated with <em>pDrawable's</em> screen. If <em>pDrawable</em> is a window, it must be viewable to get an image from it. If it is not viewable, then get the image from the first ancestor of <em>pDrawable</em> that is viewable. If no viewable ancestor is found, then simply return without getting an image.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxgcops.h::dmxGetSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a6026c8f03a56ca5ab93dc2c9cf868f"></a><!-- doxytag: member="dmxgcops.h::dmxGetSpans" ref="a2a6026c8f03a56ca5ab93dc2c9cf868f" args="(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pdstStart)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxGetSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>wMax</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>wMax</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppt</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>ppt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidth</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nspans</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nspans</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdstStart</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pdstStart</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get Spans -- this function should never be called. </p>
 
-<p>
-Get Spans -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxgcops.h::dmxImageGlyphBlt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3feeb20d71e2368e436633eddf4b13ac"></a><!-- doxytag: member="dmxgcops.h::dmxImageGlyphBlt" ref="a3feeb20d71e2368e436633eddf4b13ac" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageGlyphBlt </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageGlyphBlt </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nglyph</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>nglyph</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CharInfoPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppci</em>, </td>
+          <td class="paramtype">CharInfoPtr *&nbsp;</td>
+          <td class="paramname"> <em>ppci</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pglyphBase</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pglyphBase</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Image Glyph Blt -- this function should never be called. </p>
 
-<p>
-Image Glyph Blt -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxgcops.h::dmxImageText16" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="acb19f9ef082c76f281679994057fafe1"></a><!-- doxytag: member="dmxgcops.h::dmxImageText16" ref="acb19f9ef082c76f281679994057fafe1" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageText16 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageText16 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 16-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 16-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxgcops.h::dmxImageText8" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1fc863ca944469fc34d78db948f14053"></a><!-- doxytag: member="dmxgcops.h::dmxImageText8" ref="a1fc863ca944469fc34d78db948f14053" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxImageText8 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxImageText8 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 8-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 8-bit <em>chars</em> (both foreground and background) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxgcops.h::dmxPolyArc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c4ff7ddf5b1a31d11e9124dc18f69f0"></a><!-- doxytag: member="dmxgcops.h::dmxPolyArc" ref="a7c4ff7ddf5b1a31d11e9124dc18f69f0" args="(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyArc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyArc </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>narcs</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>narcs</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xArc *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parcs</em></td>
+          <td class="paramtype">xArc *&nbsp;</td>
+          <td class="paramname"> <em>parcs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of arc outlines, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of arc outlines, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxgcops.h::dmxPolyFillArc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5488891f016532e40ba5e31466fb67fd"></a><!-- doxytag: member="dmxgcops.h::dmxPolyFillArc" ref="a5488891f016532e40ba5e31466fb67fd" args="(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyFillArc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyFillArc </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>narcs</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>narcs</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xArc *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parcs</em></td>
+          <td class="paramtype">xArc *&nbsp;</td>
+          <td class="paramname"> <em>parcs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of filled arcs, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of filled arcs, <em>parcs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxgcops.h::dmxPolyFillRect" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7d7eee30be7b445772f875b8cc1c8e0a"></a><!-- doxytag: member="dmxgcops.h::dmxPolyFillRect" ref="a7d7eee30be7b445772f875b8cc1c8e0a" args="(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyFillRect </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyFillRect </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrectFill</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrectFill</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>prectInit</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>prectInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of filled rectangles, <em>prectInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of filled rectangles, <em>prectInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxgcops.h::dmxPolyGlyphBlt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae1200c166d613547b34d0adf04d152ea"></a><!-- doxytag: member="dmxgcops.h::dmxPolyGlyphBlt" ref="ae1200c166d613547b34d0adf04d152ea" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyGlyphBlt </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyGlyphBlt </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nglyph</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>nglyph</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CharInfoPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppci</em>, </td>
+          <td class="paramtype">CharInfoPtr *&nbsp;</td>
+          <td class="paramname"> <em>ppci</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>pglyphBase</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pglyphBase</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Poly Glyph Blt -- this function should never be called. </p>
 
-<p>
-Poly Glyph Blt -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxgcops.h::dmxPolylines" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="abd3dea8c777a8e39ffbf2b9fa8e1405e"></a><!-- doxytag: member="dmxgcops.h::dmxPolylines" ref="abd3dea8c777a8e39ffbf2b9fa8e1405e" args="(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolylines </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolylines </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npt</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of connected lines, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of connected lines, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxgcops.h::dmxPolyPoint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a03892f8e655a4bb743a264f121b096c6"></a><!-- doxytag: member="dmxgcops.h::dmxPolyPoint" ref="a03892f8e655a4bb743a264f121b096c6" args="(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyPoint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyPoint </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npt</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pptInit</em></td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>pptInit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of points, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of points, <em>pptInit</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxgcops.h::dmxPolyRectangle" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6bc862a4f475154ff9ff5f30a0ffcf89"></a><!-- doxytag: member="dmxgcops.h::dmxPolyRectangle" ref="a6bc862a4f475154ff9ff5f30a0ffcf89" args="(DrawablePtr pDrawable, GCPtr pGC, int nrects, xRectangle *pRects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolyRectangle </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolyRectangle </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nrects</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nrects</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRects</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>pRects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of rectangle outlines, <em>pRects</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of rectangle outlines, <em>pRects</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxgcops.h::dmxPolySegment" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9592aeb83549cbe036a47e9ac90dbf36"></a><!-- doxytag: member="dmxgcops.h::dmxPolySegment" ref="a9592aeb83549cbe036a47e9ac90dbf36" args="(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPolySegment </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPolySegment </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nseg</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nseg</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xSegment *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSegs</em></td>
+          <td class="paramtype">xSegment *&nbsp;</td>
+          <td class="paramname"> <em>pSegs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render list of disjoint segments, <em>pSegs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render list of disjoint segments, <em>pSegs</em> in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxgcops.h::dmxPolyText16" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2fe37b5892867df4c29292c975c17e52"></a><!-- doxytag: member="dmxgcops.h::dmxPolyText16" ref="a2fe37b5892867df4c29292c975c17e52" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPolyText16 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">int dmxPolyText16 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 16-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 16-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxgcops.h::dmxPolyText8" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9b3a993a29bb01745ddbf7bd9ff97ef5"></a><!-- doxytag: member="dmxgcops.h::dmxPolyText8" ref="a9b3a993a29bb01745ddbf7bd9ff97ef5" args="(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *chars)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPolyText8 </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">int dmxPolyText8 </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>chars</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>chars</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Render string of 8-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible. </p>
 
-<p>
-Render string of 8-bit <em>chars</em> (foreground only) in <em>pDrawable</em> on the back-end server associated with <em>pDrawable's</em> screen. If the offscreen optimization is enabled, only draw when <em>pDrawable</em> is at least partially visible.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxgcops.h::dmxPushPixels" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2ca1093683e50ef80846d76a83d2f102"></a><!-- doxytag: member="dmxgcops.h::dmxPushPixels" ref="a2ca1093683e50ef80846d76a83d2f102" args="(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPushPixels </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="memname">void dmxPushPixels </td>
+          <td>(</td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PixmapPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBitMap</em>, </td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pBitMap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Push Pixels -- this function should never be called. </p>
 
-<p>
-Push Pixels -- this function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxgcops.h::dmxPutImage" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ae1e930ec29cf8bd07acd6ccee4a548a3"></a><!-- doxytag: member="dmxgcops.h::dmxPutImage" ref="ae1e930ec29cf8bd07acd6ccee4a548a3" args="(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPutImage </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxPutImage </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>depth</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>depth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>leftPad</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>leftPad</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBits</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>pBits</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Transfer <em>pBits</em> image to back-end server associated with <em>pDrawable's</em> screen. If primitive subdivision optimization is enabled, then only transfer the sections of <em>pBits</em> that are visible (i.e., not-clipped) to the back-end server. </p>
 
-<p>
-Transfer <em>pBits</em> image to back-end server associated with <em>pDrawable's</em> screen. If primitive subdivision optimization is enabled, then only transfer the sections of <em>pBits</em> that are visible (i.e., not-clipped) to the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxgcops.h::dmxSetSpans" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxgcops_8c_source.html#l00070">DMX_GCOPS_OFFSCREEN</a>, <a class="el" href="dmxgcops_8c_source.html#l00057">DMX_GCOPS_SET_DRAWABLE</a>, <a class="el" href="dmxgc_8h_source.html#l00070">DMX_GET_GC_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00098">dmxSubdividePrimitives</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxgc_8h_source.html#l00046">_dmxGCPriv::gc</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5fa3b658c712aa8a4f48a27eca05730d"></a><!-- doxytag: member="dmxgcops.h::dmxSetSpans" ref="a5fa3b658c712aa8a4f48a27eca05730d" args="(DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetSpans </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DrawablePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDrawable</em>, </td>
+          <td class="memname">void dmxSetSpans </td>
+          <td>(</td>
+          <td class="paramtype">DrawablePtr&nbsp;</td>
+          <td class="paramname"> <em>pDrawable</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GCPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pGC</em>, </td>
+          <td class="paramtype">GCPtr&nbsp;</td>
+          <td class="paramname"> <em>pGC</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>psrc</em>, </td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>psrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>ppt</em>, </td>
+          <td class="paramtype">DDXPointPtr&nbsp;</td>
+          <td class="paramname"> <em>ppt</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pwidth</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>pwidth</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nspans</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nspans</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fSorted</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fSorted</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set spans -- this function should never be called. </p>
 
-<p>
-Set spans -- this function should never be called.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html
new file mode 100644
index 000000000..bfa4842ec
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxgcops_8h_source.html
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxgcops.h</h1><a href="dmxgcops_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXGCOPS_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXGCOPS_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#aa70a52ce25b894154a610b0f3fc130cf">dmxFillSpans</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00041"></a>00041                          <span class="keywordtype">int</span> nInit, DDXPointPtr pptInit, <span class="keywordtype">int</span> *pwidthInit,
+<a name="l00042"></a>00042                          <span class="keywordtype">int</span> fSorted);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a5fa3b658c712aa8a4f48a27eca05730d">dmxSetSpans</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00044"></a>00044                         <span class="keywordtype">char</span> *psrc, DDXPointPtr ppt, <span class="keywordtype">int</span> *pwidth, <span class="keywordtype">int</span> nspans,
+<a name="l00045"></a>00045                         <span class="keywordtype">int</span> fSorted);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#ae1e930ec29cf8bd07acd6ccee4a548a3">dmxPutImage</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00047"></a>00047                         <span class="keywordtype">int</span> depth, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
+<a name="l00048"></a>00048                         <span class="keywordtype">int</span> leftPad, <span class="keywordtype">int</span> format, <span class="keywordtype">char</span> *pBits);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxgcops_8c.html#a9165fc8e2f98c6d4d82154a1b52b7c0f">dmxCopyArea</a>(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+<a name="l00050"></a>00050                              <span class="keywordtype">int</span> srcx, <span class="keywordtype">int</span> srcy, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
+<a name="l00051"></a>00051                              <span class="keywordtype">int</span> dstx, <span class="keywordtype">int</span> dsty);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxgcops_8c.html#aa6b3b34e3b0e151d5b2d5f081f6d6e0f">dmxCopyPlane</a>(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+<a name="l00053"></a>00053                               <span class="keywordtype">int</span> srcx, <span class="keywordtype">int</span> srcy, <span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height,
+<a name="l00054"></a>00054                               <span class="keywordtype">int</span> dstx, <span class="keywordtype">int</span> dsty, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bitPlane);
+<a name="l00055"></a>00055 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a03892f8e655a4bb743a264f121b096c6">dmxPolyPoint</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00056"></a>00056                          <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> npt, DDXPointPtr pptInit);
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#abd3dea8c777a8e39ffbf2b9fa8e1405e">dmxPolylines</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00058"></a>00058                          <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> npt, DDXPointPtr pptInit);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a9592aeb83549cbe036a47e9ac90dbf36">dmxPolySegment</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00060"></a>00060                            <span class="keywordtype">int</span> nseg, xSegment *pSegs);
+<a name="l00061"></a>00061 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a6bc862a4f475154ff9ff5f30a0ffcf89">dmxPolyRectangle</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00062"></a>00062                              <span class="keywordtype">int</span> nrects, xRectangle *pRects);
+<a name="l00063"></a>00063 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a7c4ff7ddf5b1a31d11e9124dc18f69f0">dmxPolyArc</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00064"></a>00064                        <span class="keywordtype">int</span> narcs, xArc *parcs);
+<a name="l00065"></a>00065 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a4c24d2a2ddb121d2281084dd4f1361a6">dmxFillPolygon</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00066"></a>00066                            <span class="keywordtype">int</span> shape, <span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> count, DDXPointPtr pPts);
+<a name="l00067"></a>00067 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a7d7eee30be7b445772f875b8cc1c8e0a">dmxPolyFillRect</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00068"></a>00068                             <span class="keywordtype">int</span> nrectFill, xRectangle *prectInit);
+<a name="l00069"></a>00069 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a5488891f016532e40ba5e31466fb67fd">dmxPolyFillArc</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00070"></a>00070                            <span class="keywordtype">int</span> narcs, xArc *parcs);
+<a name="l00071"></a>00071 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxgcops_8c.html#a9b3a993a29bb01745ddbf7bd9ff97ef5">dmxPolyText8</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00072"></a>00072                         <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">char</span> *chars);
+<a name="l00073"></a>00073 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxgcops_8c.html#a2fe37b5892867df4c29292c975c17e52">dmxPolyText16</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00074"></a>00074                          <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> *chars);
+<a name="l00075"></a>00075 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a1fc863ca944469fc34d78db948f14053">dmxImageText8</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00076"></a>00076                           <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">char</span> *chars);
+<a name="l00077"></a>00077 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#acb19f9ef082c76f281679994057fafe1">dmxImageText16</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00078"></a>00078                            <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> count, <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> *chars);
+<a name="l00079"></a>00079 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a3feeb20d71e2368e436633eddf4b13ac">dmxImageGlyphBlt</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00080"></a>00080                              <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nglyph,
+<a name="l00081"></a>00081                              CharInfoPtr *ppci, pointer pglyphBase);
+<a name="l00082"></a>00082 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#ae1200c166d613547b34d0adf04d152ea">dmxPolyGlyphBlt</a>(DrawablePtr pDrawable, GCPtr pGC,
+<a name="l00083"></a>00083                             <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nglyph,
+<a name="l00084"></a>00084                             CharInfoPtr *ppci, pointer pglyphBase);
+<a name="l00085"></a>00085 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a2ca1093683e50ef80846d76a83d2f102">dmxPushPixels</a>(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
+<a name="l00086"></a>00086                           <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#ace88d57bbb8edfcdc3e7206e59c1e30f">dmxGetImage</a>(DrawablePtr pDrawable, <span class="keywordtype">int</span> sx, <span class="keywordtype">int</span> sy, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h,
+<a name="l00089"></a>00089                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> planeMask,
+<a name="l00090"></a>00090                         <span class="keywordtype">char</span> *pdstLine);
+<a name="l00091"></a>00091 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxgcops_8c.html#a2a6026c8f03a56ca5ab93dc2c9cf868f">dmxGetSpans</a>(DrawablePtr pDrawable, <span class="keywordtype">int</span> wMax,
+<a name="l00092"></a>00092                         DDXPointPtr ppt, <span class="keywordtype">int</span> *pwidth, <span class="keywordtype">int</span> nspans,
+<a name="l00093"></a>00093                         <span class="keywordtype">char</span> *pdstStart);
+<a name="l00094"></a>00094 
+<a name="l00095"></a>00095 <span class="preprocessor">#endif </span><span class="comment">/* DMXGCOPS_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxinit_8c.html
index 22928e654..314910174 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinit_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinit_8c.html
@@ -6,695 +6,877 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinit.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinit_8h-source.html">dmxinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxscrinit_8h-source.html">dmxscrinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconfig_8h-source.html">config/dmxconfig.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcb_8h-source.html">dmxcb.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxstat_8h-source.html">dmxstat.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>"</code><br>
-<code>#include "Xos.h"</code><br>
-<code>#include "dixstruct.h"</code><br>
-<code>#include "panoramiXsrv.h"</code><br>
-<code>#include &lt;signal.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a34">InitOutput</a> (ScreenInfo *pScreenInfo, int argc, char *argv[])</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxinit.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinit_8h_source.html">dmxinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxscrinit_8h_source.html">dmxscrinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconfig_8h_source.html">config/dmxconfig.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcb_8h_source.html">dmxcb.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxstat_8h_source.html">dmxstat.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<code>#include &quot;dixstruct.h&quot;</code><br/>
+<code>#include &lt;signal.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a9ddbdcc93fbd282591a6658afc26faac">DMX_ERROR_BUF_SIZE</a>&nbsp;&nbsp;&nbsp;256</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ab63a915fb3dc8db86b284bc7f98a01b1">dmxErrorHandler</a> (Display *dpy, XErrorEvent *ev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#abe5a8715282907a3ffd7b992c8dd3661">dmxOpenDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a2f19c6c0750ea1defb702c2d6231e4a8">dmxSetErrorHandler</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ab8f00de6f3ccc2c1af274ae74c07c53b">dmxPrintScreenInfo</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#aaed1209f913cb233d4e093282ed829ef">dmxGetScreenAttribs</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a6ae3c95f86743822940a155e6770663d">dmxGetVisualInfo</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a04bd6a93ac85484e9eba0dcec858edf3">dmxGetColormaps</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#abe45fd724cbfceb085e23ac62e276afd">dmxGetPixmapFormats</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a079d21ac984182efb7bb07bfa242f743">dmxSetPixmapFormats</a> (ScreenInfo *pScreenInfo, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a339a0fdeb357fee53a56ba268c66b68d">dmxCheckForWM</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a25595691f1a78098823fd5cce077d9be">dmxDisplayInit</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a48c537b2dc0c7e3acf70c1b60c211bae">dmxExecOS</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ac1f3e1fa60f11e75fe94b7629ec8c0f0">dmxBuildCompiler</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a609d59c7622777da5af1930d07b06e20">dmxExecHost</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a51c195c51f4f09e981384a4215f82321">InitOutput</a> (ScreenInfo *pScreenInfo, int argc, char *argv[])</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a18cb12b28844e363b3f43b3b3582d214">dmxSetDefaultFontPath</a> (char *fp)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a240efc1ef89432ea436d61512e7b1ca6">AbortDDX</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a37656cea0c901129a2feb6564a6dbfea">ddxGiveUp</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a01064ddfa83f5ae5440a15e6d4121af6">OsVendorInit</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#adaf9384688ad8a12254ccb5ce594c3e1">OsVendorFatalError</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a> (int argc, char *argv[], int i)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#add8bf8bb09cff9a75fb84594b08baa5a">ddxUseMsg</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a97d09d0d46e9e7df451072def499e4fe">dmxShadowFB</a> = FALSE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XErrorEvent&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxLastErrorEvent</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxErrorOccurred</a> = FALSE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a10581b0cb51e730e26cbc08913a76c5f">dmxFontPath</a> = NULL</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a> = TRUE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a8207510b34c9871015d1e9378c31c568">dmxSubdividePrimitives</a> = TRUE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#af266e8dde07901ede60eaa822b3e945a">dmxLazyWindowCreation</a> = TRUE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ab5b999218612af4136983694943737aa">dmxUseXKB</a> = TRUE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxDepth</a> = 0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#ae0253d9b4aa523bbdee8aaafbe63c1a4">dmxGLXProxy</a> = FALSE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxIgnoreBadFontPaths</a> = FALSE</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8c.html#a8d53c22ed93cbef2684016d3c7638671">dmxAddRemoveScreens</a> = FALSE</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide expected functions for initialization from the ddx layer and global variables for the DMX server. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a9ddbdcc93fbd282591a6658afc26faac"></a><!-- doxytag: member="dmxinit.c::DMX_ERROR_BUF_SIZE" ref="a9ddbdcc93fbd282591a6658afc26faac" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_ERROR_BUF_SIZE&nbsp;&nbsp;&nbsp;256</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a240efc1ef89432ea436d61512e7b1ca6"></a><!-- doxytag: member="dmxinit.c::AbortDDX" ref="a240efc1ef89432ea436d61512e7b1ca6" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void AbortDDX </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This function is called in Xserver/os/utils.c from <em><a class="el" href="dmxlog_8c.html#a50d079f944b71e881c0c58562f96c6ad">AbortServer()</a></em>. We must ensure that backend and console state is restored in the event the server shutdown wasn't clean. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a36">AbortDDX</a> (void)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, and <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a37">ddxGiveUp</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00858">ddxGiveUp()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a38">OsVendorInit</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a37656cea0c901129a2feb6564a6dbfea"></a><!-- doxytag: member="dmxinit.c::ddxGiveUp" ref="a37656cea0c901129a2feb6564a6dbfea" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ddxGiveUp </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This function is called in Xserver/dix/main.c from <em><a class="el" href="dmxtodmx_8c.html#a3c04138a5bfe5d72780bb7e82a18e627">main()</a></em> when dispatchException &amp; DE_TERMINATE (which is the only way to exit the main loop without an interruption. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00837">AbortDDX()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6ed0a235a6d852bfe0cc0250159a5daf"></a><!-- doxytag: member="dmxinit.c::ddxProcessArgument" ref="a6ed0a235a6d852bfe0cc0250159a5daf" args="(int argc, char *argv[], int i)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int ddxProcessArgument </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>argv</em>[], </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>i</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Process our command line arguments. </p>
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, <a class="el" href="dmxconfig_8h.html#ad072d4dab0b5b0623c9b6d1b3b57e23a">dmxConfigSetXkbLayout()</a>, <a class="el" href="dmxconfig_8h.html#ab9b9a8c70f9fd1b051187c47427f4999">dmxConfigSetXkbModel()</a>, <a class="el" href="dmxconfig_8h.html#aef54e09cba9b65acbdcb6568de54b2b6">dmxConfigSetXkbOptions()</a>, <a class="el" href="dmxconfig_8h.html#ae3270803aaa7990900d8c123f2181485">dmxConfigSetXkbRules()</a>, <a class="el" href="dmxconfig_8h.html#af8922109f7462e6e246d8e06f1e21c5b">dmxConfigSetXkbVariant()</a>, <a class="el" href="dmxconfig_8c_source.html#l00144">dmxConfigStoreConfig()</a>, <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00135">dmxConfigStoreFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>, <a class="el" href="dmxcursor_8c_source.html#l00119">dmxCursorNoMulti()</a>, <a class="el" href="dmxinit_8c_source.html#l00104">dmxDepth</a>, <a class="el" href="dmxinit_8c_source.html#l00107">dmxGLXProxy</a>, <a class="el" href="dmxinit_8c_source.html#l00118">dmxIgnoreBadFontPaths</a>, <a class="el" href="dmxinit_8c_source.html#l00100">dmxLazyWindowCreation</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00096">dmxOffScreenOpt</a>, <a class="el" href="dmxinit_8c_source.html#l00815">dmxSetDefaultFontPath()</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxstat_8c_source.html#l00106">dmxStatActivate()</a>, <a class="el" href="dmxinit_8c_source.html#l00098">dmxSubdividePrimitives</a>, <a class="el" href="dmxsync_8c_source.html#l00115">dmxSyncActivate()</a>, <a class="el" href="dmxinit_8c_source.html#l00102">dmxUseXKB</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="add8bf8bb09cff9a75fb84594b08baa5a"></a><!-- doxytag: member="dmxinit.c::ddxUseMsg" ref="add8bf8bb09cff9a75fb84594b08baa5a" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ddxUseMsg </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Provide succinct usage information for the DMX server. </p>
+
+</div>
+</div>
+<a class="anchor" id="ac1f3e1fa60f11e75fe94b7629ec8c0f0"></a><!-- doxytag: member="dmxinit.c::dmxBuildCompiler" ref="ac1f3e1fa60f11e75fe94b7629ec8c0f0" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static const char* dmxBuildCompiler </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a39">OsVendorFatalError</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a> (int argc, char *argv[], int i)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a339a0fdeb357fee53a56ba268c66b68d"></a><!-- doxytag: member="dmxinit.c::dmxCheckForWM" ref="a339a0fdeb357fee53a56ba268c66b68d" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCheckForWM </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a41">ddxUseMsg</a> (void)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, and <a class="el" href="dmx_8h_source.html#l00160">_DMXScreenInfo::WMRunningOnBE</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>CARD32&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a42">GetTimeInMillis</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
 
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a25595691f1a78098823fd5cce077d9be"></a><!-- doxytag: member="dmxinit.c::dmxDisplayInit" ref="a25595691f1a78098823fd5cce077d9be" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDisplayInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize the display and collect relevant information about the display properties </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a2">dmxScreens</a></td></tr>
+<p>References <a class="el" href="dmxinit_8c_source.html#l00476">dmxCheckForWM()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00204">dmxSetErrorHandler()</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a3">dmxNumInputs</a></td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a4">dmxInputs</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ab63a915fb3dc8db86b284bc7f98a01b1"></a><!-- doxytag: member="dmxinit.c::dmxErrorHandler" ref="ab63a915fb3dc8db86b284bc7f98a01b1" args="(Display *dpy, XErrorEvent *ev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">XErrorEvent *&nbsp;</td>
+          <td class="paramname"> <em>ev</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a5">dmxShadowFB</a> = FALSE</td></tr>
+<p>References <a class="el" href="dmxinit_8c.html#a9ddbdcc93fbd282591a6658afc26faac">DMX_ERROR_BUF_SIZE</a>, <a class="el" href="dmxinit_8c_source.html#l00092">dmxErrorOccurred</a>, <a class="el" href="dmxinit_8c_source.html#l00091">dmxLastErrorEvent</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>XErrorEvent&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a6">dmxLastErrorEvent</a></td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00204">dmxSetErrorHandler()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a7">dmxErrorOccurred</a> = FALSE</td></tr>
+</div>
+</div>
+<a class="anchor" id="a609d59c7622777da5af1930d07b06e20"></a><!-- doxytag: member="dmxinit.c::dmxExecHost" ref="a609d59c7622777da5af1930d07b06e20" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static const char* dmxExecHost </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a8">dmxFontPath</a> = NULL</td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a9">dmxOffScreenOpt</a> = TRUE</td></tr>
+</div>
+</div>
+<a class="anchor" id="a48c537b2dc0c7e3acf70c1b60c211bae"></a><!-- doxytag: member="dmxinit.c::dmxExecOS" ref="a48c537b2dc0c7e3acf70c1b60c211bae" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static const char* dmxExecOS </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a10">dmxSubdividePrimitives</a> = TRUE</td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a11">dmxLazyWindowCreation</a> = TRUE</td></tr>
+</div>
+</div>
+<a class="anchor" id="a04bd6a93ac85484e9eba0dcec858edf3"></a><!-- doxytag: member="dmxinit.c::dmxGetColormaps" ref="a04bd6a93ac85484e9eba0dcec858edf3" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetColormaps </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a12">dmxUseXKB</a> = TRUE</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00120">_DMXScreenInfo::beBlackPixel</a>, <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmx_8h_source.html#l00121">_DMXScreenInfo::beWhitePixel</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a13">dmxDepth</a> = 0</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a14">dmxNoRender</a> = FALSE</td></tr>
+</div>
+</div>
+<a class="anchor" id="abe45fd724cbfceb085e23ac62e276afd"></a><!-- doxytag: member="dmxinit.c::dmxGetPixmapFormats" ref="abe45fd724cbfceb085e23ac62e276afd" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetPixmapFormats </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a16">dmxIgnoreBadFontPaths</a> = FALSE</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, and <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinit_8c.html#a17">dmxAddRemoveScreens</a> = FALSE</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide expected functions for initialization from the ddx layer and global variables for the DMX server.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a36" doxytag="dmxinit.c::AbortDDX" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="aaed1209f913cb233d4e093282ed829ef"></a><!-- doxytag: member="dmxinit.c::dmxGetScreenAttribs" ref="aaed1209f913cb233d4e093282ed829ef" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void AbortDDX </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxGetScreenAttribs </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00105">_DMXScreenInfo::beYDPI</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00130">_DMXScreenInfo::scrnXSign</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, and <a class="el" href="dmx_8h_source.html#l00131">_DMXScreenInfo::scrnYSign</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6ae3c95f86743822940a155e6770663d"></a><!-- doxytag: member="dmxinit.c::dmxGetVisualInfo" ref="a6ae3c95f86743822940a155e6770663d" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxGetVisualInfo </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called in Xserver/os/utils.c from <em><a class="el" href="dmxlog_8c.html#a3">AbortServer()</a></em>. We must ensure that backend and console state is restored in the event the server shutdown wasn't clean.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a37" doxytag="dmxinit.c::ddxGiveUp" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxinit_8c_source.html#l00104">dmxDepth</a>, and <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe5a8715282907a3ffd7b992c8dd3661"></a><!-- doxytag: member="dmxinit.c::dmxOpenDisplay" ref="abe5a8715282907a3ffd7b992c8dd3661" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ddxGiveUp </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxOpenDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab8f00de6f3ccc2c1af274ae74c07c53b"></a><!-- doxytag: member="dmxinit.c::dmxPrintScreenInfo" ref="ab8f00de6f3ccc2c1af274ae74c07c53b" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxPrintScreenInfo </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called in Xserver/dix/main.c from <em><a class="el" href="xdmxconfig_8c.html#a101">main()</a></em> when dispatchException &amp; DE_TERMINATE (which is the only way to exit the main loop without an interruption.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a40" doxytag="dmxinit.c::ddxProcessArgument" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00195">dmxLogOutputCont()</a>, <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>, and <a class="el" href="dmx_8h_source.html#l00160">_DMXScreenInfo::WMRunningOnBE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a18cb12b28844e363b3f43b3b3582d214"></a><!-- doxytag: member="dmxinit.c::dmxSetDefaultFontPath" ref="a18cb12b28844e363b3f43b3b3582d214" args="(char *fp)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ddxProcessArgument </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="memname">static void dmxSetDefaultFontPath </td>
+          <td>(</td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>fp</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00094">dmxFontPath</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2f19c6c0750ea1defb702c2d6231e4a8"></a><!-- doxytag: member="dmxinit.c::dmxSetErrorHandler" ref="a2f19c6c0750ea1defb702c2d6231e4a8" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxSetErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em>[], </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a079d21ac984182efb7bb07bfa242f743"></a><!-- doxytag: member="dmxinit.c::dmxSetPixmapFormats" ref="a079d21ac984182efb7bb07bfa242f743" args="(ScreenInfo *pScreenInfo, DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>i</em></td>
+          <td class="memname">static Bool dmxSetPixmapFormats </td>
+          <td>(</td>
+          <td class="paramtype">ScreenInfo *&nbsp;</td>
+          <td class="paramname"> <em>pScreenInfo</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td><td>&nbsp;</td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Process our command line arguments.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a41" doxytag="dmxinit.c::ddxUseMsg" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void ddxUseMsg </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Provide succinct usage information for the DMX server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a42" doxytag="dmxinit.c::GetTimeInMillis" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> CARD32 GetTimeInMillis </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+</div>
+<div class="memdoc">
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return wall-clock time in milliseconds.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a34" doxytag="dmxinit.c::InitOutput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, and <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a51c195c51f4f09e981384a4215f82321"></a><!-- doxytag: member="dmxinit.c::InitOutput" ref="a51c195c51f4f09e981384a4215f82321" args="(ScreenInfo *pScreenInfo, int argc, char *argv[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void InitOutput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenInfo *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreenInfo</em>, </td>
+          <td class="memname">void InitOutput </td>
+          <td>(</td>
+          <td class="paramtype">ScreenInfo *&nbsp;</td>
+          <td class="paramname"> <em>pScreenInfo</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em>[]</td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>argv</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is called in Xserver/dix/main.c from <em><a class="el" href="xdmxconfig_8c.html#a101">main()</a></em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a39" doxytag="dmxinit.c::OsVendorFatalError" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This routine is called in Xserver/dix/main.c from <em><a class="el" href="dmxtodmx_8c.html#a3c04138a5bfe5d72780bb7e82a18e627">main()</a></em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcb_8h_source.html#l00047">DMX_NO_RECOMPUTE_BOUNDING_BOX</a>, <a class="el" href="dmxinit_8c_source.html#l00120">dmxAddRemoveScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00533">dmxBuildCompiler()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00548">dmxExecHost()</a>, <a class="el" href="dmxinit_8c_source.html#l00514">dmxExecOS()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxinit_8c_source.html#l00107">dmxGLXProxy</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxfont_8c_source.html#l00228">dmxInitFonts()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, <a class="el" href="dmxinit_8c_source.html#l00100">dmxLazyWindowCreation</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00096">dmxOffScreenOpt</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxstat_8c_source.html#l00123">dmxStatFree()</a>, <a class="el" href="dmxstat_8c_source.html#l00216">dmxStatInit()</a>, <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmx__glxvisuals_8c_source.html#l00235">GetGLXFBConfigs()</a>, <a class="el" href="dmx__glxvisuals_8c_source.html#l00043">GetGLXVisualConfigs()</a>, <a class="el" href="dmx__glxvisuals_8c_source.html#l00495">GetGLXVisualConfigsFromFBConfigs()</a>, <a class="el" href="dmx_8h_source.html#l00182">_DMXScreenInfo::stat</a>, <a class="el" href="dmx-config_8h_source.html#l00069">VENDOR_RELEASE</a>, <a class="el" href="dmx-config_8h_source.html#l00070">VENDOR_STRING</a>, <a class="el" href="dmx__glxvisuals_8h_source.html#l00039">dmxGlxVisualPrivate::x_visual_class</a>, and <a class="el" href="dmx__glxvisuals_8h_source.html#l00038">dmxGlxVisualPrivate::x_visual_depth</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adaf9384688ad8a12254ccb5ce594c3e1"></a><!-- doxytag: member="dmxinit.c::OsVendorFatalError" ref="adaf9384688ad8a12254ccb5ce594c3e1" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void OsVendorFatalError </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void OsVendorFatalError </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called in Xserver/os/utils.c from <em>FatalError()</em> and <em><a class="el" href="dmxlog_8c.html#a4">VFatalError()</a></em>. (Note that setting the function pointer <em>OsVendorVErrorFProc</em> will cause <em>VErrorF()</em> (which is called by the two routines mentioned here, as well as by others) to use the referenced routine instead of <em>vfprintf()</em>.)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a38" doxytag="dmxinit.c::OsVendorInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This function is called in Xserver/os/utils.c from <em>FatalError()</em> and <em><a class="el" href="dmxlog_8c.html#af1c88ef4a6df132f586cf7605ca8192a">VFatalError()</a></em>. (Note that setting the function pointer <em>OsVendorVErrorFProc</em> will cause <em>VErrorF()</em> (which is called by the two routines mentioned here, as well as by others) to use the referenced routine instead of <em>vfprintf()</em>.) </p>
+
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00101">VFatalError()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a01064ddfa83f5ae5440a15e6d4121af6"></a><!-- doxytag: member="dmxinit.c::OsVendorInit" ref="a01064ddfa83f5ae5440a15e6d4121af6" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void OsVendorInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void OsVendorInit </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function is called in Xserver/os/osinit.c from <em>OsInit()</em>.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a17" doxytag="dmxinit.c::dmxAddRemoveScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This function is called in Xserver/os/osinit.c from <em>OsInit()</em>. </p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a8d53c22ed93cbef2684016d3c7638671"></a><!-- doxytag: member="dmxinit.c::dmxAddRemoveScreens" ref="a8d53c22ed93cbef2684016d3c7638671" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a17">dmxAddRemoveScreens</a> = FALSE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a8d53c22ed93cbef2684016d3c7638671">dmxAddRemoveScreens</a> = FALSE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if add and remove screens support is enabled     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxinit.c::dmxDepth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if add and remove screens support is enabled </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad2d0e8e1a260d9fdb7ea3a980d5fce8b"></a><!-- doxytag: member="dmxinit.c::dmxDepth" ref="ad2d0e8e1a260d9fdb7ea3a980d5fce8b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a13">dmxDepth</a> = 0
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxDepth</a> = 0</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Requested depth if non-zero     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxinit.c::dmxErrorOccurred" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Requested depth if non-zero </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9a817996c23e8669c5d9a8dc25e8cb51"></a><!-- doxytag: member="dmxinit.c::dmxErrorOccurred" ref="a9a817996c23e8669c5d9a8dc25e8cb51" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a7">dmxErrorOccurred</a> = FALSE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxErrorOccurred</a> = FALSE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if an error occurred     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxinit.c::dmxFontPath" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if an error occurred </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a10581b0cb51e730e26cbc08913a76c5f"></a><!-- doxytag: member="dmxinit.c::dmxFontPath" ref="a10581b0cb51e730e26cbc08913a76c5f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> char* <a class="el" href="dmxinit_8c.html#a8">dmxFontPath</a> = NULL
+          <td class="memname">char* <a class="el" href="dmxinit_8c.html#a10581b0cb51e730e26cbc08913a76c5f">dmxFontPath</a> = NULL</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxinit.c::dmxIgnoreBadFontPaths" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>NULL if no font path is set on the command line; otherwise, a string of comma separated paths built from the command line specified font paths </p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, and <a class="el" href="dmxinit_8c_source.html#l00815">dmxSetDefaultFontPath()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0253d9b4aa523bbdee8aaafbe63c1a4"></a><!-- doxytag: member="dmxinit.c::dmxGLXProxy" ref="ae0253d9b4aa523bbdee8aaafbe63c1a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a16">dmxIgnoreBadFontPaths</a> = FALSE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#ae0253d9b4aa523bbdee8aaafbe63c1a4">dmxGLXProxy</a> = FALSE<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if bad font paths should be ignored during server init     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxinit.c::dmxInputs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2eb1403caea1e0c8ac3cb9d1edc8d3c6"></a><!-- doxytag: member="dmxinit.c::dmxIgnoreBadFontPaths" ref="a2eb1403caea1e0c8ac3cb9d1edc8d3c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="dmxinput_8h.html#a5">dmxInputs</a>
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxIgnoreBadFontPaths</a> = FALSE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of inputs     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxinit.c::dmxLastErrorEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if bad font paths should be ignored during server init </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a067017d9e67716c251357e9edf917e59"></a><!-- doxytag: member="dmxinit.c::dmxInputs" ref="a067017d9e67716c251357e9edf917e59" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XErrorEvent <a class="el" href="dmxinit_8c.html#a6">dmxLastErrorEvent</a>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Last error that occurred     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxinit.c::dmxLazyWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of inputs </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00613">dmxBlockHandler()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf5b80f46b3ba1e46d7f1f12cfb158f"></a><!-- doxytag: member="dmxinit.c::dmxLastErrorEvent" ref="aacf5b80f46b3ba1e46d7f1f12cfb158f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a11">dmxLazyWindowCreation</a> = TRUE
+          <td class="memname">XErrorEvent <a class="el" href="dmxinit_8c.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxLastErrorEvent</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using the lazy window creation optimization     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxinit.c::dmxNoRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Last error that occurred </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af266e8dde07901ede60eaa822b3e945a"></a><!-- doxytag: member="dmxinit.c::dmxLazyWindowCreation" ref="af266e8dde07901ede60eaa822b3e945a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a14">dmxNoRender</a> = FALSE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#af266e8dde07901ede60eaa822b3e945a">dmxLazyWindowCreation</a> = TRUE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if the RENDER extension should be disabled     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxinit.c::dmxNumInputs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using the lazy window creation optimization </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c8f7f00098aec51d56c188a26747d9f"></a><!-- doxytag: member="dmxinit.c::dmxNumInputs" ref="a7c8f7f00098aec51d56c188a26747d9f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinput_8h.html#a4">dmxNumInputs</a>
+          <td class="memname">int <a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of <a class="el" href="dmxinput_8h.html#a5">dmxInputs</a>     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxinit.c::dmxNumScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a> </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5a881109fe1e32c74cda4a280b09a7c4"></a><!-- doxytag: member="dmxinit.c::dmxNumScreens" ref="a5a881109fe1e32c74cda4a280b09a7c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a1">dmxNumScreens</a>
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxNumScreens</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of dmxScreens     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxinit.c::dmxOffScreenOpt" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of dmxScreens </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00837">AbortDDX()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, <a class="el" href="dmxconsole_8c_source.html#l00644">dmxConsoleComputeWidthHeight()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcommon_8c_source.html#l00524">dmxFindPointerScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00278">dmxGetNumScreens()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00204">dmxSLCreate()</a>, <a class="el" href="dmxcursor_8c_source.html#l00221">dmxSLFindNext()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa8987e6ecde1821c659e8fe22336fd20"></a><!-- doxytag: member="dmxinit.c::dmxOffScreenOpt" ref="aa8987e6ecde1821c659e8fe22336fd20" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a9">dmxOffScreenOpt</a> = TRUE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#aa8987e6ecde1821c659e8fe22336fd20">dmxOffScreenOpt</a> = TRUE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using off screen optimizations     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxinit.c::dmxScreens" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using off screen optimizations </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3e242a6818df05e547a4776919e3827f"></a><!-- doxytag: member="dmxinit.c::dmxScreens" ref="a3e242a6818df05e547a4776919e3827f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* <a class="el" href="dmxinit_8c.html#a2">dmxScreens</a>
+          <td class="memname"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of outputs     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxinit.c::dmxShadowFB" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of outputs </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00231">dmxBackendOffscreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxfont_8c_source.html#l00169">dmxProcSetFontPath()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a97d09d0d46e9e7df451072def499e4fe"></a><!-- doxytag: member="dmxinit.c::dmxShadowFB" ref="a97d09d0d46e9e7df451072def499e4fe" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinit_8c.html#a5">dmxShadowFB</a> = FALSE
+          <td class="memname">int <a class="el" href="dmxinit_8c.html#a97d09d0d46e9e7df451072def499e4fe">dmxShadowFB</a> = FALSE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if using shadow frame-buffer (deprecated)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxinit.c::dmxSubdividePrimitives" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if using shadow frame-buffer (deprecated) </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8207510b34c9871015d1e9378c31c568"></a><!-- doxytag: member="dmxinit.c::dmxSubdividePrimitives" ref="a8207510b34c9871015d1e9378c31c568" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a10">dmxSubdividePrimitives</a> = TRUE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#a8207510b34c9871015d1e9378c31c568">dmxSubdividePrimitives</a> = TRUE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if using the primitive subdivision optimization     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxinit.c::dmxUseXKB" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if using the primitive subdivision optimization </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab5b999218612af4136983694943737aa"></a><!-- doxytag: member="dmxinit.c::dmxUseXKB" ref="ab5b999218612af4136983694943737aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="dmxinit_8c.html#a12">dmxUseXKB</a> = TRUE
+          <td class="memname">Bool <a class="el" href="dmxinit_8c.html#ab5b999218612af4136983694943737aa">dmxUseXKB</a> = TRUE</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if the XKB extension should be used with the backend servers     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>True if the XKB extension should be used with the backend servers </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, and <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html
deleted file mode 100644
index 3217ef4cb..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxinit_8h-source.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinit.h</h1><a href="dmxinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2004 Red Hat Inc., Raleigh, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXINIT_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXINIT_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "scrnintstr.h"</span>
-00042 
-00043 <span class="keyword">extern</span> Bool dmxOpenDisplay(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxSetErrorHandler(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxCheckForWM(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxGetScreenAttribs(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00047 <span class="keyword">extern</span> Bool dmxGetVisualInfo(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxGetColormaps(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxGetPixmapFormats(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00050 
-00051 <span class="preprocessor">#endif </span><span class="comment">/* DMXINIT_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h.html
index 2890be2c6..b83e29690 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinit_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinit_8h.html
@@ -6,16 +6,195 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinit.h File Reference</h1><code>#include "scrnintstr.h"</code><br>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxinit.h File Reference</h1><code>#include &quot;scrnintstr.h&quot;</code><br/>
 
-<p>
-<a href="dmxinit_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<p><a href="dmxinit_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#abe5a8715282907a3ffd7b992c8dd3661">dmxOpenDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#a2f19c6c0750ea1defb702c2d6231e4a8">dmxSetErrorHandler</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#a339a0fdeb357fee53a56ba268c66b68d">dmxCheckForWM</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#aaed1209f913cb233d4e093282ed829ef">dmxGetScreenAttribs</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#a6ae3c95f86743822940a155e6770663d">dmxGetVisualInfo</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#a04bd6a93ac85484e9eba0dcec858edf3">dmxGetColormaps</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinit_8h.html#abe45fd724cbfceb085e23ac62e276afd">dmxGetPixmapFormats</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for initialization. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinit_8c.html">dmxinit.c</a></dd></dl>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for initialization. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinit_8c.html">dmxinit.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a339a0fdeb357fee53a56ba268c66b68d"></a><!-- doxytag: member="dmxinit.h::dmxCheckForWM" ref="a339a0fdeb357fee53a56ba268c66b68d" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxCheckForWM </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, and <a class="el" href="dmx_8h_source.html#l00160">_DMXScreenInfo::WMRunningOnBE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a04bd6a93ac85484e9eba0dcec858edf3"></a><!-- doxytag: member="dmxinit.h::dmxGetColormaps" ref="a04bd6a93ac85484e9eba0dcec858edf3" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetColormaps </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00120">_DMXScreenInfo::beBlackPixel</a>, <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmx_8h_source.html#l00121">_DMXScreenInfo::beWhitePixel</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe45fd724cbfceb085e23ac62e276afd"></a><!-- doxytag: member="dmxinit.h::dmxGetPixmapFormats" ref="abe45fd724cbfceb085e23ac62e276afd" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetPixmapFormats </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, and <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaed1209f913cb233d4e093282ed829ef"></a><!-- doxytag: member="dmxinit.h::dmxGetScreenAttribs" ref="aaed1209f913cb233d4e093282ed829ef" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetScreenAttribs </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00101">_DMXScreenInfo::beHeight</a>, <a class="el" href="dmx_8h_source.html#l00100">_DMXScreenInfo::beWidth</a>, <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00105">_DMXScreenInfo::beYDPI</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00130">_DMXScreenInfo::scrnXSign</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, and <a class="el" href="dmx_8h_source.html#l00131">_DMXScreenInfo::scrnYSign</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6ae3c95f86743822940a155e6770663d"></a><!-- doxytag: member="dmxinit.h::dmxGetVisualInfo" ref="a6ae3c95f86743822940a155e6770663d" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxGetVisualInfo </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxinit_8c_source.html#l00104">dmxDepth</a>, and <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe5a8715282907a3ffd7b992c8dd3661"></a><!-- doxytag: member="dmxinit.h::dmxOpenDisplay" ref="abe5a8715282907a3ffd7b992c8dd3661" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxOpenDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2f19c6c0750ea1defb702c2d6231e4a8"></a><!-- doxytag: member="dmxinit.h::dmxSetErrorHandler" ref="a2f19c6c0750ea1defb702c2d6231e4a8" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSetErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html
new file mode 100644
index 000000000..bb6ba7f8d
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxinit_8h_source.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxinit.h</h1><a href="dmxinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2004 Red Hat Inc., Raleigh, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXINIT_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXINIT_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;scrnintstr.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00042"></a>00042 <span class="keyword">extern</span> Bool <a class="code" href="dmxinit_8c.html#abe5a8715282907a3ffd7b992c8dd3661">dmxOpenDisplay</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinit_8c.html#a2f19c6c0750ea1defb702c2d6231e4a8">dmxSetErrorHandler</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinit_8c.html#a339a0fdeb357fee53a56ba268c66b68d">dmxCheckForWM</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinit_8c.html#aaed1209f913cb233d4e093282ed829ef">dmxGetScreenAttribs</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> Bool <a class="code" href="dmxinit_8c.html#a6ae3c95f86743822940a155e6770663d">dmxGetVisualInfo</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinit_8c.html#a04bd6a93ac85484e9eba0dcec858edf3">dmxGetColormaps</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinit_8c.html#abe45fd724cbfceb085e23ac62e276afd">dmxGetPixmapFormats</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050 <span class="preprocessor">#endif </span><span class="comment">/* DMXINIT_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8c.html b/xorg-server/hw/dmx/doc/html/dmxinput_8c.html
index 09a5ddd05..d53bd7643 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinput_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinput_8c.html
@@ -6,171 +6,201 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinput.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "input.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8c.html#a0">LegalModifier</a> (unsigned int key, DevicePtr pDev)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxinput.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;input.h&quot;</code><br/>
+<code>#include &quot;mi.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#a794cad8ab41d42457e19090e38c5b338">LegalModifier</a> (unsigned int key, DeviceIntPtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#a1ffd49de15b6ee0cafe5e83740c7a316">InitInput</a> (int argc, char **argv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#acf517b24d6b846578e70c059b4afcb1b">ProcessInputEvents</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#a122b762a283b031348730294d3aa1319">dmxUpdateWindowInfo</a> (<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#a01a2e57a14466d675ab5e3a539debaf8">NewInputDeviceRequest</a> (InputOption *options, DeviceIntPtr *pdev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8c.html#aad5437e77e383efb20d0720f2afe863a">DeleteInputDeviceRequest</a> (DeviceIntPtr pDev)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide the main entry points for input initialization and processing that arequired by the dix layer. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aad5437e77e383efb20d0720f2afe863a"></a><!-- doxytag: member="dmxinput.c::DeleteInputDeviceRequest" ref="aad5437e77e383efb20d0720f2afe863a" args="(DeviceIntPtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void DeleteInputDeviceRequest </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8c.html#a1">InitInput</a> (int argc, char **argv)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a122b762a283b031348730294d3aa1319"></a><!-- doxytag: member="dmxinput.c::dmxUpdateWindowInfo" ref="a122b762a283b031348730294d3aa1319" args="(DMXUpdateType type, WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxUpdateWindowInfo </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This routine is called from <em><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a></em> whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8c.html#a2">ProcessInputEvents</a> (void)</td></tr>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxinput_8h_source.html#l00103">_DMXInputInfo::updateWindowInfo</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8c.html#a3">dmxUpdateWindowInfo</a> (<a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide the main entry points for input initialization and processing that arequired by the dix layer.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxinput.c::dmxUpdateWindowInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a1ffd49de15b6ee0cafe5e83740c7a316"></a><!-- doxytag: member="dmxinput.c::InitInput" ref="a1ffd49de15b6ee0cafe5e83740c7a316" args="(int argc, char **argv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxUpdateWindowInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="memname">void InitInput </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em></td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>argv</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Called from dix/main.c on each server generation to initialize inputs. All the work is done in dmxInputInit. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html#a5845f0dbf305a8a233d3747489745faa">dmxInputInit()</a> </dd></dl>
 
-<p>
-This routine is called from #dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxinput.c::InitInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a794cad8ab41d42457e19090e38c5b338"></a><!-- doxytag: member="dmxinput.c::LegalModifier" ref="a794cad8ab41d42457e19090e38c5b338" args="(unsigned int key, DeviceIntPtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void InitInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="memname">Bool LegalModifier </td>
+          <td>(</td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>key</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char **&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em></td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Returns TRUE if the key is a valid modifier. For PC-class keyboards, all keys can be used as modifiers, so return TRUE always. </p>
 
-<p>
-Called from dix/main.c on each server generation to initialize inputs. All the work is done in dmxInputInit. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html#a17">dmxInputInit()</a> </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxinput.c::LegalModifier" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a01a2e57a14466d675ab5e3a539debaf8"></a><!-- doxytag: member="dmxinput.c::NewInputDeviceRequest" ref="a01a2e57a14466d675ab5e3a539debaf8" args="(InputOption *options, DeviceIntPtr *pdev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool LegalModifier </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>key</em>, </td>
+          <td class="memname">int NewInputDeviceRequest </td>
+          <td>(</td>
+          <td class="paramtype">InputOption *&nbsp;</td>
+          <td class="paramname"> <em>options</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em></td>
+          <td class="paramtype">DeviceIntPtr *&nbsp;</td>
+          <td class="paramname"> <em>pdev</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Returns TRUE if the key is a valid modifier. For PC-class keyboards, all keys can be used as modifiers, so return TRUE always.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxinput.c::ProcessInputEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="acf517b24d6b846578e70c059b4afcb1b"></a><!-- doxytag: member="dmxinput.c::ProcessInputEvents" ref="acf517b24d6b846578e70c059b4afcb1b" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ProcessInputEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ProcessInputEvents </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Called from dix/dispatch.c in Dispatch() whenever input events require processing. All the work is done in the lower level routines. </p>
 
-<p>
-Called from dix/dispatch.c in Dispatch() whenever input events require processing. All the work is done in the lower level routines.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxinput_8h_source.html#l00102">_DMXInputInfo::processInputEvents</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html
deleted file mode 100644
index 013912f37..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxinput_8h-source.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinput.h</h1><a href="dmxinput_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
-00032 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00033 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00034 <span class="comment"> *</span>
-00035 <span class="comment"> */</span>
-00036 
-00048 <span class="preprocessor">#ifndef DMXINPUT_H</span>
-00049 <span class="preprocessor"></span><span class="preprocessor">#define DMXINPUT_H</span>
-00050 <span class="preprocessor"></span>
-<a name="l00052"></a><a class="code" href="dmxinput_8h.html#a0">00052</a> <span class="preprocessor">#define DMX_MAX_SIGIO_FDS 4</span>
-00053 <span class="preprocessor"></span>
-00054 <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a>;
-00055 
-<a name="l00057"></a><a class="code" href="dmxinput_8h.html#a30">00057</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00058     <a class="code" href="dmxinput_8h.html#a30a6">DMX_UPDATE_REALIZE</a>,         
-00059     <a class="code" href="dmxinput_8h.html#a30a7">DMX_UPDATE_UNREALIZE</a>,       
-00060     <a class="code" href="dmxinput_8h.html#a30a8">DMX_UPDATE_RESTACK</a>,         
-00061     <a class="code" href="dmxinput_8h.html#a30a9">DMX_UPDATE_COPY</a>,            
-00062     <a class="code" href="dmxinput_8h.html#a30a10">DMX_UPDATE_RESIZE</a>,          
-00063     <a class="code" href="dmxinput_8h.html#a30a11">DMX_UPDATE_REPARENT</a>         
-00064 } <a class="code" href="dmxinput_8h.html#a30">DMXUpdateType</a>;
-00065 
-00066 <span class="keyword">typedef</span> void (*ProcessInputEventsProc)(<span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *);
-00067 <span class="keyword">typedef</span> void (*UpdateWindowInfoProc)(<span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *,
-00068                                      <a class="code" href="dmxinput_8h.html#a30">DMXUpdateType</a>, WindowPtr);
-00069 
-<a name="l00071"></a><a class="code" href="dmxinput_8h.html#a3">00071</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> *<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>;
-00072 
-<a name="l00074"></a><a class="code" href="dmxinput_8h.html#a31">00074</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00075     <a class="code" href="dmxinput_8h.html#a31a12">DMX_NOSIGIO</a> = 0,            
-00076     <a class="code" href="dmxinput_8h.html#a31a13">DMX_USESIGIO</a>,               
-00079     <a class="code" href="dmxinput_8h.html#a31a14">DMX_ACTIVESIGIO</a>             
-00080 } <a class="code" href="dmxinput_8h.html#a31">dmxSigioState</a>;
-00081 
-<a name="l00085"></a><a class="code" href="struct__DMXInputInfo.html">00085</a> <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> {
-<a name="l00086"></a><a class="code" href="struct__DMXInputInfo.html#o0">00086</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>              *<a class="code" href="struct__DMXInputInfo.html#o0">name</a>; 
-<a name="l00089"></a><a class="code" href="struct__DMXInputInfo.html#o1">00089</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o1">freename</a>; 
-<a name="l00090"></a><a class="code" href="struct__DMXInputInfo.html#o2">00090</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o2">detached</a>; 
-<a name="l00091"></a><a class="code" href="struct__DMXInputInfo.html#o3">00091</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o3">inputIdx</a>; 
-<a name="l00092"></a><a class="code" href="struct__DMXInputInfo.html#o4">00092</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o4">scrnIdx</a>;  
-<a name="l00093"></a><a class="code" href="struct__DMXInputInfo.html#o5">00093</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o5">core</a>;  
-<a name="l00096"></a><a class="code" href="struct__DMXInputInfo.html#o6">00096</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o6">console</a>; 
-<a name="l00100"></a><a class="code" href="struct__DMXInputInfo.html#o7">00100</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o7">windows</a>; 
-00103     ProcessInputEventsProc  processInputEvents;
-00104     UpdateWindowInfoProc    updateWindowInfo;
-00105 
-00106                                 <span class="comment">/* Local input information */</span>
-<a name="l00107"></a><a class="code" href="struct__DMXInputInfo.html#o10">00107</a>     <a class="code" href="dmxinput_8h.html#a31">dmxSigioState</a>           <a class="code" href="struct__DMXInputInfo.html#o10">sigioState</a>;    
-<a name="l00108"></a><a class="code" href="struct__DMXInputInfo.html#o11">00108</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o11">sigioFdCount</a>;  
-<a name="l00109"></a><a class="code" href="struct__DMXInputInfo.html#o12">00109</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o12">sigioFd</a>[<a class="code" href="dmxinput_8h.html#a0">DMX_MAX_SIGIO_FDS</a>];    
-<a name="l00110"></a><a class="code" href="struct__DMXInputInfo.html#o13">00110</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#o13">sigioAdded</a>[<a class="code" href="dmxinput_8h.html#a0">DMX_MAX_SIGIO_FDS</a>]; 
-<a name="l00114"></a><a class="code" href="struct__DMXInputInfo.html#o14">00114</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o14">vt_switch_pending</a>;
-00115 
-<a name="l00117"></a><a class="code" href="struct__DMXInputInfo.html#o15">00117</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o15">vt_switched</a>;
-00118 
-<a name="l00120"></a><a class="code" href="struct__DMXInputInfo.html#o16">00120</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#o16">numDevs</a>;
-00121 
-<a name="l00126"></a><a class="code" href="struct__DMXInputInfo.html#o17">00126</a>     <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>    *<a class="code" href="struct__DMXInputInfo.html#o17">devs</a>;
-00127 
-<a name="l00128"></a><a class="code" href="struct__DMXInputInfo.html#o18">00128</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#o18">keycodes</a>; 
-<a name="l00129"></a><a class="code" href="struct__DMXInputInfo.html#o19">00129</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#o19">symbols</a>;  
-<a name="l00130"></a><a class="code" href="struct__DMXInputInfo.html#o20">00130</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#o20">geometry</a>; 
-00131 };
-00132 
-<a name="l00133"></a><a class="code" href="dmxinput_8h.html#a4">00133</a> <span class="keyword">extern</span> <span class="keywordtype">int</span>                  <a class="code" href="dmxinit_8c.html#a3">dmxNumInputs</a>; 
-<a name="l00134"></a><a class="code" href="dmxinput_8h.html#a5">00134</a> <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *<a class="code" href="dmxinit_8c.html#a4">dmxInputs</a>;   
-00136 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a39">dmxInputInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00137 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a37">dmxInputReInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00138 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a38">dmxInputLateReInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00139 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a41">dmxInputFree</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00140 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a42">dmxInputLogDevices</a>(<span class="keywordtype">void</span>);
-00141 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8c.html#a3">dmxUpdateWindowInfo</a>(DMXUpdateType type, WindowPtr pWindow);
-00142 
-00143 <span class="comment">/* These functions are defined in input/dmxeq.c */</span>
-00144 <span class="keyword">extern</span> Bool dmxeqInitialized(<span class="keywordtype">void</span>);
-00145 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxeq_8c.html#a13">dmxeqEnqueue</a>(xEvent *e);
-00146 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxeq_8c.html#a14">dmxeqSwitchScreen</a>(ScreenPtr pScreen, Bool fromDIX);
-00147 
-00148 <span class="comment">/* This type is used in input/dmxevents.c.  Also, these functions are</span>
-00149 <span class="comment"> * defined in input/dmxevents.c */</span>
-00150 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00151     DMX_NO_BLOCK = 0,
-00152     DMX_BLOCK    = 1
-00153 } DMXBlockType;
-00154 
-00155 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxevents_8c.html#a21">dmxGetGlobalPosition</a>(<span class="keywordtype">int</span> *x, <span class="keywordtype">int</span> *y);
-00156 <span class="keyword">extern</span> <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxFindFirstScreen(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00157 <span class="keyword">extern</span> <span class="keywordtype">void</span>          dmxCoreMotion(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> delta,
-00158                                    DMXBlockType block);
-00159 
-00160 <span class="comment">/* Support for dynamic addition of inputs.  This functions is defined in</span>
-00161 <span class="comment"> * config/dmxconfig.c */</span>
-00162 <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxConfigAddInput(<span class="keyword">const</span> <span class="keywordtype">char</span> *name, <span class="keywordtype">int</span> core);
-00163 <span class="preprocessor">#endif </span><span class="comment">/* DMXINPUT_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h.html
index fab2a374d..d2c887e08 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinput_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinput_8h.html
@@ -6,520 +6,577 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxinput.h File Reference</h1>
-<p>
-<a href="dmxinput_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a0">DMX_MAX_SIGIO_FDS</a>&nbsp;&nbsp;&nbsp;4</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a3">DMXLocalInputInfoPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a> { <br>
-&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a30a6">DMX_UPDATE_REALIZE</a>, 
-<a class="el" href="dmxinput_8h.html#a30a7">DMX_UPDATE_UNREALIZE</a>, 
-<a class="el" href="dmxinput_8h.html#a30a8">DMX_UPDATE_RESTACK</a>, 
-<a class="el" href="dmxinput_8h.html#a30a9">DMX_UPDATE_COPY</a>, 
-<br>
-&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a30a10">DMX_UPDATE_RESIZE</a>, 
-<a class="el" href="dmxinput_8h.html#a30a11">DMX_UPDATE_REPARENT</a>
-<br>
+<p><a href="dmxinput_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#afc9c4f441bc6bd7d6ba0226d1415031c">DMX_MAX_SIGIO_FDS</a>&nbsp;&nbsp;&nbsp;4</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a> )(struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a> )(struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#adb148db00fe0adf1938b815b9b934d26">DMXLocalInputInfoPtr</a></td></tr>
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a> { <br/>
+&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9">DMX_UPDATE_REALIZE</a>, 
+<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b">DMX_UPDATE_UNREALIZE</a>, 
+<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25">DMX_UPDATE_RESTACK</a>, 
+<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72">DMX_UPDATE_COPY</a>, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146">DMX_UPDATE_RESIZE</a>, 
+<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c">DMX_UPDATE_REPARENT</a>
+<br/>
  }</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a31">dmxSigioState</a> { <a class="el" href="dmxinput_8h.html#a31a12">DMX_NOSIGIO</a> =  0, 
-<a class="el" href="dmxinput_8h.html#a31a13">DMX_USESIGIO</a>, 
-<a class="el" href="dmxinput_8h.html#a31a14">DMX_ACTIVESIGIO</a>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a> { <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596">DMX_NOSIGIO</a> =  0, 
+<a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608">DMX_USESIGIO</a>, 
+<a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b">DMX_ACTIVESIGIO</a>
  }</td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a17">dmxInputInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a18">dmxInputReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a19">dmxInputLateReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a20">dmxInputFree</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a21">dmxInputLogDevices</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a22">dmxUpdateWindowInfo</a> (<a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a24">dmxeqEnqueue</a> (xEvent *e)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a25">dmxeqSwitchScreen</a> (ScreenPtr pScreen, Bool fromDIX)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a26">dmxGetGlobalPosition</a> (int *x, int *y)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a4">dmxNumInputs</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinput_8h.html#a5">dmxInputs</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides access to:<ul>
-<li>global variables available to all hw/dmx routines, and</li><li>enumerations and typedefs needed by input routines in hw/dmx (and hw/dmx/input).</li></ul>
-<p>
-The goal is that no files in hw/dmx should include header files from hw/dmx/input -- the interface defined here should be the only interface exported to the hw/dmx layer. <dl compact><dt><b>See also:</b></dt><dd>input/dmxinputinit.c.</dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxinput.h::DMX_MAX_SIGIO_FDS" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_MAX_SIGIO_FDS&nbsp;&nbsp;&nbsp;4
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> { <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b">DMX_NO_BLOCK</a> =  0, 
+<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f">DMX_BLOCK</a> =  1
+ }</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a5845f0dbf305a8a233d3747489745faa">dmxInputInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#ac8f3465a13cae73a3d657526643ef7b7">dmxInputReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a9d1185c140ba54b24312ff6c98105c15">dmxInputLateReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#afa044735ab6fae7c75c82243a5159611">dmxInputFree</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#ac5bfc30ece32ae2af838c9e45857dc36">dmxInputLogDevices</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a122b762a283b031348730294d3aa1319">dmxUpdateWindowInfo</a> (<a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#ac30ee4be3ed3f25b13caba5cf17cf41d">dmxeqSwitchScreen</a> (DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a0cb75edbb0cabbfd89b40309907bdee3">dmxGetGlobalPosition</a> (int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a8bb7b5687d93b86df921eef6b7c28052">dmxFindFirstScreen</a> (int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a> (DevicePtr pDev, int x, int y, int delta, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a21dc2639218a59ae564d3eaeb4781a90">dmxConfigAddInput</a> (const char *name, int core)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides access to:</p>
+<ul>
+<li>global variables available to all hw/dmx routines, and</li>
+<li>enumerations and typedefs needed by input routines in hw/dmx (and hw/dmx/input).</li>
+</ul>
+<p>The goal is that no files in hw/dmx should include header files from hw/dmx/input -- the interface defined here should be the only interface exported to the hw/dmx layer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinputinit_8c.html">input/dmxinputinit.c</a>. </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="afc9c4f441bc6bd7d6ba0226d1415031c"></a><!-- doxytag: member="dmxinput.h::DMX_MAX_SIGIO_FDS" ref="afc9c4f441bc6bd7d6ba0226d1415031c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAX_SIGIO_FDS&nbsp;&nbsp;&nbsp;4</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Maximum number of file descriptors for SIGIO handling     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxinput.h::DMXLocalInputInfoPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>* <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>
+</div>
+<div class="memdoc">
+<p>Maximum number of file descriptors for SIGIO handling </p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="adb148db00fe0adf1938b815b9b934d26"></a><!-- doxytag: member="dmxinput.h::DMXLocalInputInfoPtr" ref="adb148db00fe0adf1938b815b9b934d26" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>* <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-An opaque structure that is only exposed in the dmx/input layer.     </td>
-  </tr>
-</table>
-<hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a31" doxytag="dmxinput.h::dmxSigioState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> enum <a class="el" href="dmxinput_8h.html#a31">dmxSigioState</a>
+</div>
+<div class="memdoc">
+<p>An opaque structure that is only exposed in the dmx/input layer. </p>
+
+</div>
+</div>
+<a class="anchor" id="acb2c7d7b4029ad06b7bf51b71c37a638"></a><!-- doxytag: member="dmxinput.h::ProcessInputEventsProc" ref="acb2c7d7b4029ad06b7bf51b71c37a638" args=")(struct _DMXInputInfo *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a>)(struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-State of the SIGIO engine <dl compact><dt><b>Enumeration values: </b></dt><dd>
-<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a class="anchor" name="a31a12" doxytag="DMX_NOSIGIO" ></a>DMX_NOSIGIO</em>&nbsp;</td><td>
-Device does not use SIGIO at all. </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a31a13" doxytag="DMX_USESIGIO" ></a>DMX_USESIGIO</em>&nbsp;</td><td>
-Device can use SIGIO, but is not (e.g., because the VT is switch away). </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a31a14" doxytag="DMX_ACTIVESIGIO" ></a>DMX_ACTIVESIGIO</em>&nbsp;</td><td>
-Device is currently using SIGIO. </td></tr>
-</table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7d3f5360f968ed1d470b03fbee5d03f0"></a><!-- doxytag: member="dmxinput.h::UpdateWindowInfoProc" ref="a7d3f5360f968ed1d470b03fbee5d03f0" args=")(struct _DMXInputInfo *, DMXUpdateType, WindowPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a>)(struct <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="a3a7195ab3516c5354bac4ca80b2eedb7"></a><!-- doxytag: member="dmxinput.h::DMXBlockType" ref="a3a7195ab3516c5354bac4ca80b2eedb7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b"></a><!-- doxytag: member="DMX_NO_BLOCK" ref="a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b" args="" -->DMX_NO_BLOCK</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f"></a><!-- doxytag: member="DMX_BLOCK" ref="a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f" args="" -->DMX_BLOCK</em>&nbsp;</td><td>
+</td></tr>
+</table>
+</dd>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="dmxinput.h::DMXUpdateType" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div>
+<a class="anchor" id="abdcaa3561e4107b3e133d221a881fdd4"></a><!-- doxytag: member="dmxinput.h::dmxSigioState" ref="abdcaa3561e4107b3e133d221a881fdd4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> enum <a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>
+          <td class="memname">enum <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reason why window layout was updated. <dl compact><dt><b>Enumeration values: </b></dt><dd>
-<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a class="anchor" name="a30a6" doxytag="DMX_UPDATE_REALIZE" ></a>DMX_UPDATE_REALIZE</em>&nbsp;</td><td>
-Window realized </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a30a7" doxytag="DMX_UPDATE_UNREALIZE" ></a>DMX_UPDATE_UNREALIZE</em>&nbsp;</td><td>
-Window unrealized </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a30a8" doxytag="DMX_UPDATE_RESTACK" ></a>DMX_UPDATE_RESTACK</em>&nbsp;</td><td>
-Stacking order changed </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a30a9" doxytag="DMX_UPDATE_COPY" ></a>DMX_UPDATE_COPY</em>&nbsp;</td><td>
-Window copied </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a30a10" doxytag="DMX_UPDATE_RESIZE" ></a>DMX_UPDATE_RESIZE</em>&nbsp;</td><td>
-Window resized </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a30a11" doxytag="DMX_UPDATE_REPARENT" ></a>DMX_UPDATE_REPARENT</em>&nbsp;</td><td>
-Window reparented </td></tr>
-</table>
+</div>
+<div class="memdoc">
+<p>State of the SIGIO engine </p>
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596"></a><!-- doxytag: member="DMX_NOSIGIO" ref="abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596" args="" -->DMX_NOSIGIO</em>&nbsp;</td><td>
+<p>Device does not use SIGIO at all. </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608"></a><!-- doxytag: member="DMX_USESIGIO" ref="abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608" args="" -->DMX_USESIGIO</em>&nbsp;</td><td>
+<p>Device can use SIGIO, but is not (e.g., because the VT is switch away). </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b"></a><!-- doxytag: member="DMX_ACTIVESIGIO" ref="abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b" args="" -->DMX_ACTIVESIGIO</em>&nbsp;</td><td>
+<p>Device is currently using SIGIO. </p>
+</td></tr>
+</table>
+</dd>
 </dl>
-    </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a24" doxytag="dmxinput.h::dmxeqEnqueue" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div>
+<a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8"></a><!-- doxytag: member="dmxinput.h::DMXUpdateType" ref="ae16d9134720b35da8f258db9a1c039a8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxeqEnqueue </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">xEvent *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>e</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">enum <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reason why window layout was updated. </p>
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9"></a><!-- doxytag: member="DMX_UPDATE_REALIZE" ref="ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9" args="" -->DMX_UPDATE_REALIZE</em>&nbsp;</td><td>
+<p>Window realized </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b"></a><!-- doxytag: member="DMX_UPDATE_UNREALIZE" ref="ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b" args="" -->DMX_UPDATE_UNREALIZE</em>&nbsp;</td><td>
+<p>Window unrealized </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25"></a><!-- doxytag: member="DMX_UPDATE_RESTACK" ref="ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25" args="" -->DMX_UPDATE_RESTACK</em>&nbsp;</td><td>
+<p>Stacking order changed </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72"></a><!-- doxytag: member="DMX_UPDATE_COPY" ref="ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72" args="" -->DMX_UPDATE_COPY</em>&nbsp;</td><td>
+<p>Window copied </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146"></a><!-- doxytag: member="DMX_UPDATE_RESIZE" ref="ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146" args="" -->DMX_UPDATE_RESIZE</em>&nbsp;</td><td>
+<p>Window resized </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c"></a><!-- doxytag: member="DMX_UPDATE_REPARENT" ref="ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c" args="" -->DMX_UPDATE_REPARENT</em>&nbsp;</td><td>
+<p>Window reparented </p>
+</td></tr>
+</table>
+</dd>
+</dl>
 
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a21dc2639218a59ae564d3eaeb4781a90"></a><!-- doxytag: member="dmxinput.h::dmxConfigAddInput" ref="a21dc2639218a59ae564d3eaeb4781a90" args="(const char *name, int core)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* dmxConfigAddInput </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>core</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function adds an event to the end of the queue. If the event is an XInput event, then the next event (the valuator event) is also stored in the queue. If the new event has a time before the time of the last event currently on the queue, then the time is updated for the new event.<p>
-Must be reentrant with ProcessInputEvents. Assumption: dmxeqEnqueue will never be interrupted. If this is called from both signal handlers and regular code, make sure the signal is suspended when called from regular code.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxinput.h::dmxeqSwitchScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adf2928cf693dab61adafad503e81d2dc"></a><!-- doxytag: member="dmxinput.h::dmxCoreMotion" ref="adf2928cf693dab61adafad503e81d2dc" args="(DevicePtr pDev, int x, int y, int delta, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxeqSwitchScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxCoreMotion </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>fromDIX</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>delta</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make <em>pScreen</em> the new screen for enqueueing events. If <em>fromDIX</em> is TRUE, also make <em>pScreen</em> the new screen for dequeuing events.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxinput.h::dmxGetGlobalPosition" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxcursor_8c_source.html#l00109">DMXDBG4</a>, <a class="el" href="dmxcursor_8c_source.html#l00110">DMXDBG5</a>, <a class="el" href="dmxcursor_8c_source.html#l00111">DMXDBG6</a>, <a class="el" href="dmxevents_8c_source.html#l00158">dmxFindFirstScreen()</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalHeight</a>, <a class="el" href="dmxevents_8c_source.html#l00064">dmxGlobalInvalid</a>, <a class="el" href="dmxcb_8c_source.html#l00054">dmxGlobalWidth</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsigio_8c_source.html#l00087">dmxSigioBlock()</a>, <a class="el" href="dmxsigio_8c_source.html#l00097">dmxSigioUnblock()</a>, <a class="el" href="dmxevents_8c_source.html#l00174">enqueueMotion()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>, <a class="el" href="dmx_8h_source.html#l00147">_DMXScreenInfo::rootXOrigin</a>, <a class="el" href="dmx_8h_source.html#l00148">_DMXScreenInfo::rootYOrigin</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00209">_DMXLocalInputInfo::update_position</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac30ee4be3ed3f25b13caba5cf17cf41d"></a><!-- doxytag: member="dmxinput.h::dmxeqSwitchScreen" ref="ac30ee4be3ed3f25b13caba5cf17cf41d" args="(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGetGlobalPosition </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="memname">void dmxeqSwitchScreen </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>fromDIX</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Return DMX's notion of the pointer position in the global coordinate space.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxinput.h::dmxInputFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8bb7b5687d93b86df921eef6b7c28052"></a><!-- doxytag: member="dmxinput.h::dmxFindFirstScreen" ref="a8bb7b5687d93b86df921eef6b7c28052" args="(int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxFindFirstScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free all of the memory associated with <em>dmxInput</em>     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxinput.h::dmxInputInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize all of the devices described in <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxinput.h::dmxInputLateReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, and <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0cb75edbb0cabbfd89b40309907bdee3"></a><!-- doxytag: member="dmxinput.h::dmxGetGlobalPosition" ref="a0cb75edbb0cabbfd89b40309907bdee3" args="(int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGetGlobalPosition </td>
+          <td>(</td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputLateReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Return DMX's notion of the pointer position in the global coordinate space. </p>
+
+<p>References <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalX</a>, and <a class="el" href="dmxevents_8c_source.html#l00063">dmxGlobalY</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00535">dmxBackendLateReInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afa044735ab6fae7c75c82243a5159611"></a><!-- doxytag: member="dmxinput.h::dmxInputFree" ref="afa044735ab6fae7c75c82243a5159611" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInputFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialize all the devices described in <em>dmxInput</em>. Called from #dmxReconfig after the cursor is redisplayed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxinput.h::dmxInputLogDevices" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free all of the memory associated with <em>dmxInput</em> </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinput_8h_source.html#l00088">_DMXInputInfo::freename</a>, <a class="el" href="dmxinput_8h_source.html#l00129">_DMXInputInfo::geometry</a>, <a class="el" href="dmxinput_8h_source.html#l00127">_DMXInputInfo::keycodes</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinput_8h_source.html#l00128">_DMXInputInfo::symbols</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5845f0dbf305a8a233d3747489745faa"></a><!-- doxytag: member="dmxinput.h::dmxInputInit" ref="a5845f0dbf305a8a233d3747489745faa" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputLogDevices </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInputInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize all of the devices described in <em>dmxInput</em>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00095">_DMXInputInfo::console</a>, <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxarg_8c_source.html#l00099">dmxArgC()</a>, <a class="el" href="dmxarg_8c_source.html#l00071">dmxArgFree()</a>, <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>, <a class="el" href="dmxarg_8c_source.html#l00092">dmxArgV()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00613">dmxBlockHandler()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinput_8h_source.html#l00129">_DMXInputInfo::geometry</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00127">_DMXInputInfo::keycodes</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxinput_8h_source.html#l00102">_DMXInputInfo::processInputEvents</a>, <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00128">_DMXInputInfo::symbols</a>, <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>, <a class="el" href="dmxinput_8h_source.html#l00103">_DMXInputInfo::updateWindowInfo</a>, and <a class="el" href="dmxinput_8h_source.html#l00099">_DMXInputInfo::windows</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, and <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a9d1185c140ba54b24312ff6c98105c15"></a><!-- doxytag: member="dmxinput.h::dmxInputLateReInit" ref="a9d1185c140ba54b24312ff6c98105c15" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInputLateReInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log information about all of the known devices using <a class="el" href="dmxlog_8c.html#a7">dmxLog()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxinput.h::dmxInputReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Re-initialize all the devices described in <em>dmxInput</em>. Called from <a class="el" href="dmxextension_8c.html#a2bf59b5de92ff76381543139f7b2c8fa">dmxAdjustCursorBoundaries</a> after the cursor is redisplayed. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00202">_DMXLocalInputInfo::latereinit</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac5bfc30ece32ae2af838c9e45857dc36"></a><!-- doxytag: member="dmxinput.h::dmxInputLogDevices" ref="ac5bfc30ece32ae2af838c9e45857dc36" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInputLogDevices </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Log information about all of the known devices using <a class="el" href="dmxlog_8c.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog()</a>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinputinit_8h_source.html#l00264">_DMXLocalInputInfo::deviceName</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00170">dmxLogCont()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ac8f3465a13cae73a3d657526643ef7b7"></a><!-- doxytag: member="dmxinput.h::dmxInputReInit" ref="ac8f3465a13cae73a3d657526643ef7b7" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInputReInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialize all the devices described in <em>dmxInput</em>. Called from #dmxReconfig before the cursor is redisplayed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxinput.h::dmxUpdateWindowInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Re-initialize all the devices described in <em>dmxInput</em>. Called from <a class="el" href="dmxextension_8c.html#a2bf59b5de92ff76381543139f7b2c8fa">dmxAdjustCursorBoundaries</a> before the cursor is redisplayed. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00199">_DMXLocalInputInfo::reinit</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a122b762a283b031348730294d3aa1319"></a><!-- doxytag: member="dmxinput.h::dmxUpdateWindowInfo" ref="a122b762a283b031348730294d3aa1319" args="(DMXUpdateType type, WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxUpdateWindowInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxinput_8h.html#a30">DMXUpdateType</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em>, </td>
+          <td class="memname">void dmxUpdateWindowInfo </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This routine is called from #dmxwindow.c whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxinput.h::dmxInputs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="dmxinput_8h.html#a5">dmxInputs</a>
+</div>
+<div class="memdoc">
+<p>This routine is called from <em><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a></em> whenever the layout of windows on the display might have changed. This information is used by input drivers (currently only the console driver) that provide information about window layout to the user. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxinput_8h_source.html#l00103">_DMXInputInfo::updateWindowInfo</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a067017d9e67716c251357e9edf917e59"></a><!-- doxytag: member="dmxinput.h::dmxInputs" ref="a067017d9e67716c251357e9edf917e59" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of inputs     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxinput.h::dmxNumInputs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of inputs </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00613">dmxBlockHandler()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c8f7f00098aec51d56c188a26747d9f"></a><!-- doxytag: member="dmxinput.h::dmxNumInputs" ref="a7c8f7f00098aec51d56c188a26747d9f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxinput_8h.html#a4">dmxNumInputs</a>
+          <td class="memname">int <a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of <a class="el" href="dmxinput_8h.html#a5">dmxInputs</a>     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Number of <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a> </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html
new file mode 100644
index 000000000..931bb12cb
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxinput_8h_source.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxinput.h</h1><a href="dmxinput_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00033"></a>00033 <span class="comment"> *</span>
+<a name="l00034"></a>00034 <span class="comment"> */</span>
+<a name="l00035"></a>00035 
+<a name="l00047"></a>00047 <span class="preprocessor">#ifndef DMXINPUT_H</span>
+<a name="l00048"></a>00048 <span class="preprocessor"></span><span class="preprocessor">#define DMXINPUT_H</span>
+<a name="l00049"></a>00049 <span class="preprocessor"></span>
+<a name="l00051"></a><a class="code" href="dmxinput_8h.html#afc9c4f441bc6bd7d6ba0226d1415031c">00051</a> <span class="preprocessor">#define DMX_MAX_SIGIO_FDS 4</span>
+<a name="l00052"></a>00052 <span class="preprocessor"></span>
+<a name="l00053"></a>00053 <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a>;
+<a name="l00054"></a>00054 
+<a name="l00056"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">00056</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00057"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9">00057</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9">DMX_UPDATE_REALIZE</a>,         
+<a name="l00058"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b">00058</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b">DMX_UPDATE_UNREALIZE</a>,       
+<a name="l00059"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25">00059</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25">DMX_UPDATE_RESTACK</a>,         
+<a name="l00060"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72">00060</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72">DMX_UPDATE_COPY</a>,            
+<a name="l00061"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146">00061</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146">DMX_UPDATE_RESIZE</a>,          
+<a name="l00062"></a><a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c">00062</a>     <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c">DMX_UPDATE_REPARENT</a>         
+<a name="l00063"></a>00063 } <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>;
+<a name="l00064"></a>00064 
+<a name="l00065"></a><a class="code" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">00065</a> <span class="keyword">typedef</span> void (*<a class="code" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a>)(<span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *);
+<a name="l00066"></a><a class="code" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">00066</a> <span class="keyword">typedef</span> void (*<a class="code" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a>)(<span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> *,
+<a name="l00067"></a>00067                                      <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr);
+<a name="l00068"></a>00068 
+<a name="l00070"></a><a class="code" href="dmxinput_8h.html#adb148db00fe0adf1938b815b9b934d26">00070</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> *<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>;
+<a name="l00071"></a>00071 
+<a name="l00073"></a><a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">00073</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00074"></a><a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596">00074</a>     <a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596">DMX_NOSIGIO</a> = 0,            
+<a name="l00075"></a><a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608">00075</a>     <a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608">DMX_USESIGIO</a>,               
+<a name="l00078"></a><a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b">00078</a>     <a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b">DMX_ACTIVESIGIO</a>             
+<a name="l00079"></a>00079 } <a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a>;
+<a name="l00080"></a>00080 
+<a name="l00084"></a><a class="code" href="struct__DMXInputInfo.html">00084</a> <span class="keyword">struct </span><a class="code" href="struct__DMXInputInfo.html">_DMXInputInfo</a> {
+<a name="l00085"></a><a class="code" href="struct__DMXInputInfo.html#a2336d1b16bdcaa9bc17cc510357de463">00085</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>              *<a class="code" href="struct__DMXInputInfo.html#a2336d1b16bdcaa9bc17cc510357de463">name</a>; 
+<a name="l00088"></a><a class="code" href="struct__DMXInputInfo.html#a22fa4a87ad87fef6957a9e2bd251a87d">00088</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#a22fa4a87ad87fef6957a9e2bd251a87d">freename</a>; 
+<a name="l00089"></a><a class="code" href="struct__DMXInputInfo.html#a0341ff4f1c3424c95e28aac6f80163bb">00089</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#a0341ff4f1c3424c95e28aac6f80163bb">detached</a>; 
+<a name="l00090"></a><a class="code" href="struct__DMXInputInfo.html#abf7ccee011844f0cd3af58672f7a6afc">00090</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#abf7ccee011844f0cd3af58672f7a6afc">inputIdx</a>; 
+<a name="l00091"></a><a class="code" href="struct__DMXInputInfo.html#aaa7ac94b94f2bab1aff58a44dc0dad68">00091</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#aaa7ac94b94f2bab1aff58a44dc0dad68">scrnIdx</a>;  
+<a name="l00092"></a><a class="code" href="struct__DMXInputInfo.html#a2d84397e241ad4eb146b038f611e2322">00092</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#a2d84397e241ad4eb146b038f611e2322">core</a>;  
+<a name="l00095"></a><a class="code" href="struct__DMXInputInfo.html#ad967ada8c438519bcd788edd8db2b24a">00095</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#ad967ada8c438519bcd788edd8db2b24a">console</a>; 
+<a name="l00099"></a><a class="code" href="struct__DMXInputInfo.html#a44bbc55fb7a2fef1a88144825755d3ed">00099</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#a44bbc55fb7a2fef1a88144825755d3ed">windows</a>; 
+<a name="l00102"></a><a class="code" href="struct__DMXInputInfo.html#a4e91aaec0f0cbcd0d7e2896ac918c667">00102</a>     <a class="code" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a>  <a class="code" href="struct__DMXInputInfo.html#a4e91aaec0f0cbcd0d7e2896ac918c667">processInputEvents</a>;
+<a name="l00103"></a><a class="code" href="struct__DMXInputInfo.html#ad4a7bc0976bf853d45ea5043a66ade55">00103</a>     <a class="code" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a>    <a class="code" href="struct__DMXInputInfo.html#ad4a7bc0976bf853d45ea5043a66ade55">updateWindowInfo</a>;
+<a name="l00104"></a>00104 
+<a name="l00105"></a>00105                                 <span class="comment">/* Local input information */</span>
+<a name="l00106"></a><a class="code" href="struct__DMXInputInfo.html#ab7e0499d483754c4a1a9c567edb1c167">00106</a>     <a class="code" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a>           <a class="code" href="struct__DMXInputInfo.html#ab7e0499d483754c4a1a9c567edb1c167">sigioState</a>;    
+<a name="l00107"></a><a class="code" href="struct__DMXInputInfo.html#a0ba936a9c99af68fa838e45eb7af1c68">00107</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#a0ba936a9c99af68fa838e45eb7af1c68">sigioFdCount</a>;  
+<a name="l00108"></a><a class="code" href="struct__DMXInputInfo.html#a2d75d5540ff0a95d822bbb8dfbec197b">00108</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#a2d75d5540ff0a95d822bbb8dfbec197b">sigioFd</a>[<a class="code" href="dmxinput_8h.html#afc9c4f441bc6bd7d6ba0226d1415031c">DMX_MAX_SIGIO_FDS</a>];    
+<a name="l00109"></a><a class="code" href="struct__DMXInputInfo.html#a94aafbe9fd94083dc4e1469bec29d9ea">00109</a>     Bool                    <a class="code" href="struct__DMXInputInfo.html#a94aafbe9fd94083dc4e1469bec29d9ea">sigioAdded</a>[<a class="code" href="dmxinput_8h.html#afc9c4f441bc6bd7d6ba0226d1415031c">DMX_MAX_SIGIO_FDS</a>]; 
+<a name="l00113"></a><a class="code" href="struct__DMXInputInfo.html#ad834410a8c4c7225cd91c9bc96a0344e">00113</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#ad834410a8c4c7225cd91c9bc96a0344e">vt_switch_pending</a>;
+<a name="l00114"></a>00114 
+<a name="l00116"></a><a class="code" href="struct__DMXInputInfo.html#a1592eb7fde735ef649c06b6b3f52b632">00116</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#a1592eb7fde735ef649c06b6b3f52b632">vt_switched</a>;
+<a name="l00117"></a>00117 
+<a name="l00119"></a><a class="code" href="struct__DMXInputInfo.html#a25d88463a7385bc47bed58bb4a662f6d">00119</a>     <span class="keywordtype">int</span>                     <a class="code" href="struct__DMXInputInfo.html#a25d88463a7385bc47bed58bb4a662f6d">numDevs</a>;
+<a name="l00120"></a>00120 
+<a name="l00125"></a><a class="code" href="struct__DMXInputInfo.html#a70e88af10d1862603d4dbc65ba936d16">00125</a>     DMXLocalInputInfoPtr    *<a class="code" href="struct__DMXInputInfo.html#a70e88af10d1862603d4dbc65ba936d16">devs</a>;
+<a name="l00126"></a>00126 
+<a name="l00127"></a><a class="code" href="struct__DMXInputInfo.html#a04331378ac5aa4ce803982f3af18428c">00127</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#a04331378ac5aa4ce803982f3af18428c">keycodes</a>; 
+<a name="l00128"></a><a class="code" href="struct__DMXInputInfo.html#a1795d72d7dda09bd241382129a82202f">00128</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#a1795d72d7dda09bd241382129a82202f">symbols</a>;  
+<a name="l00129"></a><a class="code" href="struct__DMXInputInfo.html#ac1ce3fe307cdee42f3f4caf86f58a26c">00129</a>     <span class="keywordtype">char</span>                    *<a class="code" href="struct__DMXInputInfo.html#ac1ce3fe307cdee42f3f4caf86f58a26c">geometry</a>; 
+<a name="l00130"></a>00130 };
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132 <span class="keyword">extern</span> <span class="keywordtype">int</span>                  <a class="code" href="dmxinit_8c.html#a7c8f7f00098aec51d56c188a26747d9f">dmxNumInputs</a>; 
+<a name="l00133"></a>00133 <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>         *<a class="code" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a>;   
+<a name="l00135"></a>00135 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#a5845f0dbf305a8a233d3747489745faa">dmxInputInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00136"></a>00136 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#ac8f3465a13cae73a3d657526643ef7b7">dmxInputReInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00137"></a>00137 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#a9d1185c140ba54b24312ff6c98105c15">dmxInputLateReInit</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00138"></a>00138 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#afa044735ab6fae7c75c82243a5159611">dmxInputFree</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00139"></a>00139 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#ac5bfc30ece32ae2af838c9e45857dc36">dmxInputLogDevices</a>(<span class="keywordtype">void</span>);
+<a name="l00140"></a>00140 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8c.html#a122b762a283b031348730294d3aa1319">dmxUpdateWindowInfo</a>(DMXUpdateType type, WindowPtr pWindow);
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142 <span class="comment">/* These functions are defined in input/dmxeq.c */</span>
+<a name="l00143"></a>00143 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinput_8h.html#ac30ee4be3ed3f25b13caba5cf17cf41d">dmxeqSwitchScreen</a>(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX);
+<a name="l00144"></a>00144 
+<a name="l00145"></a>00145 <span class="comment">/* This type is used in input/dmxevents.c.  Also, these functions are</span>
+<a name="l00146"></a>00146 <span class="comment"> * defined in input/dmxevents.c */</span>
+<a name="l00147"></a><a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">00147</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00148"></a><a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b">00148</a>     <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b">DMX_NO_BLOCK</a> = 0,
+<a name="l00149"></a><a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f">00149</a>     <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f">DMX_BLOCK</a>    = 1
+<a name="l00150"></a>00150 } <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>;
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxinput_8h.html#a0cb75edbb0cabbfd89b40309907bdee3">dmxGetGlobalPosition</a>(<span class="keywordtype">int</span> *x, <span class="keywordtype">int</span> *y);
+<a name="l00153"></a>00153 <span class="keyword">extern</span> <a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *<a class="code" href="dmxinput_8h.html#a8bb7b5687d93b86df921eef6b7c28052">dmxFindFirstScreen</a>(<span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00154"></a>00154 <span class="keyword">extern</span> <span class="keywordtype">void</span>          <a class="code" href="dmxinput_8h.html#adf2928cf693dab61adafad503e81d2dc">dmxCoreMotion</a>(DevicePtr pDev, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> delta,
+<a name="l00155"></a>00155                                    <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00156"></a>00156 
+<a name="l00157"></a>00157 <span class="comment">/* Support for dynamic addition of inputs.  This functions is defined in</span>
+<a name="l00158"></a>00158 <span class="comment"> * config/dmxconfig.c */</span>
+<a name="l00159"></a>00159 <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *<a class="code" href="dmxinput_8h.html#a21dc2639218a59ae564d3eaeb4781a90">dmxConfigAddInput</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *name, <span class="keywordtype">int</span> core);
+<a name="l00160"></a>00160 <span class="preprocessor">#endif </span><span class="comment">/* DMXINPUT_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html
index 9b06c5221..d2e4953ea 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8c.html
@@ -6,463 +6,1449 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinputinit.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxdummy_8h-source.html">dmxdummy.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxbackend_8h-source.html">dmxbackend.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconsole_8h-source.html">dmxconsole.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxevents_8h-source.html">dmxevents.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmotion_8h-source.html">dmxmotion.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxeq_8h-source.html">dmxeq.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxconfig_8h-source.html">config/dmxconfig.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-keyboard_8h-source.html">lnx-keyboard.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-ms_8h-source.html">lnx-ms.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-ps2_8h-source.html">lnx-ps2.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-keyboard_8h-source.html">usb-keyboard.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-mouse_8h-source.html">usb-mouse.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-other_8h-source.html">usb-other.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-common_8h-source.html">usb-common.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsigio_8h-source.html">dmxsigio.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxarg_8h-source.html">dmxarg.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "input.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "windowstr.h"</code><br>
-<code>#include "XI.h"</code><br>
-<code>#include "XIproto.h"</code><br>
-<code>#include "exevents.h"</code><br>
-<code>#include "extinit.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a16">dmxChangePointerControl</a> (DeviceIntPtr pDevice, PtrCtrl *ctrl)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a18">dmxKeyboardKbdCtrlProc</a> (DeviceIntPtr pDevice, KeybdCtrl *ctrl)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a20">dmxKeyboardBellProc</a> (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a33">dmxInputCopyLocal</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a37">dmxInputReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a38">dmxInputLateReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a39">dmxInputInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a41">dmxInputFree</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a42">dmxInputLogDevices</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a43">dmxInputDetach</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a44">dmxInputDetachAll</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8c.html#a45">dmxInputDetachId</a> (int id)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxinputinit.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxdummy_8h_source.html">dmxdummy.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxbackend_8h_source.html">dmxbackend.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconsole_8h_source.html">dmxconsole.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxevents_8h_source.html">dmxevents.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmotion_8h_source.html">dmxmotion.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxconfig_8h_source.html">config/dmxconfig.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-keyboard_8h_source.html">lnx-keyboard.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-ms_8h_source.html">lnx-ms.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-ps2_8h_source.html">lnx-ps2.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-keyboard_8h_source.html">usb-keyboard.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-mouse_8h_source.html">usb-mouse.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-other_8h_source.html">usb-other.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-common_8h_source.html">usb-common.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsigio_8h_source.html">dmxsigio.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxarg_8h_source.html">dmxarg.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;input.h&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<code>#include &quot;mi.h&quot;</code><br/>
+<code>#include &quot;xkbsrv.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/XI.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XIproto.h&gt;</code><br/>
+<code>#include &quot;exevents.h&quot;</code><br/>
+<code>#include &quot;extinit.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ae119931aa626ba4edf85defe5bebe2e7">DMX_WINDOW_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a05b49c662c073f89e86804f7856622a0">LEN</a>&nbsp;&nbsp;&nbsp;32</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ae708022d89f6e39813b8db1389bf64fe">DDXRingBell</a> (int volume, int pitch, int duration)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a4538a00d09ac3cd10b81598b39340da3">dmxKbdCtrl</a> (DeviceIntPtr pDevice, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ace8ffeb961580bf16d7c3ec044a00491">dmxBell</a> (int volume, DeviceIntPtr pDev, pointer arg, int something)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a4f65a9b46fe88b8f530752e3b7769424">_dmxChangePointerControl</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aaba396b9c08ac672d3dcf6561ac57b40">dmxChangePointerControl</a> (DeviceIntPtr pDevice, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aa785da3b31e5310dd1b1ea13325a83dc">_dmxKeyboardKbdCtrlProc</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ad23e145891ad0fb1c909d85ca8e4fe19">dmxKeyboardKbdCtrlProc</a> (DeviceIntPtr pDevice, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#adcea87288c189798602bd610f87ad785">_dmxKeyboardBellProc</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int percent)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ab127903bdb6bf262e51f128b4cec4960">dmxKeyboardBellProc</a> (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aef5e79cc27e75fdc3fdfb3e45c64dc9a">dmxKeyboardFreeNames</a> (XkbComponentNamesPtr names)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a2969aeffcc1a403f00be11a8d06b3926">dmxKeyboardOn</a> (DeviceIntPtr pDevice, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a> *info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aee6196e74882c16d5cd939d88b3b6fdc">dmxDeviceOnOff</a> (DeviceIntPtr pDevice, int what)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a5f2e0a323aa9ea0dc0a0d1f5195c5e26">dmxProcessInputEvents</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ab8d8ef4b4e4f8e022a1452765e1f1e12">dmxUpdateWindowInformation</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a> type, WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a5f11f622380645150bc9ca3a465ca382">dmxCollectAll</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#abd6a885883606f21d4342486d8fd5ab6">dmxBlockHandler</a> (pointer blockData, OSTimePtr pTimeout, pointer pReadMask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a72e77569074807987e358e4eda38c044">dmxSwitchReturn</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a812e98c3ae4436f403739fc6f58eda6c">dmxWakeupHandler</a> (pointer blockData, int result, pointer pReadMask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac312d24e4289c3b39964428a6e39a219">dmxMakeUniqueDeviceName</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static DeviceIntPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a54b496c8474a33844549ed64913456fe">dmxAddDevice</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aa1d3565232f8ab962246c825bb565bd6">dmxLookupLocal</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a816d1052ef5a587ef8e16b0005b06662">dmxInputCopyLocal</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac4ea57a3ba798705d63254cdbbefb63d">dmxPopulateLocal</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__dmxArg.html">dmxArg</a> a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ad705be7fbe7dfaf3119a8892e5c54aaa">dmxInputExtensionErrorHandler</a> (Display *dsp, char *name, char *reason)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ab57781b7672c11bee1430a47d5118e9e">dmxInputScanForExtensions</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int doXI)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac8f3465a13cae73a3d657526643ef7b7">dmxInputReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a9d1185c140ba54b24312ff6c98105c15">dmxInputLateReInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a5845f0dbf305a8a233d3747489745faa">dmxInputInit</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#aa124c7cd547a9993834becc6e4aebe63">dmxInputFreeLocal</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> *local)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#afa044735ab6fae7c75c82243a5159611">dmxInputFree</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac5bfc30ece32ae2af838c9e45857dc36">dmxInputLogDevices</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac4d026f31f7b32bd571bdcf9e091c419">dmxInputDetach</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#adec246343ae8402c7cc47b19020c7ef7">dmxInputDetachAll</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ad7a3f09eeaf98373c261119fba907c47">dmxInputDetachId</a> (int id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ae0bcd445301dd91f20c9eb0b6dce0b42">dmxInputLocateId</a> (int id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a15cdf4e2066f64c2d9bd51906d6ca9a2">dmxInputAttachNew</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int *id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a328d0a700148af94b3dccf354b313c84">dmxInputAttachOld</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int *id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ac3f9807875f237589d57ab9f006735af">dmxInputAttachConsole</a> (const char *name, int isCore, int *id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a2ee085307a1dba7b07fa2eb34639815c">dmxInputAttachBackend</a> (int physicalScreen, int isCore, int *id)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#ab34ec11967377e32bc0817fb3a8b939e">dmxLocalCorePointer</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxLocalCoreKeyboard</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a3041e526ae9e56b4a2d0a99f030af71f">DMXDummyMou</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#af0b33ec9267eea9d58f6792e33e02295">DMXDummyKbd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a420b4847b9c9f9992e042754c9a5d9c9">DMXBackendMou</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a4ad947489cdc8cae1835dbd5604e0cde">DMXBackendKbd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a3a58ba39e104b23698ca8ef19789caf3">DMXConsoleMou</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a3c213f84d74e74751787f916f509581f">DMXConsoleKbd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a42322c044220c5f39e1fd37b23cc037b">DMXCommonOth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8c.html#a74cb9ef11048e61ab91acd98613210b8">DMXLocalDevices</a> []</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides generic input support. Functions here set up input and lead to the calling of low-level device drivers for input.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a16" doxytag="dmxinputinit.c::dmxChangePointerControl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides generic input support. Functions here set up input and lead to the calling of low-level device drivers for input. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="ae119931aa626ba4edf85defe5bebe2e7"></a><!-- doxytag: member="dmxinputinit.c::DMX_WINDOW_DEBUG" ref="ae119931aa626ba4edf85defe5bebe2e7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangePointerControl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">#define DMX_WINDOW_DEBUG&nbsp;&nbsp;&nbsp;0</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a05b49c662c073f89e86804f7856622a0"></a><!-- doxytag: member="dmxinputinit.c::LEN" ref="a05b49c662c073f89e86804f7856622a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define LEN&nbsp;&nbsp;&nbsp;32</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00668">dmxMakeUniqueDeviceName()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a4f65a9b46fe88b8f530752e3b7769424"></a><!-- doxytag: member="dmxinputinit.c::_dmxChangePointerControl" ref="a4f65a9b46fe88b8f530752e3b7769424" args="(DMXLocalInputInfoPtr dmxLocal, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void _dmxChangePointerControl </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>PtrCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00225">_DMXLocalInputInfo::mCtrl</a>, <a class="el" href="dmxinputinit_8h_source.html#l00233">_DMXLocalInputInfo::mctrl</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adcea87288c189798602bd610f87ad785"></a><!-- doxytag: member="dmxinputinit.c::_dmxKeyboardBellProc" ref="adcea87288c189798602bd610f87ad785" args="(DMXLocalInputInfoPtr dmxLocal, int percent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void _dmxKeyboardBellProc </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00227">_DMXLocalInputInfo::kBell</a>, <a class="el" href="dmxinputinit_8h_source.html#l00232">_DMXLocalInputInfo::kctrl</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa785da3b31e5310dd1b1ea13325a83dc"></a><!-- doxytag: member="dmxinputinit.c::_dmxKeyboardKbdCtrlProc" ref="aa785da3b31e5310dd1b1ea13325a83dc" args="(DMXLocalInputInfoPtr dmxLocal, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void _dmxKeyboardKbdCtrlProc </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the pointer control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the pointer devices that send core events.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="dmxinputinit.c::dmxInputCopyLocal" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00226">_DMXLocalInputInfo::kCtrl</a>, <a class="el" href="dmxinputinit_8h_source.html#l00232">_DMXLocalInputInfo::kctrl</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae708022d89f6e39813b8db1389bf64fe"></a><!-- doxytag: member="dmxinputinit.c::DDXRingBell" ref="ae708022d89f6e39813b8db1389bf64fe" args="(int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxInputCopyLocal </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void DDXRingBell </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pitch</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>s</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duration</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a54b496c8474a33844549ed64913456fe"></a><!-- doxytag: member="dmxinputinit.c::dmxAddDevice" ref="a54b496c8474a33844549ed64913456fe" args="(DMXLocalInputInfoPtr dmxLocal)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static DeviceIntPtr dmxAddDevice </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy the local input information from <em>s</em> into a new <em>devs</em> slot in <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a43" doxytag="dmxinputinit.c::dmxInputDetach" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00192">_DMXLocalInputInfo::create_private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00668">dmxMakeUniqueDeviceName()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00236">_DMXLocalInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinputinit_8h_source.html#l00183">_DMXLocalInputInfo::name</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ace8ffeb961580bf16d7c3ec044a00491"></a><!-- doxytag: member="dmxinputinit.c::dmxBell" ref="ace8ffeb961580bf16d7c3ec044a00491" args="(int volume, DeviceIntPtr pDev, pointer arg, int something)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxInputDetach </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxBell </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>arg</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>something</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="abd6a885883606f21d4342486d8fd5ab6"></a><!-- doxytag: member="dmxinputinit.c::dmxBlockHandler" ref="abd6a885883606f21d4342486d8fd5ab6" args="(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxBlockHandler </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>blockData</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">OSTimePtr&nbsp;</td>
+          <td class="paramname"> <em>pTimeout</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pReadMask</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detach an input     </td>
-  </tr>
-</table>
-<a class="anchor" name="a44" doxytag="dmxinputinit.c::dmxInputDetachAll" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaba396b9c08ac672d3dcf6561ac57b40"></a><!-- doxytag: member="dmxinputinit.c::dmxChangePointerControl" ref="aaba396b9c08ac672d3dcf6561ac57b40" args="(DeviceIntPtr pDevice, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxChangePointerControl </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputDetachAll </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Change the pointer control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the pointer devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00265">_dmxChangePointerControl()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5f11f622380645150bc9ca3a465ca382"></a><!-- doxytag: member="dmxinputinit.c::dmxCollectAll" ref="a5f11f622380645150bc9ca3a465ca382" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxCollectAll </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Search for input associated with <em>dmxScreen</em>, and detach.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a45" doxytag="dmxinputinit.c::dmxInputDetachId" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinputinit_8h_source.html#l00216">_DMXLocalInputInfo::collect_events</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00149">DMX_BLOCK</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00613">dmxBlockHandler()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aee6196e74882c16d5cd939d88b3b6fdc"></a><!-- doxytag: member="dmxinputinit.c::dmxDeviceOnOff" ref="aee6196e74882c16d5cd939d88b3b6fdc" args="(DeviceIntPtr pDevice, int what)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxDeviceOnOff </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> int dmxInputDetachId </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>id</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>what</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00119">_DMXLocalInitInfo::belFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8c_source.html#l00245">dmxBell()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxconfig_8h.html#a5d7b9c934bac97af375cfc1425e4d71c">dmxConfigGetXkbLayout()</a>, <a class="el" href="dmxconfig_8h.html#a9789c9f2428105bd9e896ddd25ea9a76">dmxConfigGetXkbModel()</a>, <a class="el" href="dmxconfig_8h.html#ae5986f5f5ba901313f950db2b4d8b340">dmxConfigGetXkbOptions()</a>, <a class="el" href="dmxconfig_8h.html#a144614ca8f250e559b030eef79189aac">dmxConfigGetXkbRules()</a>, <a class="el" href="dmxconfig_8h.html#a3206dcb48297854a1d47e8aaa88d647e">dmxConfigGetXkbVariant()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00224">dmxKbdCtrl()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxmotion_8c_source.html#l00053">dmxPointerGetMotionBufferSize()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, <a class="el" href="dmxsigio_8c_source.html#l00227">dmxSigioUnregister()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00088">_DMXLocalInitInfo::freemap</a>, <a class="el" href="dmxcommon_8h_source.html#l00080">GETDMXINPUTFROMPDEVICE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00121">_DMXLocalInitInfo::intFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00117">_DMXLocalInitInfo::ledFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00102">_DMXLocalInitInfo::numAbsAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00111">_DMXLocalInitInfo::proximityClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, <a class="el" href="dmxinputinit_8h_source.html#l00123">_DMXLocalInitInfo::strFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00090">_DMXLocalInitInfo::xkb</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2ee085307a1dba7b07fa2eb34639815c"></a><!-- doxytag: member="dmxinputinit.c::dmxInputAttachBackend" ref="a2ee085307a1dba7b07fa2eb34639815c" args="(int physicalScreen, int isCore, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxInputAttachBackend </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>physicalScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>isCore</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Search for input associated with <em>deviceId</em>, and detach.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a41" doxytag="dmxinputinit.c::dmxInputFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3f9807875f237589d57ab9f006735af"></a><!-- doxytag: member="dmxinputinit.c::dmxInputAttachConsole" ref="ac3f9807875f237589d57ab9f006735af" args="(const char *name, int isCore, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxInputAttachConsole </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>isCore</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00088">_DMXInputInfo::freename</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a15cdf4e2066f64c2d9bd51906d6ca9a2"></a><!-- doxytag: member="dmxinputinit.c::dmxInputAttachNew" ref="a15cdf4e2066f64c2d9bd51906d6ca9a2" args="(DMXInputInfo *dmxInput, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxInputAttachNew </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free all of the memory associated with <em>dmxInput</em>     </td>
-  </tr>
-</table>
-<a class="anchor" name="a39" doxytag="dmxinputinit.c::dmxInputInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a328d0a700148af94b3dccf354b313c84"></a><!-- doxytag: member="dmxinputinit.c::dmxInputAttachOld" ref="a328d0a700148af94b3dccf354b313c84" args="(DMXInputInfo *dmxInput, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxInputAttachOld </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a816d1052ef5a587ef8e16b0005b06662"></a><!-- doxytag: member="dmxinputinit.c::dmxInputCopyLocal" ref="a816d1052ef5a587ef8e16b0005b06662" args="(DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxInputCopyLocal </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>s</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize all of the devices described in <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a38" doxytag="dmxinputinit.c::dmxInputLateReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Copy the local input information from <em>s</em> into a new <em>devs</em> slot in <em>dmxInput</em>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00236">_DMXLocalInputInfo::inputIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00255">_DMXLocalInputInfo::savedSendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac4d026f31f7b32bd571bdcf9e091c419"></a><!-- doxytag: member="dmxinputinit.c::dmxInputDetach" ref="ac4d026f31f7b32bd571bdcf9e091c419" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputLateReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxInputDetach </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Detach an input </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="adec246343ae8402c7cc47b19020c7ef7"></a><!-- doxytag: member="dmxinputinit.c::dmxInputDetachAll" ref="adec246343ae8402c7cc47b19020c7ef7" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInputDetachAll </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialize all the devices described in <em>dmxInput</em>. Called from #dmxReconfig after the cursor is redisplayed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a42" doxytag="dmxinputinit.c::dmxInputLogDevices" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Search for input associated with <em>dmxScreen</em>, and detach. </p>
+
+<p>References <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad7a3f09eeaf98373c261119fba907c47"></a><!-- doxytag: member="dmxinputinit.c::dmxInputDetachId" ref="ad7a3f09eeaf98373c261119fba907c47" args="(int id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputLogDevices </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxInputDetachId </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Search for input associated with <em>deviceId</em>, and detach. </p>
 
+<p>References <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00270">dmxRemoveInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad705be7fbe7dfaf3119a8892e5c54aaa"></a><!-- doxytag: member="dmxinputinit.c::dmxInputExtensionErrorHandler" ref="ad705be7fbe7dfaf3119a8892e5c54aaa" args="(Display *dsp, char *name, char *reason)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxInputExtensionErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dsp</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>reason</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log information about all of the known devices using <a class="el" href="dmxlog_8c.html#a7">dmxLog()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a37" doxytag="dmxinputinit.c::dmxInputReInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afa044735ab6fae7c75c82243a5159611"></a><!-- doxytag: member="dmxinputinit.c::dmxInputFree" ref="afa044735ab6fae7c75c82243a5159611" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputReInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInputFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free all of the memory associated with <em>dmxInput</em> </p>
 
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinput_8h_source.html#l00088">_DMXInputInfo::freename</a>, <a class="el" href="dmxinput_8h_source.html#l00129">_DMXInputInfo::geometry</a>, <a class="el" href="dmxinput_8h_source.html#l00127">_DMXInputInfo::keycodes</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinput_8h_source.html#l00128">_DMXInputInfo::symbols</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa124c7cd547a9993834becc6e4aebe63"></a><!-- doxytag: member="dmxinputinit.c::dmxInputFreeLocal" ref="aa124c7cd547a9993834becc6e4aebe63" args="(DMXLocalInputInfoRec *local)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxInputFreeLocal </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> *&nbsp;</td>
+          <td class="paramname"> <em>local</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Re-initialize all the devices described in <em>dmxInput</em>. Called from #dmxReconfig before the cursor is redisplayed.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxinputinit.c::dmxKeyboardBellProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00195">_DMXLocalInputInfo::destroy_private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00264">_DMXLocalInputInfo::deviceName</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8h_source.html#l00245">_DMXLocalInputInfo::history</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00246">_DMXLocalInputInfo::valuators</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5845f0dbf305a8a233d3747489745faa"></a><!-- doxytag: member="dmxinputinit.c::dmxInputInit" ref="a5845f0dbf305a8a233d3747489745faa" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxKeyboardBellProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="memname">void dmxInputInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize all of the devices described in <em>dmxInput</em>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00095">_DMXInputInfo::console</a>, <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxarg_8c_source.html#l00099">dmxArgC()</a>, <a class="el" href="dmxarg_8c_source.html#l00071">dmxArgFree()</a>, <a class="el" href="dmxarg_8c_source.html#l00106">dmxArgParse()</a>, <a class="el" href="dmxarg_8c_source.html#l00092">dmxArgV()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00613">dmxBlockHandler()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinput_8h_source.html#l00129">_DMXInputInfo::geometry</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00127">_DMXInputInfo::keycodes</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxinput_8h_source.html#l00102">_DMXInputInfo::processInputEvents</a>, <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00128">_DMXInputInfo::symbols</a>, <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>, <a class="el" href="dmxinput_8h_source.html#l00103">_DMXInputInfo::updateWindowInfo</a>, and <a class="el" href="dmxinput_8h_source.html#l00099">_DMXInputInfo::windows</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, and <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d1185c140ba54b24312ff6c98105c15"></a><!-- doxytag: member="dmxinputinit.c::dmxInputLateReInit" ref="a9d1185c140ba54b24312ff6c98105c15" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxInputLateReInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Re-initialize all the devices described in <em>dmxInput</em>. Called from <a class="el" href="dmxextension_8c.html#a2bf59b5de92ff76381543139f7b2c8fa">dmxAdjustCursorBoundaries</a> after the cursor is redisplayed. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00202">_DMXLocalInputInfo::latereinit</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0bcd445301dd91f20c9eb0b6dce0b42"></a><!-- doxytag: member="dmxinputinit.c::dmxInputLocateId" ref="ae0bcd445301dd91f20c9eb0b6dce0b42" args="(int id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* dmxInputLocateId </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01209">dmxInputDetachId()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac5bfc30ece32ae2af838c9e45857dc36"></a><!-- doxytag: member="dmxinputinit.c::dmxInputLogDevices" ref="ac5bfc30ece32ae2af838c9e45857dc36" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxInputLogDevices </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Log information about all of the known devices using <a class="el" href="dmxlog_8c.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog()</a>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinputinit_8h_source.html#l00264">_DMXLocalInputInfo::deviceName</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxextension_8c_source.html#l00172">dmxGetInputCount()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00170">dmxLogCont()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac8f3465a13cae73a3d657526643ef7b7"></a><!-- doxytag: member="dmxinputinit.c::dmxInputReInit" ref="ac8f3465a13cae73a3d657526643ef7b7" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxInputReInit </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em>, </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Re-initialize all the devices described in <em>dmxInput</em>. Called from <a class="el" href="dmxextension_8c.html#a2bf59b5de92ff76381543139f7b2c8fa">dmxAdjustCursorBoundaries</a> before the cursor is redisplayed. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00199">_DMXLocalInputInfo::reinit</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab57781b7672c11bee1430a47d5118e9e"></a><!-- doxytag: member="dmxinputinit.c::dmxInputScanForExtensions" ref="ab57781b7672c11bee1430a47d5118e9e" args="(DMXInputInfo *dmxInput, int doXI)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxInputScanForExtensions </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>doXI</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>unknown</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinputinit_8h_source.html#l00264">_DMXLocalInputInfo::deviceName</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00830">dmxInputExtensionErrorHandler()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4538a00d09ac3cd10b81598b39340da3"></a><!-- doxytag: member="dmxinputinit.c::dmxKbdCtrl" ref="a4538a00d09ac3cd10b81598b39340da3" args="(DeviceIntPtr pDevice, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxKbdCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab127903bdb6bf262e51f128b4cec4960"></a><!-- doxytag: member="dmxinputinit.c::dmxKeyboardBellProc" ref="ab127903bdb6bf262e51f128b4cec4960" args="(int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxKeyboardBellProc </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>unknown</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxinputinit.c::dmxKeyboardKbdCtrlProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00332">_dmxKeyboardBellProc()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aef5e79cc27e75fdc3fdfb3e45c64dc9a"></a><!-- doxytag: member="dmxinputinit.c::dmxKeyboardFreeNames" ref="aef5e79cc27e75fdc3fdfb3e45c64dc9a" args="(XkbComponentNamesPtr names)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxKeyboardFreeNames </td>
+          <td>(</td>
+          <td class="paramtype">XkbComponentNamesPtr&nbsp;</td>
+          <td class="paramname"> <em>names</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad23e145891ad0fb1c909d85ca8e4fe19"></a><!-- doxytag: member="dmxinputinit.c::dmxKeyboardKbdCtrlProc" ref="ad23e145891ad0fb1c909d85ca8e4fe19" args="(DeviceIntPtr pDevice, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxKeyboardKbdCtrlProc </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxKeyboardKbdCtrlProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Change the keyboard control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the keyboard devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00294">_dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2969aeffcc1a403f00be11a8d06b3926"></a><!-- doxytag: member="dmxinputinit.c::dmxKeyboardOn" ref="a2969aeffcc1a403f00be11a8d06b3926" args="(DeviceIntPtr pDevice, DMXLocalInitInfo *info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxKeyboardOn </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxconfig_8h.html#a5d7b9c934bac97af375cfc1425e4d71c">dmxConfigGetXkbLayout()</a>, <a class="el" href="dmxconfig_8h.html#a9789c9f2428105bd9e896ddd25ea9a76">dmxConfigGetXkbModel()</a>, <a class="el" href="dmxconfig_8h.html#ae5986f5f5ba901313f950db2b4d8b340">dmxConfigGetXkbOptions()</a>, <a class="el" href="dmxconfig_8h.html#a144614ca8f250e559b030eef79189aac">dmxConfigGetXkbRules()</a>, <a class="el" href="dmxconfig_8h.html#a3206dcb48297854a1d47e8aaa88d647e">dmxConfigGetXkbVariant()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00362">dmxKeyboardFreeNames()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8c_source.html#l00231">dmxLogInputCont()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00093">_DMXLocalInitInfo::force</a>, <a class="el" href="dmxinputinit_8h_source.html#l00092">_DMXLocalInitInfo::freenames</a>, <a class="el" href="dmxcommon_8h_source.html#l00080">GETDMXINPUTFROMPDEVICE</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00091">_DMXLocalInitInfo::names</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aa1d3565232f8ab962246c825bb565bd6"></a><!-- doxytag: member="dmxinputinit.c::dmxLookupLocal" ref="aa1d3565232f8ab962246c825bb565bd6" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLookupLocal </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the keyboard control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00183">_DMXLocalInputInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac312d24e4289c3b39964428a6e39a219"></a><!-- doxytag: member="dmxinputinit.c::dmxMakeUniqueDeviceName" ref="ac312d24e4289c3b39964428a6e39a219" args="(DMXLocalInputInfoPtr dmxLocal)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static char* dmxMakeUniqueDeviceName </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxinputinit_8c.html#a05b49c662c073f89e86804f7856622a0">LEN</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac4ea57a3ba798705d63254cdbbefb63d"></a><!-- doxytag: member="dmxinputinit.c::dmxPopulateLocal" ref="ac4ea57a3ba798705d63254cdbbefb63d" args="(DMXInputInfo *dmxInput, dmxArg a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxPopulateLocal </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__dmxArg.html">dmxArg</a>&nbsp;</td>
+          <td class="paramname"> <em>a</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00063">DMX_LOCAL_KEYBOARD</a>, <a class="el" href="dmxinputinit_8h_source.html#l00064">DMX_LOCAL_MOUSE</a>, <a class="el" href="dmxarg_8c_source.html#l00099">dmxArgC()</a>, <a class="el" href="dmxarg_8c_source.html#l00092">dmxArgV()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00765">dmxLookupLocal()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinputinit_8h_source.html#l00183">_DMXLocalInputInfo::name</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00184">_DMXLocalInputInfo::type</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5f2e0a323aa9ea0dc0a0d1f5195c5e26"></a><!-- doxytag: member="dmxinputinit.c::dmxProcessInputEvents" ref="a5f2e0a323aa9ea0dc0a0d1f5195c5e26" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxProcessInputEvents </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00219">_DMXLocalInputInfo::process_input</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a72e77569074807987e358e4eda38c044"></a><!-- doxytag: member="dmxinputinit.c::dmxSwitchReturn" ref="a72e77569074807987e358e4eda38c044" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSwitchReturn </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00213">_DMXLocalInputInfo::vt_post_switch</a>, and <a class="el" href="dmxinput_8h_source.html#l00116">_DMXInputInfo::vt_switched</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab8d8ef4b4e4f8e022a1452765e1f1e12"></a><!-- doxytag: member="dmxinputinit.c::dmxUpdateWindowInformation" ref="ab8d8ef4b4e4f8e022a1452765e1f1e12" args="(DMXInputInfo *dmxInput, DMXUpdateType type, WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxUpdateWindowInformation </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00186">_DMXLocalInputInfo::binding</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00060">DMX_UPDATE_COPY</a>, <a class="el" href="dmxinput_8h_source.html#l00057">DMX_UPDATE_REALIZE</a>, <a class="el" href="dmxinput_8h_source.html#l00062">DMX_UPDATE_REPARENT</a>, <a class="el" href="dmxinput_8h_source.html#l00061">DMX_UPDATE_RESIZE</a>, <a class="el" href="dmxinput_8h_source.html#l00059">DMX_UPDATE_RESTACK</a>, <a class="el" href="dmxinput_8h_source.html#l00058">DMX_UPDATE_UNREALIZE</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00222">_DMXLocalInputInfo::update_info</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a812e98c3ae4436f403739fc6f58eda6c"></a><!-- doxytag: member="dmxinputinit.c::dmxWakeupHandler" ref="a812e98c3ae4436f403739fc6f58eda6c" args="(pointer blockData, int result, pointer pReadMask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxWakeupHandler </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>blockData</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>result</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pReadMask</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00229">_DMXLocalInputInfo::private</a>, <a class="el" href="dmxinputinit_8h_source.html#l00212">_DMXLocalInputInfo::vt_pre_switch</a>, <a class="el" href="dmxinputinit_8h_source.html#l00214">_DMXLocalInputInfo::vt_switch</a>, <a class="el" href="dmxinput_8h_source.html#l00113">_DMXInputInfo::vt_switch_pending</a>, and <a class="el" href="dmxinput_8h_source.html#l00116">_DMXInputInfo::vt_switched</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a4ad947489cdc8cae1835dbd5604e0cde"></a><!-- doxytag: member="dmxinputinit.c::DMXBackendKbd" ref="a4ad947489cdc8cae1835dbd5604e0cde" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a4ad947489cdc8cae1835dbd5604e0cde">DMXBackendKbd</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;backend-kbd&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">DMX_LOCAL_KEYBOARD</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">DMX_LOCAL_TYPE_BACKEND</a>,
+    1, 
+    <a class="code" href="dmxcommon_8c.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a>, NULL,
+    <a class="code" href="dmxbackend_8c.html#a941213c5a98d26e0f30391ee312e1436">dmxBackendInit</a>, NULL, NULL, <a class="code" href="dmxbackend_8c.html#a1c628b807f62aeeeb2093ad63941eff1">dmxBackendKbdGetInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a60cd36c3430ead2858986fe5f93165c1">dmxCommonKbdOn</a>, <a class="code" href="dmxcommon_8c.html#a9ddcdd8a91205b9b0e23022f246190a0">dmxCommonKbdOff</a>, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, <a class="code" href="dmxcommon_8c.html#a399f0ec4a6e5d0bcd3d07f24b2a6ac9e">dmxCommonKbdCtrl</a>, <a class="code" href="dmxcommon_8c.html#aa069076ebf89f8b89668cffafb731cfe">dmxCommonKbdBell</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a420b4847b9c9f9992e042754c9a5d9c9"></a><!-- doxytag: member="dmxinputinit.c::DMXBackendMou" ref="a420b4847b9c9f9992e042754c9a5d9c9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a420b4847b9c9f9992e042754c9a5d9c9">DMXBackendMou</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;backend-mou&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">DMX_LOCAL_MOUSE</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">DMX_LOCAL_TYPE_BACKEND</a>, 2,
+    <a class="code" href="dmxbackend_8c.html#a2a875125c1316c123e45c7e7a9251c2e">dmxBackendCreatePrivate</a>, <a class="code" href="dmxbackend_8c.html#acd47377dd517a5494edae5920e3ae946">dmxBackendDestroyPrivate</a>,
+    <a class="code" href="dmxbackend_8c.html#a941213c5a98d26e0f30391ee312e1436">dmxBackendInit</a>, NULL, <a class="code" href="dmxbackend_8c.html#a6027901ceb2a93e4fea5acf9b8cb0059">dmxBackendLateReInit</a>, <a class="code" href="dmxbackend_8c.html#a1afb0902ffb9019c943b0c4db6315209">dmxBackendMouGetInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a8ba0ee4f9f09bc9089d480d1f5467cd8">dmxCommonMouOn</a>, <a class="code" href="dmxcommon_8c.html#acfeaccbc1f2f5be028b3ee8c0f31da89">dmxCommonMouOff</a>, <a class="code" href="dmxbackend_8c.html#a486d684411f79c459a1195e5c02f404c">dmxBackendUpdatePosition</a>,
+    NULL, NULL, NULL,
+    <a class="code" href="dmxbackend_8c.html#a6e9b6f0743636b93aeb6ae71a3517abf">dmxBackendCollectEvents</a>, <a class="code" href="dmxbackend_8c.html#a4ee65e2f1b86616b7898c273d78a5853">dmxBackendProcessInput</a>, <a class="code" href="dmxbackend_8c.html#a0c9ccf0733bd3a4615815fc404e30a9c">dmxBackendFunctions</a>, NULL,
+    <a class="code" href="dmxcommon_8c.html#a11aa027975061ee6f3e684ee66f0f18c">dmxCommonMouCtrl</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a42322c044220c5f39e1fd37b23cc037b"></a><!-- doxytag: member="dmxinputinit.c::DMXCommonOth" ref="a42322c044220c5f39e1fd37b23cc037b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a42322c044220c5f39e1fd37b23cc037b">DMXCommonOth</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;common-oth&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e">DMX_LOCAL_OTHER</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee">DMX_LOCAL_TYPE_COMMON</a>, 1,
+    <a class="code" href="dmxcommon_8c.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a>, NULL,
+    NULL, NULL, NULL, <a class="code" href="dmxcommon_8c.html#a67f944a345e0ba88ac996056914d191c">dmxCommonOthGetInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a4b8e72433e206d48e6fb471e933800ad">dmxCommonOthOn</a>, <a class="code" href="dmxcommon_8c.html#a45f87ba7a0b02587dd2d1b4cdd3480c6">dmxCommonOthOff</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a3c213f84d74e74751787f916f509581f"></a><!-- doxytag: member="dmxinputinit.c::DMXConsoleKbd" ref="a3c213f84d74e74751787f916f509581f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a3c213f84d74e74751787f916f509581f">DMXConsoleKbd</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;console-kbd&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">DMX_LOCAL_KEYBOARD</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">DMX_LOCAL_TYPE_CONSOLE</a>,
+    1, 
+    <a class="code" href="dmxcommon_8c.html#a0e7301a2783357ff391172acab00d48a">dmxCommonCopyPrivate</a>, NULL,
+    <a class="code" href="dmxconsole_8c.html#afdd1f3231a4059e6c13d81cb5b472ab6">dmxConsoleInit</a>, <a class="code" href="dmxconsole_8c.html#a35bfb53c46a7a14282d0110aa603dd4a">dmxConsoleReInit</a>, NULL, <a class="code" href="dmxconsole_8c.html#a710d0bdd587deeb35b430ba48ac209f1">dmxConsoleKbdGetInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a60cd36c3430ead2858986fe5f93165c1">dmxCommonKbdOn</a>, <a class="code" href="dmxcommon_8c.html#a9ddcdd8a91205b9b0e23022f246190a0">dmxCommonKbdOff</a>, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, <a class="code" href="dmxcommon_8c.html#a399f0ec4a6e5d0bcd3d07f24b2a6ac9e">dmxCommonKbdCtrl</a>, <a class="code" href="dmxcommon_8c.html#aa069076ebf89f8b89668cffafb731cfe">dmxCommonKbdBell</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a3a58ba39e104b23698ca8ef19789caf3"></a><!-- doxytag: member="dmxinputinit.c::DMXConsoleMou" ref="a3a58ba39e104b23698ca8ef19789caf3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a3a58ba39e104b23698ca8ef19789caf3">DMXConsoleMou</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;console-mou&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">DMX_LOCAL_MOUSE</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">DMX_LOCAL_TYPE_CONSOLE</a>, 2,
+    <a class="code" href="dmxconsole_8c.html#a44f5875f978cc85c2190eacef51debac">dmxConsoleCreatePrivate</a>, <a class="code" href="dmxconsole_8c.html#ab189a2fd44ccd2e6936b6bb1a27f1d5b">dmxConsoleDestroyPrivate</a>,
+    <a class="code" href="dmxconsole_8c.html#afdd1f3231a4059e6c13d81cb5b472ab6">dmxConsoleInit</a>, <a class="code" href="dmxconsole_8c.html#a35bfb53c46a7a14282d0110aa603dd4a">dmxConsoleReInit</a>, NULL, <a class="code" href="dmxconsole_8c.html#a3d639d0e2a2c3c520f3544f15910ab01">dmxConsoleMouGetInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a8ba0ee4f9f09bc9089d480d1f5467cd8">dmxCommonMouOn</a>, <a class="code" href="dmxcommon_8c.html#acfeaccbc1f2f5be028b3ee8c0f31da89">dmxCommonMouOff</a>, <a class="code" href="dmxconsole_8c.html#a596b1bd2ef51d5542393215ad810b227">dmxConsoleUpdatePosition</a>,
+    NULL, NULL, NULL,
+    <a class="code" href="dmxconsole_8c.html#a9c2ec3c63c36955d2458283dbd62b605">dmxConsoleCollectEvents</a>, NULL, <a class="code" href="dmxconsole_8c.html#a613139541bddab357c413b76238e489b">dmxConsoleFunctions</a>, <a class="code" href="dmxconsole_8c.html#a180def32863f7bdddf3637181661c505">dmxConsoleUpdateInfo</a>,
+    <a class="code" href="dmxcommon_8c.html#a11aa027975061ee6f3e684ee66f0f18c">dmxCommonMouCtrl</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="af0b33ec9267eea9d58f6792e33e02295"></a><!-- doxytag: member="dmxinputinit.c::DMXDummyKbd" ref="af0b33ec9267eea9d58f6792e33e02295" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#af0b33ec9267eea9d58f6792e33e02295">DMXDummyKbd</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;dummy-kbd&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">DMX_LOCAL_KEYBOARD</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">DMX_LOCAL_TYPE_LOCAL</a>, 1,
+    NULL, NULL, NULL, NULL, NULL, <a class="code" href="dmxdummy_8c.html#a31bf72cac5b5327393423d49a437fc8b">dmxDummyKbdGetInfo</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a3041e526ae9e56b4a2d0a99f030af71f"></a><!-- doxytag: member="dmxinputinit.c::DMXDummyMou" ref="a3041e526ae9e56b4a2d0a99f030af71f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a3041e526ae9e56b4a2d0a99f030af71f">DMXDummyMou</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Initial value:</b><div class="fragment"><pre class="fragment"> {
+    <span class="stringliteral">&quot;dummy-mou&quot;</span>, <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">DMX_LOCAL_MOUSE</a>, <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">DMX_LOCAL_TYPE_LOCAL</a>, 1,
+    NULL, NULL, NULL, NULL, NULL, <a class="code" href="dmxdummy_8c.html#a0d9cc243adf2eb5869b9ebcca9125bf4">dmxDummyMouGetInfo</a>
+}
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="afbf8cd02f52e073392a645f6ef0bcf78"></a><!-- doxytag: member="dmxinputinit.c::dmxLocalCoreKeyboard" ref="afbf8cd02f52e073392a645f6ef0bcf78" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="el" href="dmxinputinit_8h.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxLocalCoreKeyboard</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, and <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab34ec11967377e32bc0817fb3a8b939e"></a><!-- doxytag: member="dmxinputinit.c::dmxLocalCorePointer" ref="ab34ec11967377e32bc0817fb3a8b939e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="el" href="dmxinputinit_8h.html#ab34ec11967377e32bc0817fb3a8b939e">dmxLocalCorePointer</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00056">ChangeKeyboardDevice()</a>, and <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a74cb9ef11048e61ab91acd98613210b8"></a><!-- doxytag: member="dmxinputinit.c::DMXLocalDevices" ref="a74cb9ef11048e61ab91acd98613210b8" args="[]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a> <a class="el" href="dmxinputinit_8c.html#a74cb9ef11048e61ab91acd98613210b8">DMXLocalDevices</a>[]<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html
deleted file mode 100644
index 9899c67a0..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h-source.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinputinit.h</h1><a href="dmxinputinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXINPUTINIT_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXINPUTINIT_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "<a class="code" href="dmx_8h.html">dmx.h</a>"</span>
-00042 <span class="preprocessor">#include "<a class="code" href="dmxinput_8h.html">dmxinput.h</a>"</span>
-00043 <span class="preprocessor">#include "<a class="code" href="dmxlog_8h.html">dmxlog.h</a>"</span>
-00044 
-00045 
-00046 <span class="preprocessor">#define DMX_LOCAL_DEFAULT_KEYBOARD "kbd"</span>
-00047 <span class="preprocessor"></span><span class="preprocessor">#define DMX_LOCAL_DEFAULT_POINTER  "ps2"</span>
-00048 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_BUTTONS            256</span>
-00049 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MOTION_SIZE            256</span>
-00050 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_VALUATORS          32</span>
-00051 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_AXES               32</span>
-00052 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_XINPUT_EVENT_TYPES 100</span>
-00053 <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAP_ENTRIES            16 </span><span class="comment">/* Must be a power of 2 */</span>
-00054 <span class="preprocessor">#define DMX_MAP_MASK               (DMX_MAP_ENTRIES - 1)</span>
-00055 <span class="preprocessor"></span>
-00056 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00057     DMX_FUNCTION_GRAB,
-00058     DMX_FUNCTION_TERMINATE,
-00059     DMX_FUNCTION_FINE
-00060 } DMXFunctionType;
-00061 
-00062 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00063     DMX_LOCAL_HIGHLEVEL,
-00064     DMX_LOCAL_KEYBOARD,
-00065     DMX_LOCAL_MOUSE,
-00066     DMX_LOCAL_OTHER
-00067 } DMXLocalInputType;
-00068 
-00069 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00070     DMX_LOCAL_TYPE_LOCAL,
-00071     DMX_LOCAL_TYPE_CONSOLE,
-00072     DMX_LOCAL_TYPE_BACKEND,
-00073     DMX_LOCAL_TYPE_COMMON
-00074 } DMXLocalInputExtType;
-00075 
-00076 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00077     DMX_RELATIVE,
-00078     DMX_ABSOLUTE,
-00079     DMX_ABSOLUTE_CONFINED
-00080 } DMXMotionType;
-00081 
-<a name="l00084"></a><a class="code" href="struct__DMXLocalInitInfo.html">00084</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> {
-<a name="l00085"></a><a class="code" href="struct__DMXLocalInitInfo.html#o0">00085</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o0">keyboard</a>; 
-<a name="l00087"></a><a class="code" href="struct__DMXLocalInitInfo.html#o1">00087</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o1">keyClass</a>; 
-<a name="l00088"></a><a class="code" href="struct__DMXLocalInitInfo.html#o2">00088</a>     KeySymsRec           <a class="code" href="struct__DMXLocalInitInfo.html#o2">keySyms</a>;  
-<a name="l00089"></a><a class="code" href="struct__DMXLocalInitInfo.html#o3">00089</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o3">freemap</a>;  
-<a name="l00090"></a><a class="code" href="struct__DMXLocalInitInfo.html#o4">00090</a>     CARD8                <a class="code" href="struct__DMXLocalInitInfo.html#o4">modMap</a>[MAP_LENGTH]; 
-00091 <span class="preprocessor">#ifdef XKB</span>
-<a name="l00092"></a><a class="code" href="struct__DMXLocalInitInfo.html#o5">00092</a> <span class="preprocessor"></span>    XkbDescPtr           <a class="code" href="struct__DMXLocalInitInfo.html#o5">xkb</a>;       
-<a name="l00093"></a><a class="code" href="struct__DMXLocalInitInfo.html#o6">00093</a>     XkbComponentNamesRec <a class="code" href="struct__DMXLocalInitInfo.html#o6">names</a>;     
-<a name="l00094"></a><a class="code" href="struct__DMXLocalInitInfo.html#o7">00094</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o7">freenames</a>; 
-<a name="l00095"></a><a class="code" href="struct__DMXLocalInitInfo.html#o8">00095</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o8">force</a>;     
-00096 <span class="preprocessor">#endif</span>
-00097 <span class="preprocessor"></span>
-<a name="l00098"></a><a class="code" href="struct__DMXLocalInitInfo.html#o9">00098</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o9">buttonClass</a>; 
-<a name="l00099"></a><a class="code" href="struct__DMXLocalInitInfo.html#o10">00099</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o10">numButtons</a>;  
-<a name="l00100"></a><a class="code" href="struct__DMXLocalInitInfo.html#o11">00100</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>        <a class="code" href="struct__DMXLocalInitInfo.html#o11">map</a>[DMX_MAX_BUTTONS]; 
-<a name="l00102"></a><a class="code" href="struct__DMXLocalInitInfo.html#o12">00102</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o12">valuatorClass</a>; 
-<a name="l00104"></a><a class="code" href="struct__DMXLocalInitInfo.html#o13">00104</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o13">numRelAxes</a>;    
-<a name="l00105"></a><a class="code" href="struct__DMXLocalInitInfo.html#o14">00105</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o14">numAbsAxes</a>;    
-<a name="l00106"></a><a class="code" href="struct__DMXLocalInitInfo.html#o15">00106</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o15">minval</a>[DMX_MAX_AXES]; 
-<a name="l00107"></a><a class="code" href="struct__DMXLocalInitInfo.html#o16">00107</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o16">maxval</a>[DMX_MAX_AXES]; 
-<a name="l00108"></a><a class="code" href="struct__DMXLocalInitInfo.html#o17">00108</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o17">res</a>[DMX_MAX_AXES];    
-<a name="l00109"></a><a class="code" href="struct__DMXLocalInitInfo.html#o18">00109</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o18">minres</a>[DMX_MAX_AXES]; 
-<a name="l00110"></a><a class="code" href="struct__DMXLocalInitInfo.html#o19">00110</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o19">maxres</a>[DMX_MAX_AXES]; 
-<a name="l00112"></a><a class="code" href="struct__DMXLocalInitInfo.html#o20">00112</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o20">focusClass</a>;       
-<a name="l00114"></a><a class="code" href="struct__DMXLocalInitInfo.html#o21">00114</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o21">proximityClass</a>;   
-<a name="l00116"></a><a class="code" href="struct__DMXLocalInitInfo.html#o22">00116</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o22">kbdFeedbackClass</a>; 
-<a name="l00118"></a><a class="code" href="struct__DMXLocalInitInfo.html#o23">00118</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o23">ptrFeedbackClass</a>; 
-<a name="l00120"></a><a class="code" href="struct__DMXLocalInitInfo.html#o24">00120</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o24">ledFeedbackClass</a>; 
-<a name="l00122"></a><a class="code" href="struct__DMXLocalInitInfo.html#o25">00122</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o25">belFeedbackClass</a>; 
-<a name="l00124"></a><a class="code" href="struct__DMXLocalInitInfo.html#o26">00124</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o26">intFeedbackClass</a>; 
-<a name="l00126"></a><a class="code" href="struct__DMXLocalInitInfo.html#o27">00126</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o27">strFeedbackClass</a>; 
-<a name="l00129"></a><a class="code" href="struct__DMXLocalInitInfo.html#o28">00129</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o28">maxSymbols</a>;          
-<a name="l00130"></a><a class="code" href="struct__DMXLocalInitInfo.html#o29">00130</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#o29">maxSymbolsSupported</a>; 
-<a name="l00131"></a><a class="code" href="struct__DMXLocalInitInfo.html#o30">00131</a>     KeySym               *<a class="code" href="struct__DMXLocalInitInfo.html#o30">symbols</a>;            
-00132 } <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a>, *<a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>;
-00133 
-00134 <span class="keyword">typedef</span> pointer (*dmxCreatePrivateProcPtr)(DeviceIntPtr);
-00135 <span class="keyword">typedef</span> void    (*dmxDestroyPrivateProcPtr)(pointer);
-00136                 
-00137 <span class="keyword">typedef</span> void    (*dmxInitProcPtr)(DevicePtr);
-00138 <span class="keyword">typedef</span> void    (*dmxReInitProcPtr)(DevicePtr);
-00139 <span class="keyword">typedef</span> void    (*dmxLateReInitProcPtr)(DevicePtr);
-00140 <span class="keyword">typedef</span> void    (*dmxGetInfoProcPtr)(DevicePtr, <a class="code" href="dmxinputinit_8h.html#a10">DMXLocalInitInfoPtr</a>);
-00141 <span class="keyword">typedef</span> int     (*dmxOnProcPtr)(DevicePtr);
-00142 <span class="keyword">typedef</span> void    (*dmxOffProcPtr)(DevicePtr);
-00143 <span class="keyword">typedef</span> void    (*dmxUpdatePositionProcPtr)(pointer, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00144                 
-00145 <span class="keyword">typedef</span> void    (*dmxVTPreSwitchProcPtr)(pointer);  <span class="comment">/* Turn I/O Off */</span>
-00146 <span class="keyword">typedef</span> void    (*dmxVTPostSwitchProcPtr)(pointer); <span class="comment">/* Turn I/O On */</span>
-00147 <span class="keyword">typedef</span> void    (*dmxVTSwitchReturnProcPtr)(pointer);
-00148 <span class="keyword">typedef</span> int     (*dmxVTSwitchProcPtr)(pointer, <span class="keywordtype">int</span> vt,
-00149                                       dmxVTSwitchReturnProcPtr, pointer);
-00150                 
-00151 <span class="keyword">typedef</span> void    (*dmxMotionProcPtr)(DevicePtr,
-00152                                     <span class="keywordtype">int</span> *valuators,
-00153                                     <span class="keywordtype">int</span> firstAxis,
-00154                                     <span class="keywordtype">int</span> axesCount,
-00155                                     DMXMotionType type,
-00156                                     DMXBlockType block);
-00157 <span class="keyword">typedef</span> void    (*dmxEnqueueProcPtr)(DevicePtr, <span class="keywordtype">int</span> type, <span class="keywordtype">int</span> detail,
-00158                                      KeySym keySym, XEvent *e,
-00159                                      DMXBlockType block);
-00160 <span class="keyword">typedef</span> int     (*dmxCheckSpecialProcPtr)(DevicePtr, KeySym keySym);
-00161 <span class="keyword">typedef</span> void    (*dmxCollectEventsProcPtr)(DevicePtr,
-00162                                            dmxMotionProcPtr,
-00163                                            dmxEnqueueProcPtr,
-00164                                            dmxCheckSpecialProcPtr,
-00165                                            DMXBlockType);
-00166 <span class="keyword">typedef</span> void    (*dmxProcessInputProcPtr)(pointer);
-00167 <span class="keyword">typedef</span> void    (*dmxUpdateInfoProcPtr)(pointer, <a class="code" href="dmxinput_8h.html#a30">DMXUpdateType</a>, WindowPtr);
-00168 <span class="keyword">typedef</span> int     (*dmxFunctionsProcPtr)(pointer, DMXFunctionType);
-00169                 
-00170 <span class="keyword">typedef</span> void    (*dmxKBCtrlProcPtr)(DevicePtr, KeybdCtrl *ctrl);
-00171 <span class="keyword">typedef</span> void    (*dmxMCtrlProcPtr)(DevicePtr, PtrCtrl *ctrl);
-00172 <span class="keyword">typedef</span> void    (*dmxKBBellProcPtr)(DevicePtr, <span class="keywordtype">int</span> percent,
-00173                                     <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
-00174 
-<a name="l00177"></a><a class="code" href="struct__DMXEventMap.html">00177</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXEventMap.html">_DMXEventMap</a> {
-<a name="l00178"></a><a class="code" href="struct__DMXEventMap.html#o0">00178</a>     <span class="keywordtype">int</span> <a class="code" href="struct__DMXEventMap.html#o0">remote</a>;                 
-<a name="l00179"></a><a class="code" href="struct__DMXEventMap.html#o1">00179</a>     <span class="keywordtype">int</span> <a class="code" href="struct__DMXEventMap.html#o1">server</a>;                 
-00180 } <a class="code" href="struct__DMXEventMap.html">DMXEventMap</a>;
-00181 
-<a name="l00185"></a><a class="code" href="struct__DMXLocalInputInfo.html">00185</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> {
-<a name="l00186"></a><a class="code" href="struct__DMXLocalInputInfo.html#o0">00186</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXLocalInputInfo.html#o0">name</a>;   
-<a name="l00187"></a><a class="code" href="struct__DMXLocalInputInfo.html#o1">00187</a>     DMXLocalInputType        type;    
-<a name="l00188"></a><a class="code" href="struct__DMXLocalInputInfo.html#o2">00188</a>     DMXLocalInputExtType     <a class="code" href="struct__DMXLocalInputInfo.html#o2">extType</a>; 
-<a name="l00189"></a><a class="code" href="struct__DMXLocalInputInfo.html#o3">00189</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o3">binding</a>; 
-00193                                 <span class="comment">/* Low-level (e.g., keyboard/mouse drivers) */</span>
-00194 
-<a name="l00195"></a><a class="code" href="struct__DMXLocalInputInfo.html#o4">00195</a>     dmxCreatePrivateProcPtr  <a class="code" href="struct__DMXLocalInputInfo.html#o4">create_private</a>;  
-<a name="l00198"></a><a class="code" href="struct__DMXLocalInputInfo.html#o5">00198</a>     dmxDestroyPrivateProcPtr <a class="code" href="struct__DMXLocalInputInfo.html#o5">destroy_private</a>; 
-<a name="l00201"></a><a class="code" href="struct__DMXLocalInputInfo.html#o6">00201</a>     dmxInitProcPtr           <a class="code" href="struct__DMXLocalInputInfo.html#o6">init</a>;            
-<a name="l00202"></a><a class="code" href="struct__DMXLocalInputInfo.html#o7">00202</a>     dmxReInitProcPtr         <a class="code" href="struct__DMXLocalInputInfo.html#o7">reinit</a>;          
-<a name="l00205"></a><a class="code" href="struct__DMXLocalInputInfo.html#o8">00205</a>     dmxLateReInitProcPtr     <a class="code" href="struct__DMXLocalInputInfo.html#o8">latereinit</a>;      
-<a name="l00209"></a><a class="code" href="struct__DMXLocalInputInfo.html#o9">00209</a>     dmxGetInfoProcPtr        <a class="code" href="struct__DMXLocalInputInfo.html#o9">get_info</a>;        
-<a name="l00210"></a><a class="code" href="struct__DMXLocalInputInfo.html#o10">00210</a>     dmxOnProcPtr             <a class="code" href="struct__DMXLocalInputInfo.html#o10">on</a>;              
-<a name="l00211"></a><a class="code" href="struct__DMXLocalInputInfo.html#o11">00211</a>     dmxOffProcPtr            <a class="code" href="struct__DMXLocalInputInfo.html#o11">off</a>;             
-<a name="l00212"></a><a class="code" href="struct__DMXLocalInputInfo.html#o12">00212</a>     dmxUpdatePositionProcPtr <a class="code" href="struct__DMXLocalInputInfo.html#o12">update_position</a>; 
-<a name="l00215"></a><a class="code" href="struct__DMXLocalInputInfo.html#o13">00215</a>     dmxVTPreSwitchProcPtr    <a class="code" href="struct__DMXLocalInputInfo.html#o13">vt_pre_switch</a>;   
-<a name="l00216"></a><a class="code" href="struct__DMXLocalInputInfo.html#o14">00216</a>     dmxVTPostSwitchProcPtr   <a class="code" href="struct__DMXLocalInputInfo.html#o14">vt_post_switch</a>;  
-<a name="l00217"></a><a class="code" href="struct__DMXLocalInputInfo.html#o15">00217</a>     dmxVTSwitchProcPtr       <a class="code" href="struct__DMXLocalInputInfo.html#o15">vt_switch</a>;       
-<a name="l00219"></a><a class="code" href="struct__DMXLocalInputInfo.html#o16">00219</a>     dmxCollectEventsProcPtr  <a class="code" href="struct__DMXLocalInputInfo.html#o16">collect_events</a>;  
-<a name="l00222"></a><a class="code" href="struct__DMXLocalInputInfo.html#o17">00222</a>     dmxProcessInputProcPtr   <a class="code" href="struct__DMXLocalInputInfo.html#o17">process_input</a>;   
-00224     dmxFunctionsProcPtr      functions;
-<a name="l00225"></a><a class="code" href="struct__DMXLocalInputInfo.html#o19">00225</a>     dmxUpdateInfoProcPtr     <a class="code" href="struct__DMXLocalInputInfo.html#o19">update_info</a>;     
-<a name="l00228"></a><a class="code" href="struct__DMXLocalInputInfo.html#o20">00228</a>     dmxMCtrlProcPtr          <a class="code" href="struct__DMXLocalInputInfo.html#o20">mCtrl</a>;           
-<a name="l00229"></a><a class="code" href="struct__DMXLocalInputInfo.html#o21">00229</a>     dmxKBCtrlProcPtr         <a class="code" href="struct__DMXLocalInputInfo.html#o21">kCtrl</a>;           
-<a name="l00230"></a><a class="code" href="struct__DMXLocalInputInfo.html#o22">00230</a>     dmxKBBellProcPtr         <a class="code" href="struct__DMXLocalInputInfo.html#o22">kBell</a>;           
-<a name="l00232"></a><a class="code" href="struct__DMXLocalInputInfo.html#o23">00232</a>     pointer                  <span class="keyword">private</span>;         
-<a name="l00233"></a><a class="code" href="struct__DMXLocalInputInfo.html#o24">00233</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o24">isCore</a>;          
-<a name="l00234"></a><a class="code" href="struct__DMXLocalInputInfo.html#o25">00234</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o25">sendsCore</a>;       
-<a name="l00235"></a><a class="code" href="struct__DMXLocalInputInfo.html#o26">00235</a>     KeybdCtrl                <a class="code" href="struct__DMXLocalInputInfo.html#o26">kctrl</a>;           
-<a name="l00236"></a><a class="code" href="struct__DMXLocalInputInfo.html#o27">00236</a>     PtrCtrl                  <a class="code" href="struct__DMXLocalInputInfo.html#o27">mctrl</a>;           
-<a name="l00238"></a><a class="code" href="struct__DMXLocalInputInfo.html#o28">00238</a>     DeviceIntPtr             <a class="code" href="struct__DMXLocalInputInfo.html#o28">pDevice</a>;         
-<a name="l00239"></a><a class="code" href="struct__DMXLocalInputInfo.html#o29">00239</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o29">inputIdx</a>;        
-<a name="l00240"></a><a class="code" href="struct__DMXLocalInputInfo.html#o31">00240</a>     <span class="keywordtype">int</span>                      lastX, <a class="code" href="struct__DMXLocalInputInfo.html#o31">lastY</a>;    
-<a name="l00244"></a><a class="code" href="struct__DMXLocalInputInfo.html#o32">00244</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o32">head</a>;            
-<a name="l00246"></a><a class="code" href="struct__DMXLocalInputInfo.html#o33">00246</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o33">tail</a>;            
-<a name="l00248"></a><a class="code" href="struct__DMXLocalInputInfo.html#o34">00248</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>            *<a class="code" href="struct__DMXLocalInputInfo.html#o34">history</a>;        
-<a name="l00249"></a><a class="code" href="struct__DMXLocalInputInfo.html#o35">00249</a>     <span class="keywordtype">int</span>                      *valuators;      
-00251                                 <span class="comment">/* for XInput ChangePointerDevice */</span>
-00252     int                      (*savedMotionProc)(DeviceIntPtr,
-00253                                                 xTimecoord *,
-00254                                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>,
-00255                                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>,
-00256                                                 ScreenPtr);
-<a name="l00257"></a><a class="code" href="struct__DMXLocalInputInfo.html#o37">00257</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o37">savedMotionEvents</a>; 
-<a name="l00258"></a><a class="code" href="struct__DMXLocalInputInfo.html#o38">00258</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o38">savedSendsCore</a>;    
-<a name="l00260"></a><a class="code" href="struct__DMXLocalInputInfo.html#o39">00260</a>     <a class="code" href="struct__DMXEventMap.html">DMXEventMap</a>              <a class="code" href="struct__DMXLocalInputInfo.html#o39">map</a>[DMX_MAP_ENTRIES]; 
-<a name="l00261"></a><a class="code" href="struct__DMXLocalInputInfo.html#o40">00261</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#o40">mapOptimize</a>;          
-<a name="l00265"></a><a class="code" href="struct__DMXLocalInputInfo.html#o41">00265</a>     <span class="keywordtype">long</span>                     <a class="code" href="struct__DMXLocalInputInfo.html#o41">deviceId</a>;    
-<a name="l00267"></a><a class="code" href="struct__DMXLocalInputInfo.html#o42">00267</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXLocalInputInfo.html#o42">deviceName</a>; 
-00269 } <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>;
-00270 
-00271 <span class="keyword">extern</span> <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocalCorePointer, dmxLocalCoreKeyboard;
-00272 
-00273 <span class="keyword">extern</span> <span class="keywordtype">void</span>                 dmxLocalInitInput(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00274 <span class="keyword">extern</span> <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="code" href="dmxinputinit_8c.html#a33">dmxInputCopyLocal</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput,
-00275                                               <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s);
-00276 
-00277 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a16">dmxChangePointerControl</a>(DeviceIntPtr pDevice, PtrCtrl *ctrl);
-00278 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a18">dmxKeyboardKbdCtrlProc</a>(DeviceIntPtr pDevice, KeybdCtrl *ctrl);
-00279 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#a20">dmxKeyboardBellProc</a>(<span class="keywordtype">int</span> percent, DeviceIntPtr pDevice,
-00280                                 pointer ctrl, <span class="keywordtype">int</span> unknown);
-00281 
-00282 <span class="keyword">extern</span> <span class="keywordtype">int</span>  dmxInputExtensionErrorHandler(Display *dsp, <span class="keywordtype">char</span> *name,
-00283                                           <span class="keywordtype">char</span> *reason);
-00284 
-00285 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxinputinit_8c.html#a43">dmxInputDetach</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00286 <span class="keyword">extern</span> <span class="keywordtype">void</span>         <a class="code" href="dmxinputinit_8c.html#a44">dmxInputDetachAll</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00287 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxinputinit_8c.html#a45">dmxInputDetachId</a>(<span class="keywordtype">int</span> id);
-00288 <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInputLocateId(<span class="keywordtype">int</span> id);
-00289 <span class="keyword">extern</span> <span class="keywordtype">int</span>          dmxInputAttachConsole(<span class="keyword">const</span> <span class="keywordtype">char</span> *name, <span class="keywordtype">int</span> isCore,
-00290                                           <span class="keywordtype">int</span> *id);
-00291 <span class="keyword">extern</span> <span class="keywordtype">int</span>          dmxInputAttachBackend(<span class="keywordtype">int</span> physicalScreen, <span class="keywordtype">int</span> isCore,
-00292                                           <span class="keywordtype">int</span> *id);
-00293 
-00294 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html
index 03a64d73d..fcd892e9d 100644
--- a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h.html
@@ -6,392 +6,1082 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxinputinit.h File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxinputinit.h File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
 
-<p>
-<a href="dmxinputinit_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a></td></tr>
+<p><a href="dmxinputinit_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aa1870074757b46ee3d10dec90cdf2b64">DMX_LOCAL_DEFAULT_KEYBOARD</a>&nbsp;&nbsp;&nbsp;&quot;kbd&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a71db83edc922dbedc5f8b9d7bed08be8">DMX_LOCAL_DEFAULT_POINTER</a>&nbsp;&nbsp;&nbsp;&quot;ps2&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a612274ec201ce93ff486a18bf84225ec">DMX_MAX_BUTTONS</a>&nbsp;&nbsp;&nbsp;256</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aa5877f857ec01a4754c187147f3e34f1">DMX_MOTION_SIZE</a>&nbsp;&nbsp;&nbsp;256</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aa3be211c7a2902aa6358627c1a2fe697">DMX_MAX_VALUATORS</a>&nbsp;&nbsp;&nbsp;32</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>&nbsp;&nbsp;&nbsp;32</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ae754d74afaf08d6e9b46b3bc7581623e">DMX_MAX_XINPUT_EVENT_TYPES</a>&nbsp;&nbsp;&nbsp;100</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a13002c58c62fa0d9c65076f22c4df452">DMX_MAP_ENTRIES</a>&nbsp;&nbsp;&nbsp;16</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a51a3f23fde19e452c34d472758710b90">DMX_MAP_MASK</a>&nbsp;&nbsp;&nbsp;(DMX_MAP_ENTRIES - 1)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a3c9d38c22c8aff8456167d8990cbded0">DMXLocalInitInfo</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a6f7eba570368d4ee72420f0cdb70f5c5">DMXLocalInitInfoPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef pointer(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a> )(DeviceIntPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a> )(pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a> )(DevicePtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a> )(DevicePtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a> )(DevicePtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a> )(DevicePtr, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a> )(DevicePtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a> )(DevicePtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a> )(pointer, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a> )(pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a> )(pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a> )(pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a> )(pointer, int vt, <a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>, pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> )(DevicePtr, int *valuators, int firstAxis, int axesCount, <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> )(DevicePtr, int type, int detail, KeySym keySym, XEvent *e, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> )(DevicePtr, KeySym keySym)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a> )(DevicePtr, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a> )(pointer)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a> )(pointer, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a> )(pointer, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a> )(DevicePtr, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a> )(DevicePtr, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a> )(DevicePtr, int percent, int volume, int pitch, int duration)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a8143582d36de7cbdda4cca97cc4fb4f8">DMXEventMap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a18d50c3ccca9422952b75ceed4e26e8e">DMXLocalInputInfoRec</a></td></tr>
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a> { <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4">DMX_FUNCTION_GRAB</a>, 
+<a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a">DMX_FUNCTION_TERMINATE</a>, 
+<a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f">DMX_FUNCTION_FINE</a>
+ }</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a> { <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618">DMX_LOCAL_HIGHLEVEL</a>, 
+<a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">DMX_LOCAL_KEYBOARD</a>, 
+<a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">DMX_LOCAL_MOUSE</a>, 
+<a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e">DMX_LOCAL_OTHER</a>
+ }</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a> { <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">DMX_LOCAL_TYPE_LOCAL</a>, 
+<a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">DMX_LOCAL_TYPE_CONSOLE</a>, 
+<a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">DMX_LOCAL_TYPE_BACKEND</a>, 
+<a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee">DMX_LOCAL_TYPE_COMMON</a>
+ }</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> { <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412">DMX_RELATIVE</a>, 
+<a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06">DMX_ABSOLUTE</a>, 
+<a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c">DMX_ABSOLUTE_CONFINED</a>
+ }</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a5ed320a98bbcf4d2970316dff3ddb349">dmxLocalInitInput</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a816d1052ef5a587ef8e16b0005b06662">dmxInputCopyLocal</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#aaba396b9c08ac672d3dcf6561ac57b40">dmxChangePointerControl</a> (DeviceIntPtr pDevice, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ad23e145891ad0fb1c909d85ca8e4fe19">dmxKeyboardKbdCtrlProc</a> (DeviceIntPtr pDevice, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ab127903bdb6bf262e51f128b4cec4960">dmxKeyboardBellProc</a> (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ad705be7fbe7dfaf3119a8892e5c54aaa">dmxInputExtensionErrorHandler</a> (Display *dsp, char *name, char *reason)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ac4d026f31f7b32bd571bdcf9e091c419">dmxInputDetach</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#adec246343ae8402c7cc47b19020c7ef7">dmxInputDetachAll</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ad7a3f09eeaf98373c261119fba907c47">dmxInputDetachId</a> (int id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ae0bcd445301dd91f20c9eb0b6dce0b42">dmxInputLocateId</a> (int id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ac3f9807875f237589d57ab9f006735af">dmxInputAttachConsole</a> (const char *name, int isCore, int *id)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#a2ee085307a1dba7b07fa2eb34639815c">dmxInputAttachBackend</a> (int physicalScreen, int isCore, int *id)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#ab34ec11967377e32bc0817fb3a8b939e">dmxLocalCorePointer</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxinputinit_8h.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxLocalCoreKeyboard</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for low-level input support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinputinit_8c.html">dmxinputinit.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="aa1870074757b46ee3d10dec90cdf2b64"></a><!-- doxytag: member="dmxinputinit.h::DMX_LOCAL_DEFAULT_KEYBOARD" ref="aa1870074757b46ee3d10dec90cdf2b64" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_LOCAL_DEFAULT_KEYBOARD&nbsp;&nbsp;&nbsp;&quot;kbd&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a71db83edc922dbedc5f8b9d7bed08be8"></a><!-- doxytag: member="dmxinputinit.h::DMX_LOCAL_DEFAULT_POINTER" ref="a71db83edc922dbedc5f8b9d7bed08be8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_LOCAL_DEFAULT_POINTER&nbsp;&nbsp;&nbsp;&quot;ps2&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a13002c58c62fa0d9c65076f22c4df452"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAP_ENTRIES" ref="a13002c58c62fa0d9c65076f22c4df452" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAP_ENTRIES&nbsp;&nbsp;&nbsp;16</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a9">DMXLocalInitInfo</a></td></tr>
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00091">dmxMapClear()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a10">DMXLocalInitInfoPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a51a3f23fde19e452c34d472758710b90"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAP_MASK" ref="a51a3f23fde19e452c34d472758710b90" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAP_MASK&nbsp;&nbsp;&nbsp;(DMX_MAP_ENTRIES - 1)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a34">DMXEventMap</a></td></tr>
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a35">DMXLocalInputInfoRec</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a144e2f1a618a0d14e2c9ce4fda50104a"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAX_AXES" ref="a144e2f1a618a0d14e2c9ce4fda50104a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAX_AXES&nbsp;&nbsp;&nbsp;32</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a53">dmxInputCopyLocal</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a612274ec201ce93ff486a18bf84225ec"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAX_BUTTONS" ref="a612274ec201ce93ff486a18bf84225ec" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAX_BUTTONS&nbsp;&nbsp;&nbsp;256</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a54">dmxChangePointerControl</a> (DeviceIntPtr pDevice, PtrCtrl *ctrl)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00449">dmxCommonMouGetMap()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a55">dmxKeyboardKbdCtrlProc</a> (DeviceIntPtr pDevice, KeybdCtrl *ctrl)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa3be211c7a2902aa6358627c1a2fe697"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAX_VALUATORS" ref="aa3be211c7a2902aa6358627c1a2fe697" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAX_VALUATORS&nbsp;&nbsp;&nbsp;32</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a56">dmxKeyboardBellProc</a> (int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ae754d74afaf08d6e9b46b3bc7581623e"></a><!-- doxytag: member="dmxinputinit.h::DMX_MAX_XINPUT_EVENT_TYPES" ref="ae754d74afaf08d6e9b46b3bc7581623e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MAX_XINPUT_EVENT_TYPES&nbsp;&nbsp;&nbsp;100</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a58">dmxInputDetach</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a59">dmxInputDetachAll</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa5877f857ec01a4754c187147f3e34f1"></a><!-- doxytag: member="dmxinputinit.h::DMX_MOTION_SIZE" ref="aa5877f857ec01a4754c187147f3e34f1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_MOTION_SIZE&nbsp;&nbsp;&nbsp;256</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxinputinit_8h.html#a60">dmxInputDetachId</a> (int id)</td></tr>
+<p>Referenced by <a class="el" href="dmxmotion_8c_source.html#l00053">dmxPointerGetMotionBufferSize()</a>, <a class="el" href="dmxmotion_8c_source.html#l00074">dmxPointerGetMotionEvents()</a>, and <a class="el" href="dmxmotion_8c_source.html#l00102">dmxPointerPutMotionEvent()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for low-level input support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinputinit_8c.html">dmxinputinit.c</a></dd></dl>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a34" doxytag="dmxinputinit.h::DMXEventMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>  <a class="el" href="struct__DMXEventMap.html">DMXEventMap</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores a mapping between the device id on the remote X server and the id on the DMX server     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxinputinit.h::DMXLocalInitInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a838cb45fd92d5cf506e4179b601f7dbc"></a><!-- doxytag: member="dmxinputinit.h::dmxCheckSpecialProcPtr" ref="a838cb45fd92d5cf506e4179b601f7dbc" args=")(DevicePtr, KeySym keySym)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef int(* <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>)(DevicePtr, KeySym keySym)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adcfb97363d7c30f429637f857e07ab89"></a><!-- doxytag: member="dmxinputinit.h::dmxCollectEventsProcPtr" ref="adcfb97363d7c30f429637f857e07ab89" args=")(DevicePtr, dmxMotionProcPtr, dmxEnqueueProcPtr, dmxCheckSpecialProcPtr, DMXBlockType)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>  <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a>)(DevicePtr, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores information from low-level device that is used to initialize the device at the dix level.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxinputinit.h::DMXLocalInitInfoPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aee05637c82c5006dc39a8a208e59681d"></a><!-- doxytag: member="dmxinputinit.h::dmxCreatePrivateProcPtr" ref="aee05637c82c5006dc39a8a208e59681d" args=")(DeviceIntPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef pointer(* <a class="el" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a>)(DeviceIntPtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2da7d7738bd1daf6c24aab0ba07caf54"></a><!-- doxytag: member="dmxinputinit.h::dmxDestroyPrivateProcPtr" ref="a2da7d7738bd1daf6c24aab0ba07caf54" args=")(pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a>)(pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adbd955b9ddbc5ffe38ff65e3f068f205"></a><!-- doxytag: member="dmxinputinit.h::dmxEnqueueProcPtr" ref="adbd955b9ddbc5ffe38ff65e3f068f205" args=")(DevicePtr, int type, int detail, KeySym keySym, XEvent *e, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>)(DevicePtr, int type, int detail, KeySym keySym, XEvent *e, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8143582d36de7cbdda4cca97cc4fb4f8"></a><!-- doxytag: member="dmxinputinit.h::DMXEventMap" ref="a8143582d36de7cbdda4cca97cc4fb4f8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXEventMap.html">_DMXEventMap</a>  <a class="el" href="struct__DMXEventMap.html">DMXEventMap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores a mapping between the device id on the remote X server and the id on the DMX server </p>
+
+</div>
+</div>
+<a class="anchor" id="a8b1303060b18fcc2d85f44d658ae75c4"></a><!-- doxytag: member="dmxinputinit.h::dmxFunctionsProcPtr" ref="a8b1303060b18fcc2d85f44d658ae75c4" args=")(pointer, DMXFunctionType)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef int(* <a class="el" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a>)(pointer, <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a26894f455a9a482ea75157931a1458d7"></a><!-- doxytag: member="dmxinputinit.h::dmxGetInfoProcPtr" ref="a26894f455a9a482ea75157931a1458d7" args=")(DevicePtr, DMXLocalInitInfoPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a>)(DevicePtr, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a170923459cb2d78f2a9aa623d3af2a5e"></a><!-- doxytag: member="dmxinputinit.h::dmxInitProcPtr" ref="a170923459cb2d78f2a9aa623d3af2a5e" args=")(DevicePtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> * <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a>)(DevicePtr)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7e43ef34585bcd2dfb1f6c72b46674b0"></a><!-- doxytag: member="dmxinputinit.h::dmxKBBellProcPtr" ref="a7e43ef34585bcd2dfb1f6c72b46674b0" args=")(DevicePtr, int percent, int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a>)(DevicePtr, int percent, int volume, int pitch, int duration)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="afd1aa8768fbb96900d4a206a33f0fa10"></a><!-- doxytag: member="dmxinputinit.h::dmxKBCtrlProcPtr" ref="afd1aa8768fbb96900d4a206a33f0fa10" args=")(DevicePtr, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a>)(DevicePtr, KeybdCtrl *ctrl)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7710375b1daf4c8a43e1bc45b1459885"></a><!-- doxytag: member="dmxinputinit.h::dmxLateReInitProcPtr" ref="a7710375b1daf4c8a43e1bc45b1459885" args=")(DevicePtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a>)(DevicePtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3c9d38c22c8aff8456167d8990cbded0"></a><!-- doxytag: member="dmxinputinit.h::DMXLocalInitInfo" ref="a3c9d38c22c8aff8456167d8990cbded0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a>  <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores information from low-level device that is used to initialize the device at the dix level. </p>
+
+</div>
+</div>
+<a class="anchor" id="a6f7eba570368d4ee72420f0cdb70f5c5"></a><!-- doxytag: member="dmxinputinit.h::DMXLocalInitInfoPtr" ref="a6f7eba570368d4ee72420f0cdb70f5c5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> * <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a18d50c3ccca9422952b75ceed4e26e8e"></a><!-- doxytag: member="dmxinputinit.h::DMXLocalInputInfoRec" ref="a18d50c3ccca9422952b75ceed4e26e8e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>  <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c). </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> </dd>
+<dd>
+dmxextensions.c </dd></dl>
+
+</div>
+</div>
+<a class="anchor" id="a663082c69800179ce7177163c231ac9c"></a><!-- doxytag: member="dmxinputinit.h::dmxMCtrlProcPtr" ref="a663082c69800179ce7177163c231ac9c" args=")(DevicePtr, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a>)(DevicePtr, PtrCtrl *ctrl)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1279820425966adabf5c77357e4a289c"></a><!-- doxytag: member="dmxinputinit.h::dmxMotionProcPtr" ref="a1279820425966adabf5c77357e4a289c" args=")(DevicePtr, int *valuators, int firstAxis, int axesCount, DMXMotionType type, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>)(DevicePtr, int *valuators, int firstAxis, int axesCount, <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a73975f436d350bc9d62310c3aa18b970"></a><!-- doxytag: member="dmxinputinit.h::dmxOffProcPtr" ref="a73975f436d350bc9d62310c3aa18b970" args=")(DevicePtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a>)(DevicePtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ac047d21e0ad6e06d7e1c8d4ff4bcb689"></a><!-- doxytag: member="dmxinputinit.h::dmxOnProcPtr" ref="ac047d21e0ad6e06d7e1c8d4ff4bcb689" args=")(DevicePtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef int(* <a class="el" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a>)(DevicePtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad4cb1ed046822462a5d60edeebcbf586"></a><!-- doxytag: member="dmxinputinit.h::dmxProcessInputProcPtr" ref="ad4cb1ed046822462a5d60edeebcbf586" args=")(pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a>)(pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ae9c6f42a280d980b6b99d7e05b27c3c9"></a><!-- doxytag: member="dmxinputinit.h::dmxReInitProcPtr" ref="ae9c6f42a280d980b6b99d7e05b27c3c9" args=")(DevicePtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a>)(DevicePtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a85e276bf34bacc668c901e37fd787dfc"></a><!-- doxytag: member="dmxinputinit.h::dmxUpdateInfoProcPtr" ref="a85e276bf34bacc668c901e37fd787dfc" args=")(pointer, DMXUpdateType, WindowPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a>)(pointer, <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a23f7990e959535436e5a29aaf43e09f0"></a><!-- doxytag: member="dmxinputinit.h::dmxUpdatePositionProcPtr" ref="a23f7990e959535436e5a29aaf43e09f0" args=")(pointer, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a>)(pointer, int x, int y)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aba1f3ed3e0d93c6fea0448b6f928132b"></a><!-- doxytag: member="dmxinputinit.h::dmxVTPostSwitchProcPtr" ref="aba1f3ed3e0d93c6fea0448b6f928132b" args=")(pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a>)(pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af7ef16143e5a5fa77c00cacdd710abf0"></a><!-- doxytag: member="dmxinputinit.h::dmxVTPreSwitchProcPtr" ref="af7ef16143e5a5fa77c00cacdd710abf0" args=")(pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a>)(pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af276a0d0ad01b9c9f8485cdf9b218b92"></a><!-- doxytag: member="dmxinputinit.h::dmxVTSwitchProcPtr" ref="af276a0d0ad01b9c9f8485cdf9b218b92" args=")(pointer, int vt, dmxVTSwitchReturnProcPtr, pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef int(* <a class="el" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a>)(pointer, int vt, <a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>, pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adb9019a46004e627338bfb4a02800636"></a><!-- doxytag: member="dmxinputinit.h::dmxVTSwitchReturnProcPtr" ref="adb9019a46004e627338bfb4a02800636" args=")(pointer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void(* <a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>)(pointer)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="a9537dacd464c8445848fb808e172039c"></a><!-- doxytag: member="dmxinputinit.h::DMXFunctionType" ref="a9537dacd464c8445848fb808e172039c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4"></a><!-- doxytag: member="DMX_FUNCTION_GRAB" ref="a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4" args="" -->DMX_FUNCTION_GRAB</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a"></a><!-- doxytag: member="DMX_FUNCTION_TERMINATE" ref="a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a" args="" -->DMX_FUNCTION_TERMINATE</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f"></a><!-- doxytag: member="DMX_FUNCTION_FINE" ref="a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f" args="" -->DMX_FUNCTION_FINE</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores information from low-level device that is used to initialize the device at the dix level.     </td>
-  </tr>
+</dd>
+</dl>
+
+</div>
+</div>
+<a class="anchor" id="adb3d11ae6b6d741bc4ac9be219eae9ba"></a><!-- doxytag: member="dmxinputinit.h::DMXLocalInputExtType" ref="adb3d11ae6b6d741bc4ac9be219eae9ba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16"></a><!-- doxytag: member="DMX_LOCAL_TYPE_LOCAL" ref="adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16" args="" -->DMX_LOCAL_TYPE_LOCAL</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8"></a><!-- doxytag: member="DMX_LOCAL_TYPE_CONSOLE" ref="adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8" args="" -->DMX_LOCAL_TYPE_CONSOLE</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa"></a><!-- doxytag: member="DMX_LOCAL_TYPE_BACKEND" ref="adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa" args="" -->DMX_LOCAL_TYPE_BACKEND</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee"></a><!-- doxytag: member="DMX_LOCAL_TYPE_COMMON" ref="adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee" args="" -->DMX_LOCAL_TYPE_COMMON</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<a class="anchor" name="a35" doxytag="dmxinputinit.h::DMXLocalInputInfoRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</dd>
+</dl>
+
+</div>
+</div>
+<a class="anchor" id="aa3fce3ce186af0687bc43e0e4930181b"></a><!-- doxytag: member="dmxinputinit.h::DMXLocalInputType" ref="aa3fce3ce186af0687bc43e0e4930181b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a>  <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>
+          <td class="memname">enum <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618"></a><!-- doxytag: member="DMX_LOCAL_HIGHLEVEL" ref="aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618" args="" -->DMX_LOCAL_HIGHLEVEL</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2"></a><!-- doxytag: member="DMX_LOCAL_KEYBOARD" ref="aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2" args="" -->DMX_LOCAL_KEYBOARD</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818"></a><!-- doxytag: member="DMX_LOCAL_MOUSE" ref="aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818" args="" -->DMX_LOCAL_MOUSE</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e"></a><!-- doxytag: member="DMX_LOCAL_OTHER" ref="aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e" args="" -->DMX_LOCAL_OTHER</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c). <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> <p>
-dmxextensions.c </dd></dl>
-    </td>
-  </tr>
+</dd>
+</dl>
+
+</div>
+</div>
+<a class="anchor" id="a009c1c06db97e0347237f11a701db349"></a><!-- doxytag: member="dmxinputinit.h::DMXMotionType" ref="a009c1c06db97e0347237f11a701db349" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412"></a><!-- doxytag: member="DMX_RELATIVE" ref="a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412" args="" -->DMX_RELATIVE</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06"></a><!-- doxytag: member="DMX_ABSOLUTE" ref="a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06" args="" -->DMX_ABSOLUTE</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c"></a><!-- doxytag: member="DMX_ABSOLUTE_CONFINED" ref="a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c" args="" -->DMX_ABSOLUTE_CONFINED</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a54" doxytag="dmxinputinit.h::dmxChangePointerControl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</dd>
+</dl>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aaba396b9c08ac672d3dcf6561ac57b40"></a><!-- doxytag: member="dmxinputinit.h::dmxChangePointerControl" ref="aaba396b9c08ac672d3dcf6561ac57b40" args="(DeviceIntPtr pDevice, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangePointerControl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">void dmxChangePointerControl </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PtrCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the pointer control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the pointer devices that send core events.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a53" doxytag="dmxinputinit.h::dmxInputCopyLocal" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the pointer control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the pointer devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00265">_dmxChangePointerControl()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2ee085307a1dba7b07fa2eb34639815c"></a><!-- doxytag: member="dmxinputinit.h::dmxInputAttachBackend" ref="a2ee085307a1dba7b07fa2eb34639815c" args="(int physicalScreen, int isCore, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxInputCopyLocal </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">int dmxInputAttachBackend </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>physicalScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>isCore</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>s</em></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Copy the local input information from <em>s</em> into a new <em>devs</em> slot in <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a58" doxytag="dmxinputinit.h::dmxInputDetach" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3f9807875f237589d57ab9f006735af"></a><!-- doxytag: member="dmxinputinit.h::dmxInputAttachConsole" ref="ac3f9807875f237589d57ab9f006735af" args="(const char *name, int isCore, int *id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxInputDetach </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxInputAttachConsole </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>isCore</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>id</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Detach an input     </td>
-  </tr>
-</table>
-<a class="anchor" name="a59" doxytag="dmxinputinit.h::dmxInputDetachAll" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00088">_DMXInputInfo::freename</a>, <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a816d1052ef5a587ef8e16b0005b06662"></a><!-- doxytag: member="dmxinputinit.h::dmxInputCopyLocal" ref="a816d1052ef5a587ef8e16b0005b06662" args="(DMXInputInfo *dmxInput, DMXLocalInputInfoPtr s)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInputDetachAll </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxInputCopyLocal </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>s</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Copy the local input information from <em>s</em> into a new <em>devs</em> slot in <em>dmxInput</em>. </p>
 
+<p>References <a class="el" href="dmxinput_8h_source.html#l00092">_DMXInputInfo::core</a>, <a class="el" href="dmxinputinit_8h_source.html#l00262">_DMXLocalInputInfo::deviceId</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmxinputinit_8h_source.html#l00236">_DMXLocalInputInfo::inputIdx</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00255">_DMXLocalInputInfo::savedSendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac4d026f31f7b32bd571bdcf9e091c419"></a><!-- doxytag: member="dmxinputinit.h::dmxInputDetach" ref="ac4d026f31f7b32bd571bdcf9e091c419" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxInputDetach </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Search for input associated with <em>dmxScreen</em>, and detach.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a60" doxytag="dmxinputinit.h::dmxInputDetachId" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Detach an input </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adec246343ae8402c7cc47b19020c7ef7"></a><!-- doxytag: member="dmxinputinit.h::dmxInputDetachAll" ref="adec246343ae8402c7cc47b19020c7ef7" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxInputDetachId </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>id</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInputDetachAll </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Search for input associated with <em>dmxScreen</em>, and detach. </p>
+
+<p>References <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, and <a class="el" href="dmxinput_8h_source.html#l00091">_DMXInputInfo::scrnIdx</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad7a3f09eeaf98373c261119fba907c47"></a><!-- doxytag: member="dmxinputinit.h::dmxInputDetachId" ref="ad7a3f09eeaf98373c261119fba907c47" args="(int id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxInputDetachId </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Search for input associated with <em>deviceId</em>, and detach.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a56" doxytag="dmxinputinit.h::dmxKeyboardBellProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Search for input associated with <em>deviceId</em>, and detach. </p>
+
+<p>References <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00270">dmxRemoveInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad705be7fbe7dfaf3119a8892e5c54aaa"></a><!-- doxytag: member="dmxinputinit.h::dmxInputExtensionErrorHandler" ref="ad705be7fbe7dfaf3119a8892e5c54aaa" args="(Display *dsp, char *name, char *reason)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxKeyboardBellProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="memname">int dmxInputExtensionErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dsp</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>reason</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0bcd445301dd91f20c9eb0b6dce0b42"></a><!-- doxytag: member="dmxinputinit.h::dmxInputLocateId" ref="ae0bcd445301dd91f20c9eb0b6dce0b42" args="(int id)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* dmxInputLocateId </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>id</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01209">dmxInputDetachId()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab127903bdb6bf262e51f128b4cec4960"></a><!-- doxytag: member="dmxinputinit.h::dmxKeyboardBellProc" ref="ab127903bdb6bf262e51f128b4cec4960" args="(int percent, DeviceIntPtr pDevice, pointer ctrl, int unknown)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxKeyboardBellProc </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>unknown</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>unknown</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a55" doxytag="dmxinputinit.h::dmxKeyboardKbdCtrlProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Sound the bell on the device. If the device send core events, then sound the bell on all of the devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00332">_dmxKeyboardBellProc()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad23e145891ad0fb1c909d85ca8e4fe19"></a><!-- doxytag: member="dmxinputinit.h::dmxKeyboardKbdCtrlProc" ref="ad23e145891ad0fb1c909d85ca8e4fe19" args="(DeviceIntPtr pDevice, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxKeyboardKbdCtrlProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">void dmxKeyboardKbdCtrlProc </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Change the keyboard control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the keyboard devices that send core events. </p>
+
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00294">_dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinput_8h_source.html#l00089">_DMXInputInfo::detached</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5ed320a98bbcf4d2970316dff3ddb349"></a><!-- doxytag: member="dmxinputinit.h::dmxLocalInitInput" ref="a5ed320a98bbcf4d2970316dff3ddb349" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxLocalInitInput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="afbf8cd02f52e073392a645f6ef0bcf78"></a><!-- doxytag: member="dmxinputinit.h::dmxLocalCoreKeyboard" ref="afbf8cd02f52e073392a645f6ef0bcf78" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="el" href="dmxinputinit_8h.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxLocalCoreKeyboard</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the keyboard control information for the <em>pDevice</em>. If the device sends core events, then also change the control information for all of the keyboard devices that send core events.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, and <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab34ec11967377e32bc0817fb3a8b939e"></a><!-- doxytag: member="dmxinputinit.h::dmxLocalCorePointer" ref="ab34ec11967377e32bc0817fb3a8b939e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="el" href="dmxinputinit_8h.html#ab34ec11967377e32bc0817fb3a8b939e">dmxLocalCorePointer</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00056">ChangeKeyboardDevice()</a>, and <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html
new file mode 100644
index 000000000..c7f7c1319
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxinputinit_8h_source.html
@@ -0,0 +1,269 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxinputinit.h</h1><a href="dmxinputinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXINPUTINIT_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXINPUTINIT_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;<a class="code" href="dmx_8h.html">dmx.h</a>&quot;</span>
+<a name="l00041"></a>00041 <span class="preprocessor">#include &quot;<a class="code" href="dmxinput_8h.html">dmxinput.h</a>&quot;</span>
+<a name="l00042"></a>00042 <span class="preprocessor">#include &quot;<a class="code" href="dmxlog_8h.html">dmxlog.h</a>&quot;</span>
+<a name="l00043"></a>00043 
+<a name="l00044"></a>00044 
+<a name="l00045"></a><a class="code" href="dmxinputinit_8h.html#aa1870074757b46ee3d10dec90cdf2b64">00045</a> <span class="preprocessor">#define DMX_LOCAL_DEFAULT_KEYBOARD &quot;kbd&quot;</span>
+<a name="l00046"></a><a class="code" href="dmxinputinit_8h.html#a71db83edc922dbedc5f8b9d7bed08be8">00046</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_LOCAL_DEFAULT_POINTER  &quot;ps2&quot;</span>
+<a name="l00047"></a><a class="code" href="dmxinputinit_8h.html#a612274ec201ce93ff486a18bf84225ec">00047</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_BUTTONS            256</span>
+<a name="l00048"></a><a class="code" href="dmxinputinit_8h.html#aa5877f857ec01a4754c187147f3e34f1">00048</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MOTION_SIZE            256</span>
+<a name="l00049"></a><a class="code" href="dmxinputinit_8h.html#aa3be211c7a2902aa6358627c1a2fe697">00049</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_VALUATORS          32</span>
+<a name="l00050"></a><a class="code" href="dmxinputinit_8h.html#a144e2f1a618a0d14e2c9ce4fda50104a">00050</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_AXES               32</span>
+<a name="l00051"></a><a class="code" href="dmxinputinit_8h.html#ae754d74afaf08d6e9b46b3bc7581623e">00051</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAX_XINPUT_EVENT_TYPES 100</span>
+<a name="l00052"></a><a class="code" href="dmxinputinit_8h.html#a13002c58c62fa0d9c65076f22c4df452">00052</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_MAP_ENTRIES            16 </span><span class="comment">/* Must be a power of 2 */</span>
+<a name="l00053"></a><a class="code" href="dmxinputinit_8h.html#a51a3f23fde19e452c34d472758710b90">00053</a> <span class="preprocessor">#define DMX_MAP_MASK               (DMX_MAP_ENTRIES - 1)</span>
+<a name="l00054"></a>00054 <span class="preprocessor"></span>
+<a name="l00055"></a><a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">00055</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00056"></a><a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4">00056</a>     <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4">DMX_FUNCTION_GRAB</a>,
+<a name="l00057"></a><a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a">00057</a>     <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a">DMX_FUNCTION_TERMINATE</a>,
+<a name="l00058"></a><a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f">00058</a>     <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f">DMX_FUNCTION_FINE</a>
+<a name="l00059"></a>00059 } <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>;
+<a name="l00060"></a>00060 
+<a name="l00061"></a><a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">00061</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00062"></a><a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618">00062</a>     <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618">DMX_LOCAL_HIGHLEVEL</a>,
+<a name="l00063"></a><a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">00063</a>     <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">DMX_LOCAL_KEYBOARD</a>,
+<a name="l00064"></a><a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">00064</a>     <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">DMX_LOCAL_MOUSE</a>,
+<a name="l00065"></a><a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e">00065</a>     <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e">DMX_LOCAL_OTHER</a>
+<a name="l00066"></a>00066 } <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a>;
+<a name="l00067"></a>00067 
+<a name="l00068"></a><a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">00068</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00069"></a><a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">00069</a>     <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">DMX_LOCAL_TYPE_LOCAL</a>,
+<a name="l00070"></a><a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">00070</a>     <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">DMX_LOCAL_TYPE_CONSOLE</a>,
+<a name="l00071"></a><a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">00071</a>     <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">DMX_LOCAL_TYPE_BACKEND</a>,
+<a name="l00072"></a><a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee">00072</a>     <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee">DMX_LOCAL_TYPE_COMMON</a>
+<a name="l00073"></a>00073 } <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a>;
+<a name="l00074"></a>00074 
+<a name="l00075"></a><a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">00075</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00076"></a><a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412">00076</a>     <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412">DMX_RELATIVE</a>,
+<a name="l00077"></a><a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06">00077</a>     <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06">DMX_ABSOLUTE</a>,
+<a name="l00078"></a><a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c">00078</a>     <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c">DMX_ABSOLUTE_CONFINED</a>
+<a name="l00079"></a>00079 } <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a>;
+<a name="l00080"></a>00080 
+<a name="l00083"></a><a class="code" href="struct__DMXLocalInitInfo.html">00083</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInitInfo.html">_DMXLocalInitInfo</a> {
+<a name="l00084"></a><a class="code" href="struct__DMXLocalInitInfo.html#a214969f0843dcb70d8f7577f58bafa48">00084</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a214969f0843dcb70d8f7577f58bafa48">keyboard</a>; 
+<a name="l00086"></a><a class="code" href="struct__DMXLocalInitInfo.html#a06626a99542714bbd032e9e12a8c6b55">00086</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a06626a99542714bbd032e9e12a8c6b55">keyClass</a>; 
+<a name="l00087"></a><a class="code" href="struct__DMXLocalInitInfo.html#a02861e7e9c24381a229567d36e7a68b7">00087</a>     KeySymsRec           <a class="code" href="struct__DMXLocalInitInfo.html#a02861e7e9c24381a229567d36e7a68b7">keySyms</a>;  
+<a name="l00088"></a><a class="code" href="struct__DMXLocalInitInfo.html#adf6832408c8ef7c3b25eb408907a1459">00088</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#adf6832408c8ef7c3b25eb408907a1459">freemap</a>;  
+<a name="l00089"></a><a class="code" href="struct__DMXLocalInitInfo.html#a2e345080abf875ce6f85e63ed631cbcd">00089</a>     CARD8                <a class="code" href="struct__DMXLocalInitInfo.html#a2e345080abf875ce6f85e63ed631cbcd">modMap</a>[MAP_LENGTH]; 
+<a name="l00090"></a><a class="code" href="struct__DMXLocalInitInfo.html#a17f7d8bff60a50d216e77e7511106a34">00090</a>     XkbDescPtr           <a class="code" href="struct__DMXLocalInitInfo.html#a17f7d8bff60a50d216e77e7511106a34">xkb</a>;       
+<a name="l00091"></a><a class="code" href="struct__DMXLocalInitInfo.html#a92de3dbbb88844f90aa431f93e16ee05">00091</a>     XkbComponentNamesRec <a class="code" href="struct__DMXLocalInitInfo.html#a92de3dbbb88844f90aa431f93e16ee05">names</a>;     
+<a name="l00092"></a><a class="code" href="struct__DMXLocalInitInfo.html#a20463b784b2d33db44b377cbbabf8b7b">00092</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a20463b784b2d33db44b377cbbabf8b7b">freenames</a>; 
+<a name="l00093"></a><a class="code" href="struct__DMXLocalInitInfo.html#abb7446114b5bdb0baf52806c9a1d249c">00093</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#abb7446114b5bdb0baf52806c9a1d249c">force</a>;     
+<a name="l00095"></a><a class="code" href="struct__DMXLocalInitInfo.html#a58b2e6764967add7eda1c1f2f0860abc">00095</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a58b2e6764967add7eda1c1f2f0860abc">buttonClass</a>; 
+<a name="l00096"></a><a class="code" href="struct__DMXLocalInitInfo.html#a9264f367a1c1e252679299b00f94458c">00096</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a9264f367a1c1e252679299b00f94458c">numButtons</a>;  
+<a name="l00097"></a><a class="code" href="struct__DMXLocalInitInfo.html#a43d86cc82219794bba7ba1ee66472a45">00097</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>        <a class="code" href="struct__DMXLocalInitInfo.html#a43d86cc82219794bba7ba1ee66472a45">map</a>[<a class="code" href="dmxinputinit_8h.html#a612274ec201ce93ff486a18bf84225ec">DMX_MAX_BUTTONS</a>]; 
+<a name="l00099"></a><a class="code" href="struct__DMXLocalInitInfo.html#a9af277d2da1ade2138488a413e9c5ceb">00099</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a9af277d2da1ade2138488a413e9c5ceb">valuatorClass</a>; 
+<a name="l00101"></a><a class="code" href="struct__DMXLocalInitInfo.html#a5e192625179bbed020a720e448c789aa">00101</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a5e192625179bbed020a720e448c789aa">numRelAxes</a>;    
+<a name="l00102"></a><a class="code" href="struct__DMXLocalInitInfo.html#aa7576ebc7b4f56d51da6a21fcd7b07d4">00102</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#aa7576ebc7b4f56d51da6a21fcd7b07d4">numAbsAxes</a>;    
+<a name="l00103"></a><a class="code" href="struct__DMXLocalInitInfo.html#a0c47ee21909227a1ea5d40ba473e0e25">00103</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a0c47ee21909227a1ea5d40ba473e0e25">minval</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>]; 
+<a name="l00104"></a><a class="code" href="struct__DMXLocalInitInfo.html#a63477e691c43eca2dbf569fb0feb74be">00104</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a63477e691c43eca2dbf569fb0feb74be">maxval</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>]; 
+<a name="l00105"></a><a class="code" href="struct__DMXLocalInitInfo.html#abb910012dc1abde90f954354f8ceb2a1">00105</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#abb910012dc1abde90f954354f8ceb2a1">res</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>];    
+<a name="l00106"></a><a class="code" href="struct__DMXLocalInitInfo.html#a139fed62b89a92d80997166c8cfcdebf">00106</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a139fed62b89a92d80997166c8cfcdebf">minres</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>]; 
+<a name="l00107"></a><a class="code" href="struct__DMXLocalInitInfo.html#a5de8a5ac80a30840cba0d9f3074289ca">00107</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a5de8a5ac80a30840cba0d9f3074289ca">maxres</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>]; 
+<a name="l00109"></a><a class="code" href="struct__DMXLocalInitInfo.html#a24b09c34e0cf80ec33f093e908206be4">00109</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a24b09c34e0cf80ec33f093e908206be4">focusClass</a>;       
+<a name="l00111"></a><a class="code" href="struct__DMXLocalInitInfo.html#ae870549e09c5ae0ccc6b9d6d01b4c3b5">00111</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#ae870549e09c5ae0ccc6b9d6d01b4c3b5">proximityClass</a>;   
+<a name="l00113"></a><a class="code" href="struct__DMXLocalInitInfo.html#af19caac0e20a9106b73714c9c7991ce5">00113</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#af19caac0e20a9106b73714c9c7991ce5">kbdFeedbackClass</a>; 
+<a name="l00115"></a><a class="code" href="struct__DMXLocalInitInfo.html#a1c52bc6e1c328ef9e808a111dd050fc2">00115</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a1c52bc6e1c328ef9e808a111dd050fc2">ptrFeedbackClass</a>; 
+<a name="l00117"></a><a class="code" href="struct__DMXLocalInitInfo.html#accf423e8cf2614500108be41ed23492d">00117</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#accf423e8cf2614500108be41ed23492d">ledFeedbackClass</a>; 
+<a name="l00119"></a><a class="code" href="struct__DMXLocalInitInfo.html#a088c60acc5806ebcc401fa1da108b3f5">00119</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a088c60acc5806ebcc401fa1da108b3f5">belFeedbackClass</a>; 
+<a name="l00121"></a><a class="code" href="struct__DMXLocalInitInfo.html#ac0c949f93be45f162c824aae17762dc3">00121</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#ac0c949f93be45f162c824aae17762dc3">intFeedbackClass</a>; 
+<a name="l00123"></a><a class="code" href="struct__DMXLocalInitInfo.html#a35ccfe81c3eceefd69abfb7b5ebe02cf">00123</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a35ccfe81c3eceefd69abfb7b5ebe02cf">strFeedbackClass</a>; 
+<a name="l00126"></a><a class="code" href="struct__DMXLocalInitInfo.html#ae5dc18536a191e46bfe6682f82afd583">00126</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#ae5dc18536a191e46bfe6682f82afd583">maxSymbols</a>;          
+<a name="l00127"></a><a class="code" href="struct__DMXLocalInitInfo.html#a8a8933752768b613acbda0743bbcfbe6">00127</a>     <span class="keywordtype">int</span>                  <a class="code" href="struct__DMXLocalInitInfo.html#a8a8933752768b613acbda0743bbcfbe6">maxSymbolsSupported</a>; 
+<a name="l00128"></a><a class="code" href="struct__DMXLocalInitInfo.html#a6b496d0ba54c63d406ef46ddcf714790">00128</a>     KeySym               *<a class="code" href="struct__DMXLocalInitInfo.html#a6b496d0ba54c63d406ef46ddcf714790">symbols</a>;            
+<a name="l00129"></a>00129 } <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfo</a>, *<a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>;
+<a name="l00130"></a>00130 
+<a name="l00131"></a><a class="code" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">00131</a> <span class="keyword">typedef</span> pointer (*<a class="code" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a>)(DeviceIntPtr);
+<a name="l00132"></a><a class="code" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">00132</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a>)(pointer);
+<a name="l00133"></a>00133                 
+<a name="l00134"></a><a class="code" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">00134</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a>)(DevicePtr);
+<a name="l00135"></a><a class="code" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">00135</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a>)(DevicePtr);
+<a name="l00136"></a><a class="code" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">00136</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a>)(DevicePtr);
+<a name="l00137"></a><a class="code" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">00137</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a>)(DevicePtr, DMXLocalInitInfoPtr);
+<a name="l00138"></a><a class="code" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">00138</a> <span class="keyword">typedef</span> int     (*<a class="code" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a>)(DevicePtr);
+<a name="l00139"></a><a class="code" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">00139</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a>)(DevicePtr);
+<a name="l00140"></a><a class="code" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">00140</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a>)(pointer, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00141"></a>00141                 
+<a name="l00142"></a><a class="code" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">00142</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a>)(pointer);  <span class="comment">/* Turn I/O Off */</span>
+<a name="l00143"></a><a class="code" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">00143</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a>)(pointer); <span class="comment">/* Turn I/O On */</span>
+<a name="l00144"></a><a class="code" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">00144</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>)(pointer);
+<a name="l00145"></a><a class="code" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">00145</a> <span class="keyword">typedef</span> int     (*<a class="code" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a>)(pointer, <span class="keywordtype">int</span> vt,
+<a name="l00146"></a>00146                                       <a class="code" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>, pointer);
+<a name="l00147"></a>00147                 
+<a name="l00148"></a><a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">00148</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>)(DevicePtr,
+<a name="l00149"></a>00149                                     <span class="keywordtype">int</span> *valuators,
+<a name="l00150"></a>00150                                     <span class="keywordtype">int</span> firstAxis,
+<a name="l00151"></a>00151                                     <span class="keywordtype">int</span> axesCount,
+<a name="l00152"></a>00152                                     <a class="code" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">DMXMotionType</a> type,
+<a name="l00153"></a>00153                                     <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00154"></a><a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">00154</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>)(DevicePtr, <span class="keywordtype">int</span> type, <span class="keywordtype">int</span> detail,
+<a name="l00155"></a>00155                                      KeySym keySym, XEvent *e,
+<a name="l00156"></a>00156                                      <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00157"></a><a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">00157</a> <span class="keyword">typedef</span> int     (*<a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>)(DevicePtr, KeySym keySym);
+<a name="l00158"></a><a class="code" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">00158</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a>)(DevicePtr,
+<a name="l00159"></a>00159                                            <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>,
+<a name="l00160"></a>00160                                            <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>,
+<a name="l00161"></a>00161                                            <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>,
+<a name="l00162"></a>00162                                            <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>);
+<a name="l00163"></a><a class="code" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">00163</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a>)(pointer);
+<a name="l00164"></a><a class="code" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">00164</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a>)(pointer, <a class="code" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">DMXUpdateType</a>, WindowPtr);
+<a name="l00165"></a><a class="code" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">00165</a> <span class="keyword">typedef</span> int     (*<a class="code" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a>)(pointer, <a class="code" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">DMXFunctionType</a>);
+<a name="l00166"></a>00166                 
+<a name="l00167"></a><a class="code" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">00167</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a>)(DevicePtr, KeybdCtrl *ctrl);
+<a name="l00168"></a><a class="code" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">00168</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a>)(DevicePtr, PtrCtrl *ctrl);
+<a name="l00169"></a><a class="code" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">00169</a> <span class="keyword">typedef</span> void    (*<a class="code" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a>)(DevicePtr, <span class="keywordtype">int</span> percent,
+<a name="l00170"></a>00170                                     <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
+<a name="l00171"></a>00171 
+<a name="l00174"></a><a class="code" href="struct__DMXEventMap.html">00174</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXEventMap.html">_DMXEventMap</a> {
+<a name="l00175"></a><a class="code" href="struct__DMXEventMap.html#aafea1b880cf1b362c7e600b4285c08c3">00175</a>     <span class="keywordtype">int</span> <a class="code" href="struct__DMXEventMap.html#aafea1b880cf1b362c7e600b4285c08c3">remote</a>;                 
+<a name="l00176"></a><a class="code" href="struct__DMXEventMap.html#a6f3626351411d6a9555a16969761ec17">00176</a>     <span class="keywordtype">int</span> <a class="code" href="struct__DMXEventMap.html#a6f3626351411d6a9555a16969761ec17">server</a>;                 
+<a name="l00177"></a>00177 } <a class="code" href="struct__DMXEventMap.html">DMXEventMap</a>;
+<a name="l00178"></a>00178 
+<a name="l00182"></a><a class="code" href="struct__DMXLocalInputInfo.html">00182</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXLocalInputInfo.html">_DMXLocalInputInfo</a> {
+<a name="l00183"></a><a class="code" href="struct__DMXLocalInputInfo.html#a294006d846990bb8cc6dc67ae59a4604">00183</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXLocalInputInfo.html#a294006d846990bb8cc6dc67ae59a4604">name</a>;   
+<a name="l00184"></a><a class="code" href="struct__DMXLocalInputInfo.html#a65770e9c1265d5765c16028e740b7d88">00184</a>     <a class="code" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a>        <a class="code" href="struct__DMXLocalInputInfo.html#a65770e9c1265d5765c16028e740b7d88">type</a>;    
+<a name="l00185"></a><a class="code" href="struct__DMXLocalInputInfo.html#ae20bd191af90be478c9f4c036c058102">00185</a>     <a class="code" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a>     <a class="code" href="struct__DMXLocalInputInfo.html#ae20bd191af90be478c9f4c036c058102">extType</a>; 
+<a name="l00186"></a><a class="code" href="struct__DMXLocalInputInfo.html#a1ed7cce8b5eb7d8cf5b1184d4cdf303c">00186</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a1ed7cce8b5eb7d8cf5b1184d4cdf303c">binding</a>; 
+<a name="l00190"></a>00190                                 <span class="comment">/* Low-level (e.g., keyboard/mouse drivers) */</span>
+<a name="l00191"></a>00191 
+<a name="l00192"></a><a class="code" href="struct__DMXLocalInputInfo.html#a55f67eb2e795c4fb5d323fbfd7561b32">00192</a>     <a class="code" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a>  <a class="code" href="struct__DMXLocalInputInfo.html#a55f67eb2e795c4fb5d323fbfd7561b32">create_private</a>;  
+<a name="l00195"></a><a class="code" href="struct__DMXLocalInputInfo.html#af07ddc865b07864b2b33694bc8a2e716">00195</a>     <a class="code" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a> <a class="code" href="struct__DMXLocalInputInfo.html#af07ddc865b07864b2b33694bc8a2e716">destroy_private</a>; 
+<a name="l00198"></a><a class="code" href="struct__DMXLocalInputInfo.html#ac7d8e55012dcd7fd721802069a4cda7c">00198</a>     <a class="code" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a>           <a class="code" href="struct__DMXLocalInputInfo.html#ac7d8e55012dcd7fd721802069a4cda7c">init</a>;            
+<a name="l00199"></a><a class="code" href="struct__DMXLocalInputInfo.html#aa6f3438399957a92b7914c12eee23d33">00199</a>     <a class="code" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a>         <a class="code" href="struct__DMXLocalInputInfo.html#aa6f3438399957a92b7914c12eee23d33">reinit</a>;          
+<a name="l00202"></a><a class="code" href="struct__DMXLocalInputInfo.html#af3e5dd8989b3f33bc2c404bf190c6948">00202</a>     <a class="code" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a>     <a class="code" href="struct__DMXLocalInputInfo.html#af3e5dd8989b3f33bc2c404bf190c6948">latereinit</a>;      
+<a name="l00206"></a><a class="code" href="struct__DMXLocalInputInfo.html#a4d215378947d50a9abc74adcec917313">00206</a>     <a class="code" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a>        <a class="code" href="struct__DMXLocalInputInfo.html#a4d215378947d50a9abc74adcec917313">get_info</a>;        
+<a name="l00207"></a><a class="code" href="struct__DMXLocalInputInfo.html#a52fc64a76d0954ed17a1d6ec8abbcce2">00207</a>     <a class="code" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a>             <a class="code" href="struct__DMXLocalInputInfo.html#a52fc64a76d0954ed17a1d6ec8abbcce2">on</a>;              
+<a name="l00208"></a><a class="code" href="struct__DMXLocalInputInfo.html#abbc252251f0694ad7754f021c9b0fdd4">00208</a>     <a class="code" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a>            <a class="code" href="struct__DMXLocalInputInfo.html#abbc252251f0694ad7754f021c9b0fdd4">off</a>;             
+<a name="l00209"></a><a class="code" href="struct__DMXLocalInputInfo.html#a12eb4b3d8237801c42d5042035315035">00209</a>     <a class="code" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a> <a class="code" href="struct__DMXLocalInputInfo.html#a12eb4b3d8237801c42d5042035315035">update_position</a>; 
+<a name="l00212"></a><a class="code" href="struct__DMXLocalInputInfo.html#a04beb9f31d342ea399ffcfb7e7f62138">00212</a>     <a class="code" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a>    <a class="code" href="struct__DMXLocalInputInfo.html#a04beb9f31d342ea399ffcfb7e7f62138">vt_pre_switch</a>;   
+<a name="l00213"></a><a class="code" href="struct__DMXLocalInputInfo.html#a82c8765ddfb788835cb4f0e94eca2e84">00213</a>     <a class="code" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a>   <a class="code" href="struct__DMXLocalInputInfo.html#a82c8765ddfb788835cb4f0e94eca2e84">vt_post_switch</a>;  
+<a name="l00214"></a><a class="code" href="struct__DMXLocalInputInfo.html#a4c7d7da1d1a8ebfebb90f3d8e3592c50">00214</a>     <a class="code" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a>       <a class="code" href="struct__DMXLocalInputInfo.html#a4c7d7da1d1a8ebfebb90f3d8e3592c50">vt_switch</a>;       
+<a name="l00216"></a><a class="code" href="struct__DMXLocalInputInfo.html#a41e857d61c3f537b0b3df9c8e1870d3b">00216</a>     <a class="code" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a>  <a class="code" href="struct__DMXLocalInputInfo.html#a41e857d61c3f537b0b3df9c8e1870d3b">collect_events</a>;  
+<a name="l00219"></a><a class="code" href="struct__DMXLocalInputInfo.html#aa83350027ea60a4cbf2ca061f66ee9cc">00219</a>     <a class="code" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a>   <a class="code" href="struct__DMXLocalInputInfo.html#aa83350027ea60a4cbf2ca061f66ee9cc">process_input</a>;   
+<a name="l00221"></a><a class="code" href="struct__DMXLocalInputInfo.html#a352e7cd1ef0188c6fb17554641c56061">00221</a>     <a class="code" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a>      <a class="code" href="struct__DMXLocalInputInfo.html#a352e7cd1ef0188c6fb17554641c56061">functions</a>;
+<a name="l00222"></a><a class="code" href="struct__DMXLocalInputInfo.html#aa6c12bcf94eec2868d5cf455ced266c2">00222</a>     <a class="code" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a>     <a class="code" href="struct__DMXLocalInputInfo.html#aa6c12bcf94eec2868d5cf455ced266c2">update_info</a>;     
+<a name="l00225"></a><a class="code" href="struct__DMXLocalInputInfo.html#af0f567a95d587908d2a8570330d904d9">00225</a>     <a class="code" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a>          <a class="code" href="struct__DMXLocalInputInfo.html#af0f567a95d587908d2a8570330d904d9">mCtrl</a>;           
+<a name="l00226"></a><a class="code" href="struct__DMXLocalInputInfo.html#a3a55f25979a430029208654302e31a7d">00226</a>     <a class="code" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a>         <a class="code" href="struct__DMXLocalInputInfo.html#a3a55f25979a430029208654302e31a7d">kCtrl</a>;           
+<a name="l00227"></a><a class="code" href="struct__DMXLocalInputInfo.html#a8793874f7d6e2674206922ee14ee1d87">00227</a>     <a class="code" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a>         <a class="code" href="struct__DMXLocalInputInfo.html#a8793874f7d6e2674206922ee14ee1d87">kBell</a>;           
+<a name="l00229"></a><a class="code" href="struct__DMXLocalInputInfo.html#a25754def501a2713eb09d4ac2401d624">00229</a>     pointer                  <span class="keyword">private</span>;         
+<a name="l00230"></a><a class="code" href="struct__DMXLocalInputInfo.html#a30914bf4af4280ff250adeb3df5ff648">00230</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a30914bf4af4280ff250adeb3df5ff648">isCore</a>;          
+<a name="l00231"></a><a class="code" href="struct__DMXLocalInputInfo.html#afc70bb1491ee209bcba538cc9d4972e4">00231</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#afc70bb1491ee209bcba538cc9d4972e4">sendsCore</a>;       
+<a name="l00232"></a><a class="code" href="struct__DMXLocalInputInfo.html#a6f412eb3d02d256f4be20e1143ec914f">00232</a>     KeybdCtrl                <a class="code" href="struct__DMXLocalInputInfo.html#a6f412eb3d02d256f4be20e1143ec914f">kctrl</a>;           
+<a name="l00233"></a><a class="code" href="struct__DMXLocalInputInfo.html#a9583c2a1867b2d3daf428858ba1ae22e">00233</a>     PtrCtrl                  <a class="code" href="struct__DMXLocalInputInfo.html#a9583c2a1867b2d3daf428858ba1ae22e">mctrl</a>;           
+<a name="l00235"></a><a class="code" href="struct__DMXLocalInputInfo.html#ac126083d907b7c450c94e8317abc20c4">00235</a>     DeviceIntPtr             <a class="code" href="struct__DMXLocalInputInfo.html#ac126083d907b7c450c94e8317abc20c4">pDevice</a>;         
+<a name="l00236"></a><a class="code" href="struct__DMXLocalInputInfo.html#ad21d501f062199855fdb259ae1c38f6a">00236</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#ad21d501f062199855fdb259ae1c38f6a">inputIdx</a>;        
+<a name="l00237"></a><a class="code" href="struct__DMXLocalInputInfo.html#ad19b31d235aed327e6e8871803808ee7">00237</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a65e0e7a4d6928067ba63183c7ddbd03c">lastX</a>, <a class="code" href="struct__DMXLocalInputInfo.html#ad19b31d235aed327e6e8871803808ee7">lastY</a>;    
+<a name="l00241"></a><a class="code" href="struct__DMXLocalInputInfo.html#a41f2eeca657b0ed5e3000a97a965cb44">00241</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a41f2eeca657b0ed5e3000a97a965cb44">head</a>;            
+<a name="l00243"></a><a class="code" href="struct__DMXLocalInputInfo.html#aff792bdb6105dd4b58f57107e8e10ddd">00243</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#aff792bdb6105dd4b58f57107e8e10ddd">tail</a>;            
+<a name="l00245"></a><a class="code" href="struct__DMXLocalInputInfo.html#a82f479f4a5f7f12aebcdbd2967ef9a61">00245</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>            *<a class="code" href="struct__DMXLocalInputInfo.html#a82f479f4a5f7f12aebcdbd2967ef9a61">history</a>;        
+<a name="l00246"></a><a class="code" href="struct__DMXLocalInputInfo.html#a7df8a3276a848aed8937df58755a78ce">00246</a>     <span class="keywordtype">int</span>                      *<a class="code" href="struct__DMXLocalInputInfo.html#a7df8a3276a848aed8937df58755a78ce">valuators</a>;      
+<a name="l00248"></a>00248                                 <span class="comment">/* for XInput ChangePointerDevice */</span>
+<a name="l00249"></a>00249     int                      (*<a class="code" href="struct__DMXLocalInputInfo.html#a27f8606aec1028f80bd9b21c421e78fe">savedMotionProc</a>)(DeviceIntPtr,
+<a name="l00250"></a>00250                                                 xTimecoord *,
+<a name="l00251"></a>00251                                                 <span class="keywordtype">unsigned</span> long,
+<a name="l00252"></a>00252                                                 <span class="keywordtype">unsigned</span> long,
+<a name="l00253"></a>00253                                                 ScreenPtr);
+<a name="l00254"></a><a class="code" href="struct__DMXLocalInputInfo.html#af6c6062b7601a71a4dc0b97ef918f150">00254</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#af6c6062b7601a71a4dc0b97ef918f150">savedMotionEvents</a>; 
+<a name="l00255"></a><a class="code" href="struct__DMXLocalInputInfo.html#a258242cde474bdc4ab120d14a3dcd2cb">00255</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a258242cde474bdc4ab120d14a3dcd2cb">savedSendsCore</a>;    
+<a name="l00257"></a><a class="code" href="struct__DMXLocalInputInfo.html#af8ea073e34c4e927f7f887603aaba17d">00257</a>     <a class="code" href="struct__DMXEventMap.html">DMXEventMap</a>              <a class="code" href="struct__DMXLocalInputInfo.html#af8ea073e34c4e927f7f887603aaba17d">map</a>[<a class="code" href="dmxinputinit_8h.html#a13002c58c62fa0d9c65076f22c4df452">DMX_MAP_ENTRIES</a>]; 
+<a name="l00258"></a><a class="code" href="struct__DMXLocalInputInfo.html#a5595cf8656f17bceb30699a6d215afa5">00258</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXLocalInputInfo.html#a5595cf8656f17bceb30699a6d215afa5">mapOptimize</a>;          
+<a name="l00262"></a><a class="code" href="struct__DMXLocalInputInfo.html#a8d7937dfae270e9c0c91dd9518e25dfb">00262</a>     <span class="keywordtype">long</span>                     <a class="code" href="struct__DMXLocalInputInfo.html#a8d7937dfae270e9c0c91dd9518e25dfb">deviceId</a>;    
+<a name="l00264"></a><a class="code" href="struct__DMXLocalInputInfo.html#afb6dc5839d4cb4063e550a431a41d07e">00264</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXLocalInputInfo.html#afb6dc5839d4cb4063e550a431a41d07e">deviceName</a>; 
+<a name="l00266"></a>00266 } <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoRec</a>;
+<a name="l00267"></a>00267 
+<a name="l00268"></a>00268 <span class="keyword">extern</span> <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="code" href="dmxinputinit_8c.html#ab34ec11967377e32bc0817fb3a8b939e">dmxLocalCorePointer</a>, <a class="code" href="dmxinputinit_8c.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxLocalCoreKeyboard</a>;
+<a name="l00269"></a>00269 
+<a name="l00270"></a>00270 <span class="keyword">extern</span> <span class="keywordtype">void</span>                 <a class="code" href="dmxinputinit_8h.html#a5ed320a98bbcf4d2970316dff3ddb349">dmxLocalInitInput</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00271"></a>00271 <span class="keyword">extern</span> <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> <a class="code" href="dmxinputinit_8c.html#a816d1052ef5a587ef8e16b0005b06662">dmxInputCopyLocal</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput,
+<a name="l00272"></a>00272                                               <a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> s);
+<a name="l00273"></a>00273 
+<a name="l00274"></a>00274 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#aaba396b9c08ac672d3dcf6561ac57b40">dmxChangePointerControl</a>(DeviceIntPtr pDevice, PtrCtrl *ctrl);
+<a name="l00275"></a>00275 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#ad23e145891ad0fb1c909d85ca8e4fe19">dmxKeyboardKbdCtrlProc</a>(DeviceIntPtr pDevice, KeybdCtrl *ctrl);
+<a name="l00276"></a>00276 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxinputinit_8c.html#ab127903bdb6bf262e51f128b4cec4960">dmxKeyboardBellProc</a>(<span class="keywordtype">int</span> percent, DeviceIntPtr pDevice,
+<a name="l00277"></a>00277                                 pointer ctrl, <span class="keywordtype">int</span> unknown);
+<a name="l00278"></a>00278 
+<a name="l00279"></a>00279 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxinputinit_8c.html#ad705be7fbe7dfaf3119a8892e5c54aaa">dmxInputExtensionErrorHandler</a>(Display *dsp, <span class="keywordtype">char</span> *name,
+<a name="l00280"></a>00280                                           <span class="keywordtype">char</span> *reason);
+<a name="l00281"></a>00281 
+<a name="l00282"></a>00282 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxdetach_8c.html#adcf530802f6d092e58a6db38efb0498c">dmxInputDetach</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00283"></a>00283 <span class="keyword">extern</span> <span class="keywordtype">void</span>         <a class="code" href="dmxinputinit_8c.html#adec246343ae8402c7cc47b19020c7ef7">dmxInputDetachAll</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00284"></a>00284 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxinputinit_8c.html#ad7a3f09eeaf98373c261119fba907c47">dmxInputDetachId</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>);
+<a name="l00285"></a>00285 <span class="keyword">extern</span> <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *<a class="code" href="dmxinputinit_8c.html#ae0bcd445301dd91f20c9eb0b6dce0b42">dmxInputLocateId</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>);
+<a name="l00286"></a>00286 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxinputinit_8c.html#ac3f9807875f237589d57ab9f006735af">dmxInputAttachConsole</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *name, <span class="keywordtype">int</span> isCore,
+<a name="l00287"></a>00287                                           <span class="keywordtype">int</span> *<span class="keywordtype">id</span>);
+<a name="l00288"></a>00288 <span class="keyword">extern</span> <span class="keywordtype">int</span>          <a class="code" href="dmxinputinit_8c.html#a2ee085307a1dba7b07fa2eb34639815c">dmxInputAttachBackend</a>(<span class="keywordtype">int</span> physicalScreen, <span class="keywordtype">int</span> isCore,
+<a name="l00289"></a>00289                                           <span class="keywordtype">int</span> *<span class="keywordtype">id</span>);
+<a name="l00290"></a>00290 
+<a name="l00291"></a>00291 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8c.html b/xorg-server/hw/dmx/doc/html/dmxlog_8c.html
index c32a4f9c9..b9c072bfb 100644
--- a/xorg-server/hw/dmx/doc/html/dmxlog_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxlog_8c.html
@@ -6,588 +6,618 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxlog.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "XI.h"</code><br>
-<code>#include "XIproto.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a1">dmxSetLogLevel</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> newLevel)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a2">dmxGetLogLevel</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a3">AbortServer</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a7">dmxLog</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a8">dmxLogCont</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a9">dmxLogOutput</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxlog.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &lt;X11/extensions/XI.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XIproto.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a1fb44232c682fab283ef2726255e8759">dmxSetLogLevel</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> newLevel)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a917ecdf378ddb91bb2aece6583bd449d">dmxGetLogLevel</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a50d079f944b71e881c0c58562f96c6ad">AbortServer</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#af1c88ef4a6df132f586cf7605ca8192a">VFatalError</a> (const char *format, va_list args)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a8944deeabab7bb4d5badd37244ec19f5">dmxHeader</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#ab39e0a74201e4118158bc87063dd4a2e">dmxMessage</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, const char *format, va_list args)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a661111d53827a1a15c715b7b32f05a0e">dmxLogCont</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#aabe50ca33403c25a9e57a06d1d3a089a">dmxLogOutput</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a9ee9ef3403a0905596796cfcac2334d2">dmxLogOutputCont</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a079f70db20eaa2ba22b976851da820b6">dmxLogOutputWarning</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#ac8d8dc0ec631bab1d1d95815c238d574">dmxLogInput</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#afee1d7a707ad9d9b0fd4facacf1b06c0">dmxLogInputCont</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#afc95eb36d0aadc52b34ee3e506f70f7b">dmxLogArgs</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, int argc, char **argv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a6223e183bab18f6eaa27cb29bf5dcfae">dmxLogVisual</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi, int defaultVisual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#a57b865e3469d22f9dedb3cf7dc97ed2e">dmxXInputEventName</a> (int type)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#ad06725902753399035cb0ebde9c45e9a">dmxEventName</a> (int type)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8c.html#adec7b3dba0fe95f6ff8c96575cbd29b1">dmxCurrentLogLevel</a> = dmxDebug</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file encapsulated all of the logging functions that are used by DMX for informational, warning, and error messages. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a50d079f944b71e881c0c58562f96c6ad"></a><!-- doxytag: member="dmxlog.c::AbortServer" ref="a50d079f944b71e881c0c58562f96c6ad" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void AbortServer </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>This function was removed between XFree86 4.3.0 and XFree86 4.4.0. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a10">dmxLogOutputCont</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00101">VFatalError()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a11">dmxLogOutputWarning</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ad06725902753399035cb0ebde9c45e9a"></a><!-- doxytag: member="dmxlog.c::dmxEventName" ref="ad06725902753399035cb0ebde9c45e9a" args="(int type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* dmxEventName </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Translate an event <em>type</em> into a human-readable string. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a12">dmxLogInput</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const  char *format,...)</td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, and <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a13">dmxLogInputCont</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const  char *format,...)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a917ecdf378ddb91bb2aece6583bd449d"></a><!-- doxytag: member="dmxlog.c::dmxGetLogLevel" ref="a917ecdf378ddb91bb2aece6583bd449d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> dmxGetLogLevel </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns the log level set by <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a14">dmxLogArgs</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, int argc, char **argv)</td></tr>
+<p>References <a class="el" href="dmxlog_8c_source.html#l00048">dmxCurrentLogLevel</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a15">dmxLogVisual</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi, int defaultVisual)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8944deeabab7bb4d5badd37244ec19f5"></a><!-- doxytag: member="dmxlog.c::dmxHeader" ref="a8944deeabab7bb4d5badd37244ec19f5" args="(dmxLogLevel logLevel, DMXInputInfo *dmxInput, DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxHeader </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a16">dmxXInputEventName</a> (int type)</td></tr>
+<p>References <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8h_source.html#l00048">dmxError</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxinput_8h_source.html#l00090">_DMXInputInfo::inputIdx</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmxinput_8h_source.html#l00085">_DMXInputInfo::name</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8c.html#a17">dmxEventName</a> (int type)</td></tr>
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, and <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file encapsulated all of the logging functions that are used by DMX for informational, warning, and error messages.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxlog.c::AbortServer" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void AbortServer </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+</div>
+<a class="anchor" id="ab6259430a57c3cffdfc9f6259df0ad23"></a><!-- doxytag: member="dmxlog.c::dmxLog" ref="ab6259430a57c3cffdfc9f6259df0ad23" args="(dmxLogLevel logLevel, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxLog </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function was removed between XFree86 4.3.0 and XFree86 4.4.0.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxlog.c::dmxEventName" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxEventName </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>type</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Translate an event <em>type</em> into a human-readable string.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxlog.c::dmxGetLogLevel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> dmxGetLogLevel </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns the log level set by <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxlog.c::dmxLog" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log the specified message at the specified <em>logLevel</em>. <em>format</em> can be a printf-like format expression. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00144">dmxConfigStoreConfig()</a>, <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00135">dmxConfigStoreFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00424">dmxConfigWriteFile()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00623">dmxConsoleCreateEmptyCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, <a class="el" href="dmxevents_8c_source.html#l00520">dmxGetButtonMapping()</a>, <a class="el" href="dmxfont_8c_source.html#l00062">dmxGetFontPath()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxlog_8c_source.html#l00242">dmxLogArgs()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afc95eb36d0aadc52b34ee3e506f70f7b"></a><!-- doxytag: member="dmxlog.c::dmxLogArgs" ref="afc95eb36d0aadc52b34ee3e506f70f7b" args="(dmxLogLevel logLevel, int argc, char **argv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLog </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLogArgs </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>argv</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log the specified message at the specified <em>logLevel</em>. <em>format</em> can be a printf-like format expression.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxlog.c::dmxLogArgs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Print <em>argc</em> messages, each describing an element in <em>argv</em>. This is maingly for debugging purposes. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a661111d53827a1a15c715b7b32f05a0e"></a><!-- doxytag: member="dmxlog.c::dmxLogCont" ref="a661111d53827a1a15c715b7b32f05a0e" args="(dmxLogLevel logLevel, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogArgs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLogCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char **&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Print <em>argc</em> messages, each describing an element in <em>argv</em>. This is maingly for debugging purposes.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxlog.c::dmxLogCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a log message without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac8d8dc0ec631bab1d1d95815c238d574"></a><!-- doxytag: member="dmxlog.c::dmxLogInput" ref="ac8d8dc0ec631bab1d1d95815c238d574" args="(DMXInputInfo *dmxInput, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLogInput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a log message without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxlog.c::dmxLogInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log an informational message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>) related to input. The message prefix will contain information from <em>dmxInput</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afee1d7a707ad9d9b0fd4facacf1b06c0"></a><!-- doxytag: member="dmxlog.c::dmxLogInputCont" ref="afee1d7a707ad9d9b0fd4facacf1b06c0" args="(DMXInputInfo *dmxInput, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxLogInputCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log an informational message (at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a>) related to input. The message prefix will contain information from <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxlog.c::dmxLogInputCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a message related to input without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aabe50ca33403c25a9e57a06d1d3a089a"></a><!-- doxytag: member="dmxlog.c::dmxLogOutput" ref="aabe50ca33403c25a9e57a06d1d3a089a" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogInputCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxLogOutput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a message related to input without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxlog.c::dmxLogOutput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log an informational message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>) related to ouput. The message prefix will contain backend information from <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9ee9ef3403a0905596796cfcac2334d2"></a><!-- doxytag: member="dmxlog.c::dmxLogOutputCont" ref="a9ee9ef3403a0905596796cfcac2334d2" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogOutputCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log an informational message (at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a>) related to ouput. The message prefix will contain backend information from <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxlog.c::dmxLogOutputCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a message related to output without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a079f70db20eaa2ba22b976851da820b6"></a><!-- doxytag: member="dmxlog.c::dmxLogOutputWarning" ref="a079f70db20eaa2ba22b976851da820b6" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutputCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogOutputWarning </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a message related to output without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxlog.c::dmxLogOutputWarning" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log a warning message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxWarning</a>) related to output. The message prefix will contain backend information from <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, and <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6223e183bab18f6eaa27cb29bf5dcfae"></a><!-- doxytag: member="dmxlog.c::dmxLogVisual" ref="a6223e183bab18f6eaa27cb29bf5dcfae" args="(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutputWarning </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogVisual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">XVisualInfo *&nbsp;</td>
+          <td class="paramname"> <em>vi</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>defaultVisual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log a warning message (at level <a class="el" href="dmxlog_8h.html#a18a2">dmxWarning</a>) related to output. The message prefix will contain backend information from <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxlog.c::dmxLogVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Print messages at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a> describing the visuals in <em>vi</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, and <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab39e0a74201e4118158bc87063dd4a2e"></a><!-- doxytag: member="dmxlog.c::dmxMessage" ref="ab39e0a74201e4118158bc87063dd4a2e" args="(dmxLogLevel logLevel, const char *format, va_list args)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">static void dmxMessage </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>XVisualInfo *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vi</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>defaultVisual</em></td>
+          <td class="paramtype">va_list&nbsp;</td>
+          <td class="paramname"> <em>args</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Print messages at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a> describing the visuals in <em>vi</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxlog.c::dmxSetLogLevel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00048">dmxCurrentLogLevel</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, and <a class="el" href="dmxlog_8c_source.html#l00101">VFatalError()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00170">dmxLogCont()</a>, <a class="el" href="dmxlog_8c_source.html#l00219">dmxLogInput()</a>, <a class="el" href="dmxlog_8c_source.html#l00231">dmxLogInputCont()</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00195">dmxLogOutputCont()</a>, and <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1fb44232c682fab283ef2726255e8759"></a><!-- doxytag: member="dmxlog.c::dmxSetLogLevel" ref="a1fb44232c682fab283ef2726255e8759" args="(dmxLogLevel newLevel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> dmxSetLogLevel </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>newLevel</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> dmxSetLogLevel </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>newLevel</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set the default level for logging to <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>. Returns the previous log level. </p>
 
+<p>References <a class="el" href="dmxlog_8c_source.html#l00048">dmxCurrentLogLevel</a>, and <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a57b865e3469d22f9dedb3cf7dc97ed2e"></a><!-- doxytag: member="dmxlog.c::dmxXInputEventName" ref="a57b865e3469d22f9dedb3cf7dc97ed2e" args="(int type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* dmxXInputEventName </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the default level for logging to <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>. Returns the previous log level.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxlog.c::dmxXInputEventName" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Translate a (normalized) XInput event <em>type</em> into a human-readable string. </p>
+
+</div>
+</div>
+<a class="anchor" id="af1c88ef4a6df132f586cf7605ca8192a"></a><!-- doxytag: member="dmxlog.c::VFatalError" ref="af1c88ef4a6df132f586cf7605ca8192a" args="(const char *format, va_list args)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void VFatalError </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxXInputEventName </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>type</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">va_list&nbsp;</td>
+          <td class="paramname"> <em>args</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxlog_8c.html#a50d079f944b71e881c0c58562f96c6ad">AbortServer()</a>, and <a class="el" href="dmxinit_8c_source.html#l00873">OsVendorFatalError()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="adec7b3dba0fe95f6ff8c96575cbd29b1"></a><!-- doxytag: member="dmxlog.c::dmxCurrentLogLevel" ref="adec7b3dba0fe95f6ff8c96575cbd29b1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> <a class="el" href="dmxlog_8c.html#adec7b3dba0fe95f6ff8c96575cbd29b1">dmxCurrentLogLevel</a> = dmxDebug<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Translate a (normalized) XInput event <em>type</em> into a human-readable string.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxlog_8c_source.html#l00061">dmxGetLogLevel()</a>, <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>, and <a class="el" href="dmxlog_8c_source.html#l00052">dmxSetLogLevel()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html
deleted file mode 100644
index a345bd809..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxlog_8h-source.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxlog.h</h1><a href="dmxlog_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00039 <span class="preprocessor">#ifndef _DMXLOG_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define _DMXLOG_H_</span>
-00041 <span class="preprocessor"></span>
-<a name="l00043"></a><a class="code" href="dmxlog_8h.html#a18">00043</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00044     <a class="code" href="dmxlog_8h.html#a18a0">dmxDebug</a>,                   
-00045     <a class="code" href="dmxlog_8h.html#a18a1">dmxInfo</a>,                    
-00046     <a class="code" href="dmxlog_8h.html#a18a2">dmxWarning</a>,                 
-00049     <a class="code" href="dmxlog_8h.html#a18a3">dmxError</a>,                   
-00052     <a class="code" href="dmxlog_8h.html#a18a4">dmxFatal</a>                    
-00054 } <a class="code" href="dmxlog_8h.html#a18">dmxLogLevel</a>;
-00055 
-00056 <span class="comment">/* Logging functions used by Xserver/hw/dmx routines. */</span>
-00057 <span class="keyword">extern</span> <a class="code" href="dmxlog_8h.html#a18">dmxLogLevel</a> <a class="code" href="dmxlog_8c.html#a1">dmxSetLogLevel</a>(dmxLogLevel newLevel);
-00058 <span class="keyword">extern</span> <a class="code" href="dmxlog_8h.html#a18">dmxLogLevel</a> <a class="code" href="dmxlog_8c.html#a2">dmxGetLogLevel</a>(<span class="keywordtype">void</span>);
-00059 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxlog_8c.html#a7">dmxLog</a>(dmxLogLevel logLevel, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00060 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxlog_8c.html#a8">dmxLogCont</a>(dmxLogLevel logLevel, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00061 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>  *<a class="code" href="dmxlog_8c.html#a17">dmxEventName</a>(<span class="keywordtype">int</span> type);
-00062 
-00063 <span class="preprocessor">#ifndef DMX_LOG_STANDALONE</span>
-00064 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a9">dmxLogOutput</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00065 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a10">dmxLogOutputCont</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format,
-00066                              ...);
-00067 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a11">dmxLogOutputWarning</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format,
-00068                                 ...);
-00069 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a12">dmxLogInput</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00070 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a13">dmxLogInputCont</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00071 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a14">dmxLogArgs</a>(dmxLogLevel logLevel, <span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> **argv);
-00072 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a15">dmxLogVisual</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi,
-00073                          <span class="keywordtype">int</span> defaultVisual);
-00074 <span class="preprocessor">#ifdef XINPUT</span>
-00075 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="dmxlog_8c.html#a16">dmxXInputEventName</a>(<span class="keywordtype">int</span> type);
-00076 <span class="preprocessor">#endif</span>
-00077 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00078 <span class="preprocessor"></span>
-00079 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h.html
index 6092d1339..09e824217 100644
--- a/xorg-server/hw/dmx/doc/html/dmxlog_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxlog_8h.html
@@ -6,602 +6,511 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxlog.h File Reference</h1>
-<p>
-<a href="dmxlog_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> { <br>
-&nbsp;&nbsp;<a class="el" href="dmxlog_8h.html#a18a0">dmxDebug</a>, 
-<a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a>, 
-<a class="el" href="dmxlog_8h.html#a18a2">dmxWarning</a>, 
-<a class="el" href="dmxlog_8h.html#a18a3">dmxError</a>, 
-<br>
-&nbsp;&nbsp;<a class="el" href="dmxlog_8h.html#a18a4">dmxFatal</a>
-<br>
+<p><a href="dmxlog_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> { <br/>
+&nbsp;&nbsp;<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe">dmxDebug</a>, 
+<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>, 
+<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxWarning</a>, 
+<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890">dmxError</a>, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70">dmxFatal</a>
+<br/>
  }</td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a5">dmxSetLogLevel</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> newLevel)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a6">dmxGetLogLevel</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a7">dmxLog</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a8">dmxLogCont</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a9">dmxEventName</a> (int type)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a10">dmxLogOutput</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a11">dmxLogOutputCont</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a12">dmxLogOutputWarning</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a13">dmxLogInput</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a14">dmxLogInputCont</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const  char *format,...)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a15">dmxLogArgs</a> (<a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> logLevel, int argc, char **argv)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a16">dmxLogVisual</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi, int defaultVisual)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxlog_8h.html#a17">dmxXInputEventName</a> (int type)</td></tr>
-
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a1fb44232c682fab283ef2726255e8759">dmxSetLogLevel</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> newLevel)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a917ecdf378ddb91bb2aece6583bd449d">dmxGetLogLevel</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a661111d53827a1a15c715b7b32f05a0e">dmxLogCont</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#ad06725902753399035cb0ebde9c45e9a">dmxEventName</a> (int type)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#aabe50ca33403c25a9e57a06d1d3a089a">dmxLogOutput</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a9ee9ef3403a0905596796cfcac2334d2">dmxLogOutputCont</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a079f70db20eaa2ba22b976851da820b6">dmxLogOutputWarning</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#ac8d8dc0ec631bab1d1d95815c238d574">dmxLogInput</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#afee1d7a707ad9d9b0fd4facacf1b06c0">dmxLogInputCont</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#afc95eb36d0aadc52b34ee3e506f70f7b">dmxLogArgs</a> (<a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, int argc, char **argv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a6223e183bab18f6eaa27cb29bf5dcfae">dmxLogVisual</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi, int defaultVisual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxlog_8h.html#a57b865e3469d22f9dedb3cf7dc97ed2e">dmxXInputEventName</a> (int type)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This header is included by all files that need to use the DMX logging facilities.<hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a18" doxytag="dmxlog.h::dmxLogLevel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> enum <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This header is included by all files that need to use the DMX logging facilities. </p>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917f"></a><!-- doxytag: member="dmxlog.h::dmxLogLevel" ref="aeed612a5c0be196e23bd6b71b76b917f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Logging levels -- output is tunable with <a class="el" href="dmxlog_8h.html#a5">dmxSetLogLevel</a>. <dl compact><dt><b>Enumeration values: </b></dt><dd>
-<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a class="anchor" name="a18a0" doxytag="dmxDebug" ></a>dmxDebug</em>&nbsp;</td><td>
-Usually verbose debugging info </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a18a1" doxytag="dmxInfo" ></a>dmxInfo</em>&nbsp;</td><td>
-Non-warning information </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a18a2" doxytag="dmxWarning" ></a>dmxWarning</em>&nbsp;</td><td>
-A warning that may indicate DMX will not function as the user intends. </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a18a3" doxytag="dmxError" ></a>dmxError</em>&nbsp;</td><td>
-A non-fatal error that probably indicates DMX will not function as desired. </td></tr>
-<tr><td valign=top><em><a class="anchor" name="a18a4" doxytag="dmxFatal" ></a>dmxFatal</em>&nbsp;</td><td>
-A fatal error that will cause DMX to shut down. </td></tr>
+</div>
+<div class="memdoc">
+<p>Logging levels -- output is tunable with <a class="el" href="dmxlog_8h.html#a1fb44232c682fab283ef2726255e8759">dmxSetLogLevel</a>. </p>
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe"></a><!-- doxytag: member="dmxDebug" ref="aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe" args="" -->dmxDebug</em>&nbsp;</td><td>
+<p>Usually verbose debugging info </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea"></a><!-- doxytag: member="dmxInfo" ref="aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea" args="" -->dmxInfo</em>&nbsp;</td><td>
+<p>Non-warning information </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a"></a><!-- doxytag: member="dmxWarning" ref="aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a" args="" -->dmxWarning</em>&nbsp;</td><td>
+<p>A warning that may indicate DMX will not function as the user intends. </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890"></a><!-- doxytag: member="dmxError" ref="aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890" args="" -->dmxError</em>&nbsp;</td><td>
+<p>A non-fatal error that probably indicates DMX will not function as desired. </p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70"></a><!-- doxytag: member="dmxFatal" ref="aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70" args="" -->dmxFatal</em>&nbsp;</td><td>
+<p>A fatal error that will cause DMX to shut down. </p>
+</td></tr>
 </table>
+</dd>
 </dl>
-    </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a9" doxytag="dmxlog.h::dmxEventName" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ad06725902753399035cb0ebde9c45e9a"></a><!-- doxytag: member="dmxlog.h::dmxEventName" ref="ad06725902753399035cb0ebde9c45e9a" args="(int type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxEventName </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>type</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const char* dmxEventName </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Translate an event <em>type</em> into a human-readable string.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxlog.h::dmxGetLogLevel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Translate an event <em>type</em> into a human-readable string. </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, and <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a917ecdf378ddb91bb2aece6583bd449d"></a><!-- doxytag: member="dmxlog.h::dmxGetLogLevel" ref="a917ecdf378ddb91bb2aece6583bd449d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> dmxGetLogLevel </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> dmxGetLogLevel </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns the log level set by <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxlog.h::dmxLog" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Returns the log level set by <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00048">dmxCurrentLogLevel</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab6259430a57c3cffdfc9f6259df0ad23"></a><!-- doxytag: member="dmxlog.h::dmxLog" ref="ab6259430a57c3cffdfc9f6259df0ad23" args="(dmxLogLevel logLevel, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLog </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLog </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log the specified message at the specified <em>logLevel</em>. <em>format</em> can be a printf-like format expression.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxlog.h::dmxLogArgs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log the specified message at the specified <em>logLevel</em>. <em>format</em> can be a printf-like format expression. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxcommon_8c_source.html#l00310">dmxCommonOthOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00144">dmxConfigStoreConfig()</a>, <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00135">dmxConfigStoreFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>, <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00424">dmxConfigWriteFile()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00623">dmxConsoleCreateEmptyCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00189">dmxConsoleDrawWindows()</a>, <a class="el" href="dmxconsole_8c_source.html#l00895">dmxConsoleFunctions()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>, <a class="el" href="dmxinit_8c_source.html#l00125">dmxErrorHandler()</a>, <a class="el" href="dmxevents_8c_source.html#l00632">dmxFixup()</a>, <a class="el" href="dmxevents_8c_source.html#l00520">dmxGetButtonMapping()</a>, <a class="el" href="dmxfont_8c_source.html#l00062">dmxGetFontPath()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxlog_8c_source.html#l00242">dmxLogArgs()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>, <a class="el" href="dmxinput_8c_source.html#l00064">InitInput()</a>, <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afc95eb36d0aadc52b34ee3e506f70f7b"></a><!-- doxytag: member="dmxlog.h::dmxLogArgs" ref="afc95eb36d0aadc52b34ee3e506f70f7b" args="(dmxLogLevel logLevel, int argc, char **argv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogArgs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLogArgs </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char **&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em></td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>argv</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Print <em>argc</em> messages, each describing an element in <em>argv</em>. This is maingly for debugging purposes.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxlog.h::dmxLogCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Print <em>argc</em> messages, each describing an element in <em>argv</em>. This is maingly for debugging purposes. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a661111d53827a1a15c715b7b32f05a0e"></a><!-- doxytag: member="dmxlog.h::dmxLogCont" ref="a661111d53827a1a15c715b7b32f05a0e" args="(dmxLogLevel logLevel, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>logLevel</em>, </td>
+          <td class="memname">void dmxLogCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>logLevel</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a log message without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxlog.h::dmxLogInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a log message without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac8d8dc0ec631bab1d1d95815c238d574"></a><!-- doxytag: member="dmxlog.h::dmxLogInput" ref="ac8d8dc0ec631bab1d1d95815c238d574" args="(DMXInputInfo *dmxInput, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxLogInput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log an informational message (at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a>) related to input. The message prefix will contain information from <em>dmxInput</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxlog.h::dmxLogInputCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log an informational message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>) related to input. The message prefix will contain information from <em>dmxInput</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00621">dmxCommonRestoreState()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afee1d7a707ad9d9b0fd4facacf1b06c0"></a><!-- doxytag: member="dmxlog.h::dmxLogInputCont" ref="afee1d7a707ad9d9b0fd4facacf1b06c0" args="(DMXInputInfo *dmxInput, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogInputCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxLogInputCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a message related to input without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxlog.h::dmxLogOutput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a message related to input without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aabe50ca33403c25a9e57a06d1d3a089a"></a><!-- doxytag: member="dmxlog.h::dmxLogOutput" ref="aabe50ca33403c25a9e57a06d1d3a089a" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogOutput </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log an informational message (at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a>) related to ouput. The message prefix will contain backend information from <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxlog.h::dmxLogOutputCont" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log an informational message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>) related to ouput. The message prefix will contain backend information from <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxlog_8c_source.html#l00250">dmxLogVisual()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9ee9ef3403a0905596796cfcac2334d2"></a><!-- doxytag: member="dmxlog.h::dmxLogOutputCont" ref="a9ee9ef3403a0905596796cfcac2334d2" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutputCont </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogOutputCont </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Continue a message related to output without printing the message prefix.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxlog.h::dmxLogOutputWarning" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Continue a message related to output without printing the message prefix. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, and <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, and <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a079f70db20eaa2ba22b976851da820b6"></a><!-- doxytag: member="dmxlog.h::dmxLogOutputWarning" ref="a079f70db20eaa2ba22b976851da820b6" args="(DMXScreenInfo *dmxScreen, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogOutputWarning </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogOutputWarning </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Log a warning message (at level <a class="el" href="dmxlog_8h.html#a18a2">dmxWarning</a>) related to output. The message prefix will contain backend information from <em>dmxScreen</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxlog.h::dmxLogVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Log a warning message (at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxWarning</a>) related to output. The message prefix will contain backend information from <em>dmxScreen</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxlog_8c_source.html#l00149">dmxMessage()</a>, and <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, and <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6223e183bab18f6eaa27cb29bf5dcfae"></a><!-- doxytag: member="dmxlog.h::dmxLogVisual" ref="a6223e183bab18f6eaa27cb29bf5dcfae" args="(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxLogVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxLogVisual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>XVisualInfo *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vi</em>, </td>
+          <td class="paramtype">XVisualInfo *&nbsp;</td>
+          <td class="paramname"> <em>vi</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>defaultVisual</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>defaultVisual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Print messages at level <a class="el" href="dmxlog_8h.html#a18a1">dmxInfo</a> describing the visuals in <em>vi</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxlog.h::dmxSetLogLevel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Print messages at level <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a> describing the visuals in <em>vi</em>. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, and <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1fb44232c682fab283ef2726255e8759"></a><!-- doxytag: member="dmxlog.h::dmxSetLogLevel" ref="a1fb44232c682fab283ef2726255e8759" args="(dmxLogLevel newLevel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a> dmxSetLogLevel </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>newLevel</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> dmxSetLogLevel </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>&nbsp;</td>
+          <td class="paramname"> <em>newLevel</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the default level for logging to <a class="el" href="dmxlog_8h.html#a18">dmxLogLevel</a>. Returns the previous log level.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxlog.h::dmxXInputEventName" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set the default level for logging to <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>. Returns the previous log level. </p>
+
+<p>References <a class="el" href="dmxlog_8c_source.html#l00048">dmxCurrentLogLevel</a>, and <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a57b865e3469d22f9dedb3cf7dc97ed2e"></a><!-- doxytag: member="dmxlog.h::dmxXInputEventName" ref="a57b865e3469d22f9dedb3cf7dc97ed2e" args="(int type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* dmxXInputEventName </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>type</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const char* dmxXInputEventName </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Translate a (normalized) XInput event <em>type</em> into a human-readable string.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Translate a (normalized) XInput event <em>type</em> into a human-readable string. </p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html
new file mode 100644
index 000000000..f87d72102
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxlog_8h_source.html
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxlog.h</h1><a href="dmxlog_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef _DMXLOG_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXLOG_H_</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00042"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">00042</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00043"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe">00043</a>     <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe">dmxDebug</a>,                   
+<a name="l00044"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">00044</a>     <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxInfo</a>,                    
+<a name="l00045"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">00045</a>     <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxWarning</a>,                 
+<a name="l00048"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890">00048</a>     <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890">dmxError</a>,                   
+<a name="l00051"></a><a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70">00051</a>     <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70">dmxFatal</a>                    
+<a name="l00053"></a>00053 } <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a>;
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="comment">/* Logging functions used by Xserver/hw/dmx routines. */</span>
+<a name="l00056"></a>00056 <span class="keyword">extern</span> <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> <a class="code" href="dmxlog_8c.html#a1fb44232c682fab283ef2726255e8759">dmxSetLogLevel</a>(<a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> newLevel);
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> <a class="code" href="dmxlog_8c.html#a917ecdf378ddb91bb2aece6583bd449d">dmxGetLogLevel</a>(<span class="keywordtype">void</span>);
+<a name="l00058"></a>00058 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxlog_8c.html#ab6259430a57c3cffdfc9f6259df0ad23">dmxLog</a>(<a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxlog_8c.html#a661111d53827a1a15c715b7b32f05a0e">dmxLogCont</a>(<a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00060"></a>00060 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>  *<a class="code" href="dmxlog_8c.html#ad06725902753399035cb0ebde9c45e9a">dmxEventName</a>(<span class="keywordtype">int</span> type);
+<a name="l00061"></a>00061 
+<a name="l00062"></a>00062 <span class="preprocessor">#ifndef DMX_LOG_STANDALONE</span>
+<a name="l00063"></a>00063 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#aabe50ca33403c25a9e57a06d1d3a089a">dmxLogOutput</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00064"></a>00064 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a9ee9ef3403a0905596796cfcac2334d2">dmxLogOutputCont</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format,
+<a name="l00065"></a>00065                              ...);
+<a name="l00066"></a>00066 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a079f70db20eaa2ba22b976851da820b6">dmxLogOutputWarning</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *format,
+<a name="l00067"></a>00067                                 ...);
+<a name="l00068"></a>00068 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#ac8d8dc0ec631bab1d1d95815c238d574">dmxLogInput</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00069"></a>00069 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#afee1d7a707ad9d9b0fd4facacf1b06c0">dmxLogInputCont</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00070"></a>00070 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#afc95eb36d0aadc52b34ee3e506f70f7b">dmxLogArgs</a>(<a class="code" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxLogLevel</a> logLevel, <span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> **argv);
+<a name="l00071"></a>00071 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxlog_8c.html#a6223e183bab18f6eaa27cb29bf5dcfae">dmxLogVisual</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, XVisualInfo *vi,
+<a name="l00072"></a>00072                          <span class="keywordtype">int</span> defaultVisual);
+<a name="l00073"></a>00073 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="dmxlog_8c.html#a57b865e3469d22f9dedb3cf7dc97ed2e">dmxXInputEventName</a>(<span class="keywordtype">int</span> type);
+<a name="l00074"></a>00074 <span class="preprocessor">#endif</span>
+<a name="l00075"></a>00075 <span class="preprocessor"></span>
+<a name="l00076"></a>00076 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxmap_8c.html
index b4230ca30..4f2c9c964 100644
--- a/xorg-server/hw/dmx/doc/html/dmxmap_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxmap_8c.html
@@ -6,136 +6,127 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxmap.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmap_8h-source.html">dmxmap.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8c.html#a0">dmxMapInsert</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent, int serverEvent)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8c.html#a1">dmxMapClear</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8c.html#a2">dmxMapLookup</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxmap.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmap_8h_source.html">dmxmap.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8c.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent, int serverEvent)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8c.html#a27107d43f96e7c09241d7ef0b5e9c0f5">dmxMapClear</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8c.html#abc1a46c87c4acd45e4e5f79370be6169">dmxMapLookup</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements a mapping from remote XInput event types to Xdmx XInput event types.<p>
-The exglobals.h file defines global server-side variables with names Device* to be integers that hold the value of the type of the server-side XInput extension event.<p>
-The client-side X11/extensions/XInput.h file defines macros with THE EXACT SAME Device* names!<p>
-Using those macros to extract remote server event type values from the (opaque) XDevice structure is appropriate, but makes a direct mapping to the Device* integers impossible. So we use the normalized XI_Device* names for these routines.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxmap.c::dmxMapClear" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file implements a mapping from remote XInput event types to Xdmx XInput event types.</p>
+<p>The exglobals.h file defines global server-side variables with names Device* to be integers that hold the value of the type of the server-side XInput extension event.</p>
+<p>The client-side X11/extensions/XInput.h file defines macros with THE EXACT SAME Device* names!</p>
+<p>Using those macros to extract remote server event type values from the (opaque) XDevice structure is appropriate, but makes a direct mapping to the Device* integers impossible. So we use the normalized XI_Device* names for these routines. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a27107d43f96e7c09241d7ef0b5e9c0f5"></a><!-- doxytag: member="dmxmap.c::dmxMapClear" ref="a27107d43f96e7c09241d7ef0b5e9c0f5" args="(DMXLocalInputInfoPtr dmxLocal)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMapClear </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxLocal</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxMapClear </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Remove all mappings there were inserted with <a class="el" href="dmxmap_8h.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a>. </p>
 
-<p>
-Remove all mappings there were inserted with <a class="el" href="dmxmap_8h.html#a0">dmxMapInsert</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxmap.c::dmxMapInsert" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ada5a28e0c746708e0f5c45e9e193d907"></a><!-- doxytag: member="dmxmap.c::dmxMapInsert" ref="ada5a28e0c746708e0f5c45e9e193d907" args="(DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMapInsert </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxLocal</em>, </td>
+          <td class="memname">void dmxMapInsert </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>remoteEvent</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>remoteEvent</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>serverEvent</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>serverEvent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a mapping from <em>remoteEvent</em> to <em>serverEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The <em>serverEvent</em> is from the XI_* list of events in include/extensions/XIproto.h. </p>
 
-<p>
-Create a mapping from <em>remoteEvent</em> to <em>serverEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The <em>serverEvent</em> is from the XI_* list of events in include/extensions/XIproto.h.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxmap.c::dmxMapLookup" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00053">DMX_MAP_MASK</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00176">_DMXEventMap::server</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abc1a46c87c4acd45e4e5f79370be6169"></a><!-- doxytag: member="dmxmap.c::dmxMapLookup" ref="abc1a46c87c4acd45e4e5f79370be6169" args="(DMXLocalInputInfoPtr dmxLocal, int remoteEvent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxMapLookup </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxLocal</em>, </td>
+          <td class="memname">int dmxMapLookup </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>remoteEvent</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>remoteEvent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Lookup a mapping for <em>remoteEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The return value is that which was passed into <a class="el" href="dmxmap_8h.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a> (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned. </p>
 
-<p>
-Lookup a mapping for <em>remoteEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The return value is that which was passed into <a class="el" href="dmxmap_8h.html#a0">dmxMapInsert</a> (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00053">DMX_MAP_MASK</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00176">_DMXEventMap::server</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html
deleted file mode 100644
index 8a9d6b31c..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxmap_8h-source.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxmap.h</h1><a href="dmxmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2003 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> */</span>
-00033 
-00037 <span class="preprocessor">#ifndef _DMXMAP_H_</span>
-00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXMAP_H_</span>
-00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmap_8c.html#a0">dmxMapInsert</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal,
-00040                          <span class="keywordtype">int</span> remoteEvent, <span class="keywordtype">int</span> serverEvent);
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmap_8c.html#a1">dmxMapClear</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal);
-00042 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmap_8c.html#a2">dmxMapLookup</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, <span class="keywordtype">int</span> remoteEvent);
-00043 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h.html
index db69ac6b2..6bf841b00 100644
--- a/xorg-server/hw/dmx/doc/html/dmxmap_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxmap_8h.html
@@ -6,134 +6,125 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxmap.h File Reference</h1>
-<p>
-<a href="dmxmap_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8h.html#a0">dmxMapInsert</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent, int serverEvent)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8h.html#a1">dmxMapClear</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmap_8h.html#a2">dmxMapLookup</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent)</td></tr>
-
+<p><a href="dmxmap_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8h.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent, int serverEvent)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8h.html#a27107d43f96e7c09241d7ef0b5e9c0f5">dmxMapClear</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmap_8h.html#abc1a46c87c4acd45e4e5f79370be6169">dmxMapLookup</a> (<a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, int remoteEvent)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to XInput event mapping support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxmap_8c.html">dmxmap.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxmap.h::dmxMapClear" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to XInput event mapping support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxmap_8c.html">dmxmap.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a27107d43f96e7c09241d7ef0b5e9c0f5"></a><!-- doxytag: member="dmxmap.h::dmxMapClear" ref="a27107d43f96e7c09241d7ef0b5e9c0f5" args="(DMXLocalInputInfoPtr dmxLocal)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMapClear </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxLocal</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxMapClear </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Remove all mappings there were inserted with <a class="el" href="dmxmap_8h.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a>. </p>
 
-<p>
-Remove all mappings there were inserted with <a class="el" href="dmxmap_8h.html#a0">dmxMapInsert</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxmap.h::dmxMapInsert" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ada5a28e0c746708e0f5c45e9e193d907"></a><!-- doxytag: member="dmxmap.h::dmxMapInsert" ref="ada5a28e0c746708e0f5c45e9e193d907" args="(DMXLocalInputInfoPtr dmxLocal, int remoteEvent, int serverEvent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxMapInsert </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxLocal</em>, </td>
+          <td class="memname">void dmxMapInsert </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>remoteEvent</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>remoteEvent</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>serverEvent</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>serverEvent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a mapping from <em>remoteEvent</em> to <em>serverEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The <em>serverEvent</em> is from the XI_* list of events in include/extensions/XIproto.h. </p>
 
-<p>
-Create a mapping from <em>remoteEvent</em> to <em>serverEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The <em>serverEvent</em> is from the XI_* list of events in include/extensions/XIproto.h.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxmap.h::dmxMapLookup" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00053">DMX_MAP_MASK</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00176">_DMXEventMap::server</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abc1a46c87c4acd45e4e5f79370be6169"></a><!-- doxytag: member="dmxmap.h::dmxMapLookup" ref="abc1a46c87c4acd45e4e5f79370be6169" args="(DMXLocalInputInfoPtr dmxLocal, int remoteEvent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxMapLookup </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxLocal</em>, </td>
+          <td class="memname">int dmxMapLookup </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>dmxLocal</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>remoteEvent</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>remoteEvent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Lookup a mapping for <em>remoteEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The return value is that which was passed into <a class="el" href="dmxmap_8h.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a> (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned. </p>
 
-<p>
-Lookup a mapping for <em>remoteEvent</em>. The <em>remoteEvent</em> is the type returned from the remote server. The return value is that which was passed into <a class="el" href="dmxmap_8h.html#a0">dmxMapInsert</a> (i.e., a value from the XI_* list in include/extensions/XIproto.h). If a mapping is not available, -1 is returned.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00052">DMX_MAP_ENTRIES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00053">DMX_MAP_MASK</a>, <a class="el" href="dmxinputinit_8h_source.html#l00257">_DMXLocalInputInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00258">_DMXLocalInputInfo::mapOptimize</a>, <a class="el" href="dmxinputinit_8h_source.html#l00175">_DMXEventMap::remote</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00176">_DMXEventMap::server</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html
new file mode 100644
index 000000000..191eb7c86
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxmap_8h_source.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxmap.h</h1><a href="dmxmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2003 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> */</span>
+<a name="l00032"></a>00032 
+<a name="l00036"></a>00036 <span class="preprocessor">#ifndef _DMXMAP_H_</span>
+<a name="l00037"></a>00037 <span class="preprocessor"></span><span class="preprocessor">#define _DMXMAP_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmap_8c.html#ada5a28e0c746708e0f5c45e9e193d907">dmxMapInsert</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal,
+<a name="l00039"></a>00039                          <span class="keywordtype">int</span> remoteEvent, <span class="keywordtype">int</span> serverEvent);
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmap_8c.html#a27107d43f96e7c09241d7ef0b5e9c0f5">dmxMapClear</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmap_8c.html#abc1a46c87c4acd45e4e5f79370be6169">dmxMapLookup</a>(<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> dmxLocal, <span class="keywordtype">int</span> remoteEvent);
+<a name="l00042"></a>00042 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html
index ecf9922a6..76e0babad 100644
--- a/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8c.html
@@ -6,167 +6,186 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxmotion.c File Reference</h1><code>#include "inputstr.h"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcommon_8h-source.html">dmxcommon.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxmotion_8h-source.html">dmxmotion.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8c.html#a1">dmxPointerGetMotionBufferSize</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8c.html#a2">dmxPointerGetMotionEvents</a> (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8c.html#a3">dmxPointerPutMotionEvent</a> (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxmotion.c File Reference</h1><code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcommon_8h_source.html">dmxcommon.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxmotion_8h_source.html">dmxmotion.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8c.html#ab1f1378062fc8a2c5b4132193e143c95">OFFSET</a>(offset, element)&nbsp;&nbsp;&nbsp;((offset) * (numAxes + 1) + (element))</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8c.html#a71e31cfbffb3603068d897374e173400">dmxPointerGetMotionBufferSize</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8c.html#a6ebfa18908cd0473f3f23643e9ca2a58">dmxPointerGetMotionEvents</a> (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8c.html#abe71ba14a07f4077ca2658f81426f4c6">dmxPointerPutMotionEvent</a> (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides functions similar to miPointerGetMotionEvents and miPointerPutMotionEvents, with the exception that devices with more than two axes are fully supported. These routines may be used only for motion buffers for extension devices, and are <em>not</em> compatible replacements for the mi routines.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxmotion.c::dmxPointerGetMotionBufferSize" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides functions similar to miPointerGetMotionEvents and miPointerPutMotionEvents, with the exception that devices with more than two axes are fully supported. These routines may be used only for motion buffers for extension devices, and are <em>not</em> compatible replacements for the mi routines. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="ab1f1378062fc8a2c5b4132193e143c95"></a><!-- doxytag: member="dmxmotion.c::OFFSET" ref="ab1f1378062fc8a2c5b4132193e143c95" args="(offset, element)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define OFFSET</td>
+          <td>(</td>
+          <td class="paramtype">offset, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPointerGetMotionBufferSize </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">element&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;((offset) * (numAxes + 1) + (element))</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxmotion_8c_source.html#l00074">dmxPointerGetMotionEvents()</a>, and <a class="el" href="dmxmotion_8c_source.html#l00102">dmxPointerPutMotionEvent()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a71e31cfbffb3603068d897374e173400"></a><!-- doxytag: member="dmxmotion.c::dmxPointerGetMotionBufferSize" ref="a71e31cfbffb3603068d897374e173400" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxPointerGetMotionBufferSize </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return size of motion buffer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinputinit_8h.html#aa5877f857ec01a4754c187147f3e34f1">DMX_MOTION_SIZE</a> </dd></dl>
 
-<p>
-Return size of motion buffer. <dl compact><dt><b>See also:</b></dt><dd>DMX_MOTION_SIZE </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxmotion.c::dmxPointerGetMotionEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6ebfa18908cd0473f3f23643e9ca2a58"></a><!-- doxytag: member="dmxmotion.c::dmxPointerGetMotionEvents" ref="a6ebfa18908cd0473f3f23643e9ca2a58" args="(DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPointerGetMotionEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">int dmxPointerGetMotionEvents </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xTimecoord *&nbsp;</td>
-          <td class="mdname" nowrap> <em>coords</em>, </td>
+          <td class="paramtype">xTimecoord *&nbsp;</td>
+          <td class="paramname"> <em>coords</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>stop</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>stop</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine performs the same function as <em>miPointerGetMotionEvents:</em> the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator-&gt;numMotionEvents events. This routine is called from <em>Xi/gtmotion.c</em> with coords large enough to hold the same number of events in a variable-length extended <em>xTimecoord</em> structure. This provides sufficient data for the <em>XGetDeviceMotionEvents</em> library call, and would be identical to <em>miPointerGetMotionEvents</em> for devices with only 2 axes (i.e., core pointers) if <em>xTimecoord</em> used 32bit integers.</p>
+<p>Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided. </p>
 
-<p>
-This routine performs the same function as <em>miPointerGetMotionEvents</em>: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator-&gt;numMotionEvents events. This routine is called from <em>Xi/gtmotion</em>.c with coords large enough to hold the same number of events in a variable-length extended <em>xTimecoord</em> structure. This provides sufficient data for the <em>XGetDeviceMotionEvents</em> library call, and would be identical to <em>miPointerGetMotionEvents</em> for devices with only 2 axes (i.e., core pointers) if <em>xTimecoord</em> used 32bit integers.<p>
-Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxmotion.c::dmxPointerPutMotionEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, and <a class="el" href="dmxmotion_8c_source.html#l00050">OFFSET</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe71ba14a07f4077ca2658f81426f4c6"></a><!-- doxytag: member="dmxmotion.c::dmxPointerPutMotionEvent" ref="abe71ba14a07f4077ca2658f81426f4c6" args="(DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPointerPutMotionEvent </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">void dmxPointerPutMotionEvent </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>firstAxis</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>firstAxis</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>axesCount</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>axesCount</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>time</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>time</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines. </p>
 
-<p>
-This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, and <a class="el" href="dmxmotion_8c_source.html#l00050">OFFSET</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html
deleted file mode 100644
index 1057b7ebb..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxmotion_8h-source.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxmotion.h</h1><a href="dmxmotion_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXMOTION_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXMOTION_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmotion_8c.html#a1">dmxPointerGetMotionBufferSize</a>(<span class="keywordtype">void</span>);
-00042 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmotion_8c.html#a2">dmxPointerGetMotionEvents</a>(DeviceIntPtr pDevice,
-00043                                       xTimecoord *coords,
-00044                                       <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> start,
-00045                                       <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> stop,
-00046                                       ScreenPtr pScreen);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmotion_8c.html#a3">dmxPointerPutMotionEvent</a>(DeviceIntPtr pDevice,
-00048                                      <span class="keywordtype">int</span> firstAxis, <span class="keywordtype">int</span> axesCount, <span class="keywordtype">int</span> *v,
-00049                                      <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> time);
-00050 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html
index f3f4bedc4..47bde57c7 100644
--- a/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8h.html
@@ -6,166 +6,157 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxmotion.h File Reference</h1>
-<p>
-<a href="dmxmotion_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8h.html#a0">dmxPointerGetMotionBufferSize</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8h.html#a1">dmxPointerGetMotionEvents</a> (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxmotion_8h.html#a2">dmxPointerPutMotionEvent</a> (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)</td></tr>
-
+<p><a href="dmxmotion_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8h.html#a71e31cfbffb3603068d897374e173400">dmxPointerGetMotionBufferSize</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8h.html#a6ebfa18908cd0473f3f23643e9ca2a58">dmxPointerGetMotionEvents</a> (DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxmotion_8h.html#abe71ba14a07f4077ca2658f81426f4c6">dmxPointerPutMotionEvent</a> (DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to functions supporting motion events. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxmotion_8c.html">dmxmotion.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxmotion.h::dmxPointerGetMotionBufferSize" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to functions supporting motion events. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxmotion_8c.html">dmxmotion.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a71e31cfbffb3603068d897374e173400"></a><!-- doxytag: member="dmxmotion.h::dmxPointerGetMotionBufferSize" ref="a71e31cfbffb3603068d897374e173400" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPointerGetMotionBufferSize </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxPointerGetMotionBufferSize </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return size of motion buffer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinputinit_8h.html#aa5877f857ec01a4754c187147f3e34f1">DMX_MOTION_SIZE</a> </dd></dl>
 
-<p>
-Return size of motion buffer. <dl compact><dt><b>See also:</b></dt><dd>DMX_MOTION_SIZE </dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxmotion.h::dmxPointerGetMotionEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6ebfa18908cd0473f3f23643e9ca2a58"></a><!-- doxytag: member="dmxmotion.h::dmxPointerGetMotionEvents" ref="a6ebfa18908cd0473f3f23643e9ca2a58" args="(DeviceIntPtr pDevice, xTimecoord *coords, unsigned long start, unsigned long stop, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPointerGetMotionEvents </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">int dmxPointerGetMotionEvents </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xTimecoord *&nbsp;</td>
-          <td class="mdname" nowrap> <em>coords</em>, </td>
+          <td class="paramtype">xTimecoord *&nbsp;</td>
+          <td class="paramname"> <em>coords</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>stop</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>stop</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine performs the same function as <em>miPointerGetMotionEvents:</em> the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator-&gt;numMotionEvents events. This routine is called from <em>Xi/gtmotion.c</em> with coords large enough to hold the same number of events in a variable-length extended <em>xTimecoord</em> structure. This provides sufficient data for the <em>XGetDeviceMotionEvents</em> library call, and would be identical to <em>miPointerGetMotionEvents</em> for devices with only 2 axes (i.e., core pointers) if <em>xTimecoord</em> used 32bit integers.</p>
+<p>Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided. </p>
 
-<p>
-This routine performs the same function as <em>miPointerGetMotionEvents</em>: the events in the motion history that are between the start and stop times (in mS) are placed in the coords vector, and the count of the number of items so placed is returned. This routine is called from dix/devices.c so that coords can hold valuator-&gt;numMotionEvents events. This routine is called from <em>Xi/gtmotion</em>.c with coords large enough to hold the same number of events in a variable-length extended <em>xTimecoord</em> structure. This provides sufficient data for the <em>XGetDeviceMotionEvents</em> library call, and would be identical to <em>miPointerGetMotionEvents</em> for devices with only 2 axes (i.e., core pointers) if <em>xTimecoord</em> used 32bit integers.<p>
-Because DMX uses the mi* routines for all core devices, this routine only has to support extension devices using the polymorphic coords. Because compatibility with miPointerGetMotionEvents is not possible, it is not provided.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxmotion.h::dmxPointerPutMotionEvent" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, and <a class="el" href="dmxmotion_8c_source.html#l00050">OFFSET</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe71ba14a07f4077ca2658f81426f4c6"></a><!-- doxytag: member="dmxmotion.h::dmxPointerPutMotionEvent" ref="abe71ba14a07f4077ca2658f81426f4c6" args="(DeviceIntPtr pDevice, int firstAxis, int axesCount, int *v, unsigned long time)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPointerPutMotionEvent </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDevice</em>, </td>
+          <td class="memname">void dmxPointerPutMotionEvent </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>firstAxis</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>firstAxis</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>axesCount</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>axesCount</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>time</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>time</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines. </p>
 
-<p>
-This routine adds an event to the motion history. A similar function is performed by miPointerMove for the mi versions of these routines.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00048">DMX_MOTION_SIZE</a>, <a class="el" href="dmxcommon_8h_source.html#l00073">GETDMXLOCALFROMPDEVICE</a>, and <a class="el" href="dmxmotion_8c_source.html#l00050">OFFSET</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html
new file mode 100644
index 000000000..c993e6eec
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxmotion_8h_source.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxmotion.h</h1><a href="dmxmotion_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXMOTION_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXMOTION_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmotion_8c.html#a71e31cfbffb3603068d897374e173400">dmxPointerGetMotionBufferSize</a>(<span class="keywordtype">void</span>);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxmotion_8c.html#a6ebfa18908cd0473f3f23643e9ca2a58">dmxPointerGetMotionEvents</a>(DeviceIntPtr pDevice,
+<a name="l00042"></a>00042                                       xTimecoord *coords,
+<a name="l00043"></a>00043                                       <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> start,
+<a name="l00044"></a>00044                                       <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> stop,
+<a name="l00045"></a>00045                                       ScreenPtr pScreen);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxmotion_8c.html#abe71ba14a07f4077ca2658f81426f4c6">dmxPointerPutMotionEvent</a>(DeviceIntPtr pDevice,
+<a name="l00047"></a>00047                                      <span class="keywordtype">int</span> firstAxis, <span class="keywordtype">int</span> axesCount, <span class="keywordtype">int</span> *v,
+<a name="l00048"></a>00048                                      <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> time);
+<a name="l00049"></a>00049 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8c.html b/xorg-server/hw/dmx/doc/html/dmxparse_8c.html
index c984dd9f5..7438513be 100644
--- a/xorg-server/hw/dmx/doc/html/dmxparse_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxparse_8c.html
@@ -6,60 +6,1380 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxparse.c File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
-<code>#include &lt;stdlib.h&gt;</code><br>
-<code>#include &lt;string.h&gt;</code><br>
-<code>#include &lt;stdarg.h&gt;</code><br>
-<code>#include "<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8c.html#a0">dmxConfigLog</a> (const  char *format,...)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxparse.c File Reference</h1><code>#include &lt;stdio.h&gt;</code><br/>
+<code>#include &lt;stdlib.h&gt;</code><br/>
+<code>#include &lt;string.h&gt;</code><br/>
+<code>#include &lt;stdarg.h&gt;</code><br/>
+<code>#include &quot;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a2c4e1260c486d4898c5bb21ff221c89d">dmxConfigLog</a> (const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a1794b2e8571596d46f01ff8cf692410f">dmxConfigAlloc</a> (unsigned long bytes)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#af8e13444fded1f7707ab7dfc40655fd3">dmxConfigRealloc</a> (void *orig, unsigned long orig_bytes, unsigned long bytes)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a0d1c3d922b777254300e346b0111943c">dmxConfigCopyString</a> (const char *string, int length)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a890429fea43e1039967b94fadc1f4e29">dmxConfigFree</a> (void *area)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#aaf6df2ea6db8e6f959c72fc28c46f1b2">dmxConfigCreateToken</a> (int token, int line, const char *comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a08b933b0269ebf4b22a6b43abbda19e2">dmxConfigFreeToken</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ae285ab0da6d63770365886d413f58432">dmxConfigCreateString</a> (int token, int line, const char *comment, const char *string)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a679f8776dd1a503057891de6483adc49">dmxConfigFreeString</a> (<a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a40cfc16a7a8a6f4b21bfb81d03490458">dmxConfigCreateNumber</a> (int token, int line, const char *comment, int number)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a2b8a343fe122733af82e802a01a5f30b">dmxConfigFreeNumber</a> (<a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a488a03d25bc380f1bdf786693c644957">dmxConfigCreatePair</a> (int token, int line, const char *comment, int x, int y, int xsign, int ysign)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a382b3c46caeb7e134e381d732f8d185e">dmxConfigFreePair</a> (<a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ae0619f5f0850b65fefe4df5112aaac05">dmxConfigCreateComment</a> (int token, int line, const char *comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a1c9b5f8f879ee6872295618c6e1dd232">dmxConfigFreeComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a1740a9f650d43464836c9b0ec44f9659">dmxConfigCreatePartDim</a> (<a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pOffset)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a8cb0f116f7c3c5ac3939cd69df06c0fe">dmxConfigFreePartDim</a> (<a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ac75eb1b376fb8a510d123ca119ef215e">dmxConfigCreateFullDim</a> (<a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> pScrn, <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> pRoot)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ad09f9037b194ad32029047499003a60a">dmxConfigFreeFullDim</a> (<a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ab3f5b4d4a5b535faf87b3bf7cb30d2d0">dmxConfigCreateDisplay</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pName, <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> pDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pOrigin, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a34126fa5dccdee442dce2b2413c43c53">dmxConfigFreeDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a6078c6ad23fc49e4992cade35f7351b2">dmxConfigCreateWall</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pWallDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDisplayDim, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pNameList, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#aac254e191bb664ec87d44f70f52ce897">dmxConfigFreeWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ad183386657a3549f60760a156fad4fb8">dmxConfigCreateOption</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pOption, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a87d839927d1775c43e099e87f6e2ca8d">dmxConfigFreeOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a782be9a8b3118f8a52825041b5c2e8e8">dmxConfigLookupParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p, const char *key, int *argc)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a0a4ebd4b3769682daf7a6fed9f11744d">dmxConfigCreateParam</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pOpen, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pParam, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pClose, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#af978e4f2f42e4d7e01d3d45a4c1b9a4d">dmxConfigFreeParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#aa7e24c7be4cc3880e15274a53b627267">dmxConfigCreateSub</a> (<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> wall, <a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> option, <a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> param)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a07ef1f7f192d2c0d29332fc5c71e89b8">dmxConfigFreeSub</a> (<a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> sub)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a825d125808e8992c740315d3b78e493d">dmxConfigSubComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a4f26909fb7f97007567e5514839c3a53">dmxConfigSubDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#aac05245a327cc10096f1a049e675caef">dmxConfigSubWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> wall)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a23a35d27aa7bf22d815d2a9cff809307">dmxConfigSubOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> option)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a16047d4ba67462084a85156432c7cf05">dmxConfigSubParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> param)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a75e3403d28e2cb5b3b6da5461ef1bbca">dmxConfigAddSub</a> (<a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> head, <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> sub)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a427549ab2ffa269ca34bdb1a60e87bb0">dmxConfigCreateVirtual</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pName, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDim, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pOpen, <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> pSubentry, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pClose)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a6e48a41d83e97afcbd542a210ea30258">dmxConfigFreeVirtual</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a402a182c5c9922807ffc7998b4228b24">dmxConfigCreateEntry</a> (<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#ab18dcd503e9fbe9d81caa16bf07026ea">dmxConfigFreeEntry</a> (<a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#acec532235fc1d75b24779b3ed50aa037">dmxConfigAddEntry</a> (<a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> head, <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#acee635a4deedd0f4b488d951346f4622">dmxConfigEntryComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8c.html#a643b2c9c57d3009965318d20aad1ca0d">dmxConfigEntryVirtual</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support routines and helper functions to be used by the DMX configuration file parser.<p>
-Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxparse.c::dmxConfigLog" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support routines and helper functions to be used by the DMX configuration file parser.</p>
+<p>Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="acec532235fc1d75b24779b3ed50aa037"></a><!-- doxytag: member="dmxparse.c::dmxConfigAddEntry" ref="acec532235fc1d75b24779b3ed50aa037" args="(DMXConfigEntryPtr head, DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigAddEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>head</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigLog </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, and <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a75e3403d28e2cb5b3b6da5461ef1bbca"></a><!-- doxytag: member="dmxparse.c::dmxConfigAddSub" ref="a75e3403d28e2cb5b3b6da5461ef1bbca" args="(DMXConfigSubPtr head, DMXConfigSubPtr sub)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigAddSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>head</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>sub</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1794b2e8571596d46f01ff8cf692410f"></a><!-- doxytag: member="dmxparse.c::dmxConfigAlloc" ref="a1794b2e8571596d46f01ff8cf692410f" args="(unsigned long bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* dmxConfigAlloc </td>
+          <td>(</td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-A general error logging routine that does not depend on the dmxLog functions.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00088">dmxConfigCopyString()</a>, <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00104">dmxConfigCreateToken()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00082">dmxConfigPushState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0d1c3d922b777254300e346b0111943c"></a><!-- doxytag: member="dmxparse.c::dmxConfigCopyString" ref="a0d1c3d922b777254300e346b0111943c" args="(const char *string, int length)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* dmxConfigCopyString </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>length</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0619f5f0850b65fefe4df5112aaac05"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateComment" ref="ae0619f5f0850b65fefe4df5112aaac05" args="(int token, int line, const char *comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> dmxConfigCreateComment </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00081">_DMXConfigComment::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00080">_DMXConfigComment::line</a>, and <a class="el" href="dmxparse_8h_source.html#l00079">_DMXConfigComment::token</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab3f5b4d4a5b535faf87b3bf7cb30d2d0"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateDisplay" ref="ab3f5b4d4a5b535faf87b3bf7cb30d2d0" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigFullDimPtr pDim, DMXConfigPairPtr pOrigin, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> dmxConfigCreateDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pName</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOrigin</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8h_source.html#l00123">_DMXConfigDisplay::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00122">_DMXConfigDisplay::dname</a>, <a class="el" href="dmxparse_8h_source.html#l00125">_DMXConfigDisplay::end</a>, <a class="el" href="dmxparse_8h_source.html#l00108">_DMXConfigDisplay::name</a>, <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>, <a class="el" href="dmxparse_8h_source.html#l00124">_DMXConfigDisplay::origin</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootX</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootXOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootY</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootYOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootYSign</a>, <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnX</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnY</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnYSign</a>, <a class="el" href="dmxparse_8h_source.html#l00121">_DMXConfigDisplay::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a402a182c5c9922807ffc7998b4228b24"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateEntry" ref="a402a182c5c9922807ffc7998b4228b24" args="(DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigCreateEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00583">dmxConfigAddEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00599">dmxConfigEntryComment()</a>, and <a class="el" href="dmxparse_8c_source.html#l00604">dmxConfigEntryVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac75eb1b376fb8a510d123ca119ef215e"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateFullDim" ref="ac75eb1b376fb8a510d123ca119ef215e" args="(DMXConfigPartDimPtr pScrn, DMXConfigPartDimPtr pRoot)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> dmxConfigCreateFullDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pScrn</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pRoot</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, and <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a40cfc16a7a8a6f4b21bfb81d03490458"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateNumber" ref="a40cfc16a7a8a6f4b21bfb81d03490458" args="(int token, int line, const char *comment, int number)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a> dmxConfigCreateNumber </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>number</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00062">_DMXConfigNumber::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00061">_DMXConfigNumber::line</a>, <a class="el" href="dmxparse_8h_source.html#l00063">_DMXConfigNumber::number</a>, and <a class="el" href="dmxparse_8h_source.html#l00060">_DMXConfigNumber::token</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad183386657a3549f60760a156fad4fb8"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateOption" ref="ad183386657a3549f60760a156fad4fb8" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pOption, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> dmxConfigCreateOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOption</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00151">_DMXConfigOption::end</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmxparse_8h_source.html#l00150">_DMXConfigOption::option</a>, <a class="el" href="dmxparse_8h_source.html#l00149">_DMXConfigOption::start</a>, <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a488a03d25bc380f1bdf786693c644957"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreatePair" ref="a488a03d25bc380f1bdf786693c644957" args="(int token, int line, const char *comment, int x, int y, int xsign, int ysign)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> dmxConfigCreatePair </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>xsign</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ysign</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00070">_DMXConfigPair::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00069">_DMXConfigPair::line</a>, <a class="el" href="dmxparse_8h_source.html#l00068">_DMXConfigPair::token</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0a4ebd4b3769682daf7a6fed9f11744d"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateParam" ref="a0a4ebd4b3769682daf7a6fed9f11744d" args="(DMXConfigTokenPtr pStart, DMXConfigTokenPtr pOpen, DMXConfigStringPtr pParam, DMXConfigTokenPtr pClose, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> dmxConfigCreateParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOpen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pParam</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pClose</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00156">_DMXConfigParam::argc</a>, <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, <a class="el" href="dmxparse_8h_source.html#l00162">_DMXConfigParam::close</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00163">_DMXConfigParam::end</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmxparse_8h_source.html#l00160">_DMXConfigParam::open</a>, <a class="el" href="dmxparse_8h_source.html#l00161">_DMXConfigParam::param</a>, <a class="el" href="dmxparse_8h_source.html#l00159">_DMXConfigParam::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1740a9f650d43464836c9b0ec44f9659"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreatePartDim" ref="a1740a9f650d43464836c9b0ec44f9659" args="(DMXConfigPairPtr pDim, DMXConfigPairPtr pOffset)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> dmxConfigCreatePartDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOffset</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, and <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae285ab0da6d63770365886d413f58432"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateString" ref="ae285ab0da6d63770365886d413f58432" args="(int token, int line, const char *comment, const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> dmxConfigCreateString </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00053">_DMXConfigString::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00052">_DMXConfigString::line</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00051">_DMXConfigString::token</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa7e24c7be4cc3880e15274a53b627267"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateSub" ref="aa7e24c7be4cc3880e15274a53b627267" args="(DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigDisplayPtr display, DMXConfigWallPtr wall, DMXConfigOptionPtr option, DMXConfigParamPtr param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigCreateSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>wall</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>option</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>param</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00170">_DMXConfigSub::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00481">dmxConfigSubComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00487">dmxConfigSubDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00498">dmxConfigSubOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00503">dmxConfigSubParam()</a>, and <a class="el" href="dmxparse_8c_source.html#l00493">dmxConfigSubWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaf6df2ea6db8e6f959c72fc28c46f1b2"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateToken" ref="aaf6df2ea6db8e6f959c72fc28c46f1b2" args="(int token, int line, const char *comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> dmxConfigCreateToken </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00046">_DMXConfigToken::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00045">_DMXConfigToken::line</a>, and <a class="el" href="dmxparse_8h_source.html#l00044">_DMXConfigToken::token</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a427549ab2ffa269ca34bdb1a60e87bb0"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateVirtual" ref="a427549ab2ffa269ca34bdb1a60e87bb0" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigPairPtr pDim, DMXConfigTokenPtr pOpen, DMXConfigSubPtr pSubentry, DMXConfigTokenPtr pClose)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> dmxConfigCreateVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pName</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOpen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pSubentry</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pClose</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00190">_DMXConfigVirtual::close</a>, <a class="el" href="dmxparse_8h_source.html#l00187">_DMXConfigVirtual::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::height</a>, <a class="el" href="dmxparse_8h_source.html#l00181">_DMXConfigVirtual::name</a>, <a class="el" href="dmxparse_8h_source.html#l00188">_DMXConfigVirtual::open</a>, <a class="el" href="dmxparse_8h_source.html#l00185">_DMXConfigVirtual::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00189">_DMXConfigVirtual::subentry</a>, <a class="el" href="dmxparse_8h_source.html#l00186">_DMXConfigVirtual::vname</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::width</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, and <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6078c6ad23fc49e4992cade35f7351b2"></a><!-- doxytag: member="dmxparse.c::dmxConfigCreateWall" ref="a6078c6ad23fc49e4992cade35f7351b2" args="(DMXConfigTokenPtr pStart, DMXConfigPairPtr pWallDim, DMXConfigPairPtr pDisplayDim, DMXConfigStringPtr pNameList, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> dmxConfigCreateWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pWallDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDisplayDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pNameList</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00138">_DMXConfigWall::displayDim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00140">_DMXConfigWall::end</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::height</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00136">_DMXConfigWall::start</a>, <a class="el" href="dmxparse_8h_source.html#l00137">_DMXConfigWall::wallDim</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::width</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::xwall</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::ywall</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acee635a4deedd0f4b488d951346f4622"></a><!-- doxytag: member="dmxparse.c::dmxConfigEntryComment" ref="acee635a4deedd0f4b488d951346f4622" args="(DMXConfigCommentPtr comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigEntryComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, and <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a643b2c9c57d3009965318d20aad1ca0d"></a><!-- doxytag: member="dmxparse.c::dmxConfigEntryVirtual" ref="a643b2c9c57d3009965318d20aad1ca0d" args="(DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigEntryVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, and <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a890429fea43e1039967b94fadc1f4e29"></a><!-- doxytag: member="dmxparse.c::dmxConfigFree" ref="a890429fea43e1039967b94fadc1f4e29" args="(void *area)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFree </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>area</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00160">dmxConfigFreeNumber()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c9b5f8f879ee6872295618c6e1dd232"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeComment" ref="a1c9b5f8f879ee6872295618c6e1dd232" args="(DMXConfigCommentPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00081">_DMXConfigComment::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, and <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a34126fa5dccdee442dce2b2413c43c53"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeDisplay" ref="a34126fa5dccdee442dce2b2413c43c53" args="(DMXConfigDisplayPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00123">_DMXConfigDisplay::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00122">_DMXConfigDisplay::dname</a>, <a class="el" href="dmxparse_8h_source.html#l00125">_DMXConfigDisplay::end</a>, and <a class="el" href="dmxparse_8h_source.html#l00121">_DMXConfigDisplay::start</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, and <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab18dcd503e9fbe9d81caa16bf07026ea"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeEntry" ref="ab18dcd503e9fbe9d81caa16bf07026ea" args="(DMXConfigEntryPtr entry)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>entry</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad09f9037b194ad32029047499003a60a"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeFullDim" ref="ad09f9037b194ad32029047499003a60a" args="(DMXConfigFullDimPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeFullDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, and <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2b8a343fe122733af82e802a01a5f30b"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeNumber" ref="a2b8a343fe122733af82e802a01a5f30b" args="(DMXConfigNumberPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeNumber </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00062">_DMXConfigNumber::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a87d839927d1775c43e099e87f6e2ca8d"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeOption" ref="a87d839927d1775c43e099e87f6e2ca8d" args="(DMXConfigOptionPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00151">_DMXConfigOption::end</a>, <a class="el" href="dmxparse_8h_source.html#l00150">_DMXConfigOption::option</a>, <a class="el" href="dmxparse_8h_source.html#l00149">_DMXConfigOption::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a382b3c46caeb7e134e381d732f8d185e"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreePair" ref="a382b3c46caeb7e134e381d732f8d185e" args="(DMXConfigPairPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreePair </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00070">_DMXConfigPair::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af978e4f2f42e4d7e01d3d45a4c1b9a4d"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeParam" ref="af978e4f2f42e4d7e01d3d45a4c1b9a4d" args="(DMXConfigParamPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, <a class="el" href="dmxparse_8h_source.html#l00162">_DMXConfigParam::close</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00163">_DMXConfigParam::end</a>, <a class="el" href="dmxparse_8h_source.html#l00164">_DMXConfigParam::next</a>, <a class="el" href="dmxparse_8h_source.html#l00160">_DMXConfigParam::open</a>, <a class="el" href="dmxparse_8h_source.html#l00161">_DMXConfigParam::param</a>, and <a class="el" href="dmxparse_8h_source.html#l00159">_DMXConfigParam::start</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8cb0f116f7c3c5ac3939cd69df06c0fe"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreePartDim" ref="a8cb0f116f7c3c5ac3939cd69df06c0fe" args="(DMXConfigPartDimPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreePartDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, and <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a679f8776dd1a503057891de6483adc49"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeString" ref="a679f8776dd1a503057891de6483adc49" args="(DMXConfigStringPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeString </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00053">_DMXConfigString::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a07ef1f7f192d2c0d29332fc5c71e89b8"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeSub" ref="a07ef1f7f192d2c0d29332fc5c71e89b8" args="(DMXConfigSubPtr sub)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>sub</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00170">_DMXConfigSub::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a08b933b0269ebf4b22a6b43abbda19e2"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeToken" ref="a08b933b0269ebf4b22a6b43abbda19e2" args="(DMXConfigTokenPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeToken </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00046">_DMXConfigToken::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6e48a41d83e97afcbd542a210ea30258"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeVirtual" ref="a6e48a41d83e97afcbd542a210ea30258" args="(DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00632">dmxConfigDCCallback()</a>, and <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac254e191bb664ec87d44f70f52ce897"></a><!-- doxytag: member="dmxparse.c::dmxConfigFreeWall" ref="aac254e191bb664ec87d44f70f52ce897" args="(DMXConfigWallPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigFreeWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00138">_DMXConfigWall::displayDim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00140">_DMXConfigWall::end</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00136">_DMXConfigWall::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00137">_DMXConfigWall::wallDim</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2c4e1260c486d4898c5bb21ff221c89d"></a><!-- doxytag: member="dmxparse.c::dmxConfigLog" ref="a2c4e1260c486d4898c5bb21ff221c89d" args="(const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigLog </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>A general error logging routine that does not depend on the dmxLog functions. </p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>, <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>, <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>, and <a class="el" href="dmxparse_8c_source.html#l00076">dmxConfigRealloc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a782be9a8b3118f8a52825041b5c2e8e8"></a><!-- doxytag: member="dmxparse.c::dmxConfigLookupParam" ref="a782be9a8b3118f8a52825041b5c2e8e8" args="(DMXConfigParamPtr p, const char *key, int *argc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char** dmxConfigLookupParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>key</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>argc</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00156">_DMXConfigParam::argc</a>, <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, and <a class="el" href="dmxparse_8h_source.html#l00164">_DMXConfigParam::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af8e13444fded1f7707ab7dfc40655fd3"></a><!-- doxytag: member="dmxparse.c::dmxConfigRealloc" ref="af8e13444fded1f7707ab7dfc40655fd3" args="(void *orig, unsigned long orig_bytes, unsigned long bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* dmxConfigRealloc </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>orig</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>orig_bytes</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a825d125808e8992c740315d3b78e493d"></a><!-- doxytag: member="dmxparse.c::dmxConfigSubComment" ref="a825d125808e8992c740315d3b78e493d" args="(DMXConfigCommentPtr comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, and <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4f26909fb7f97007567e5514839c3a53"></a><!-- doxytag: member="dmxparse.c::dmxConfigSubDisplay" ref="a4f26909fb7f97007567e5514839c3a53" args="(DMXConfigDisplayPtr display)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>display</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a23a35d27aa7bf22d815d2a9cff809307"></a><!-- doxytag: member="dmxparse.c::dmxConfigSubOption" ref="a23a35d27aa7bf22d815d2a9cff809307" args="(DMXConfigOptionPtr option)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>option</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a16047d4ba67462084a85156432c7cf05"></a><!-- doxytag: member="dmxparse.c::dmxConfigSubParam" ref="a16047d4ba67462084a85156432c7cf05" args="(DMXConfigParamPtr param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>param</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac05245a327cc10096f1a049e675caef"></a><!-- doxytag: member="dmxparse.c::dmxConfigSubWall" ref="aac05245a327cc10096f1a049e675caef" args="(DMXConfigWallPtr wall)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>wall</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html
deleted file mode 100644
index c88da9089..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxparse_8h-source.html
+++ /dev/null
@@ -1,303 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxparse.h</h1><a href="dmxparse_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXPARSE_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPARSE_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include &lt;stdio.h&gt;</span>              <span class="comment">/* For FILE */</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__DMXConfigToken.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigToken.html">_DMXConfigToken</a> {
-00045     <span class="keywordtype">int</span>                      token;
-00046     <span class="keywordtype">int</span>                      line;
-00047     <span class="keyword">const</span> <span class="keywordtype">char</span>               *comment;
-00048 } <a class="code" href="struct__DMXConfigToken.html">DMXConfigToken</a>, *<a class="code" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>;
-00049 
-<a name="l00051"></a><a class="code" href="struct__DMXConfigString.html">00051</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigString.html">_DMXConfigString</a> {
-00052     <span class="keywordtype">int</span>                      token;
-00053     <span class="keywordtype">int</span>                      line;
-00054     <span class="keyword">const</span> <span class="keywordtype">char</span>               *comment;
-00055     <span class="keyword">const</span> <span class="keywordtype">char</span>               *string;
-00056     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigString.html">_DMXConfigString</a>  *next;
-00057 } <a class="code" href="struct__DMXConfigString.html">DMXConfigString</a>, *<a class="code" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>;
-00058 
-<a name="l00060"></a><a class="code" href="struct__DMXConfigNumber.html">00060</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> {
-00061     <span class="keywordtype">int</span>                      token;
-00062     <span class="keywordtype">int</span>                      line;
-00063     <span class="keyword">const</span> <span class="keywordtype">char</span>               *comment;
-00064     <span class="keywordtype">int</span>                      number;
-00065 } <a class="code" href="struct__DMXConfigNumber.html">DMXConfigNumber</a>, *<a class="code" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>;
-00066 
-<a name="l00068"></a><a class="code" href="struct__DMXConfigPair.html">00068</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigPair.html">_DMXConfigPair</a> {
-00069     <span class="keywordtype">int</span>                      token;
-00070     <span class="keywordtype">int</span>                      line;
-00071     <span class="keyword">const</span> <span class="keywordtype">char</span>               *comment;
-00072     <span class="keywordtype">int</span>                      x;
-00073     <span class="keywordtype">int</span>                      y;
-00074     <span class="keywordtype">int</span>                      xsign;
-00075     <span class="keywordtype">int</span>                      ysign;
-00076 } <a class="code" href="struct__DMXConfigPair.html">DMXConfigPair</a>, *<a class="code" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>;
-00077 
-<a name="l00079"></a><a class="code" href="struct__DMXConfigComment.html">00079</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigComment.html">_DMXConfigComment</a> {
-00080     <span class="keywordtype">int</span>                      token;
-00081     <span class="keywordtype">int</span>                      line;
-00082     <span class="keyword">const</span> <span class="keywordtype">char</span>               *comment;
-00083 } <a class="code" href="struct__DMXConfigComment.html">DMXConfigComment</a>, *<a class="code" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>;
-00084 
-00085 <span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00086     dmxConfigComment,
-00087     dmxConfigVirtual,
-00088     dmxConfigDisplay,
-00089     dmxConfigWall,
-00090     dmxConfigOption,
-00091     dmxConfigParam
-00092 } DMXConfigType;
-00093 
-<a name="l00095"></a><a class="code" href="struct__DMXConfigPartDim.html">00095</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> {
-00096     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>         dim;
-00097     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>         offset;
-00098 } <a class="code" href="struct__DMXConfigPartDim.html">DMXConfigPartDim</a>, *<a class="code" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>;
-00099 
-<a name="l00101"></a><a class="code" href="struct__DMXConfigFullDim.html">00101</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> {
-00102     <a class="code" href="dmxparse_8h.html#a11">DMXConfigPartDimPtr</a>      scrn;
-00103     <a class="code" href="dmxparse_8h.html#a11">DMXConfigPartDimPtr</a>      root;
-00104 } <a class="code" href="struct__DMXConfigFullDim.html">DMXConfigFullDim</a>, *<a class="code" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>;
-00105 
-<a name="l00107"></a><a class="code" href="struct__DMXConfigDisplay.html">00107</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> {
-00108                                 <span class="comment">/* Summary information */</span>
-00109     <span class="keyword">const</span> <span class="keywordtype">char</span>               *name;
-00110                                 <span class="comment">/* Screen Window Geometry */</span>
-00111     <span class="keywordtype">int</span>                      scrnWidth, scrnHeight;
-00112     <span class="keywordtype">int</span>                      scrnX, scrnY;
-00113     <span class="keywordtype">int</span>                      scrnXSign, scrnYSign;
-00114                                 <span class="comment">/* Root Window Geometry */</span>
-00115     <span class="keywordtype">int</span>                      rootWidth, rootHeight;
-00116     <span class="keywordtype">int</span>                      rootX, rootY;
-00117     <span class="keywordtype">int</span>                      rootXSign, rootYSign;
-00118                                 <span class="comment">/* Origin in global space */</span>
-00119     <span class="keywordtype">int</span>                      rootXOrigin, rootYOrigin;
-00120     
-00121                                 <span class="comment">/* Raw configuration information */</span>
-00122     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        start;
-00123     <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>       dname;
-00124     <a class="code" href="dmxparse_8h.html#a13">DMXConfigFullDimPtr</a>      dim;
-00125     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>         origin;
-00126     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        end;
-00127 } <a class="code" href="struct__DMXConfigDisplay.html">DMXConfigDisplay</a>, *<a class="code" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>;
-00128 
-<a name="l00130"></a><a class="code" href="struct__DMXConfigWall.html">00130</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigWall.html">_DMXConfigWall</a> {
-00131                                 <span class="comment">/* Summary information */</span>
-00132     <span class="keywordtype">int</span>                      width, height; <span class="comment">/* dimensions of displays */</span>
-00133     <span class="keywordtype">int</span>                      xwall, ywall; <span class="comment">/* dimensions of wall, in tiles */</span>
-00134 
-00135     
-00136                                 <span class="comment">/* Raw configuration informaiton */</span>
-00137     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        start;
-00138     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>         wallDim;
-00139     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>         displayDim;
-00140     <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>       nameList;
-00141     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        end;
-00142 } <a class="code" href="struct__DMXConfigWall.html">DMXConfigWall</a>, *<a class="code" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>;
-00143 
-<a name="l00145"></a><a class="code" href="struct__DMXConfigOption.html">00145</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigOption.html">_DMXConfigOption</a> {
-00146                                 <span class="comment">/* Summary information */</span>
-00147     <span class="keywordtype">char</span>                     *string;
-00148     
-00149                                 <span class="comment">/* Raw configuration informaiton */</span>
-00150     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        start;
-00151     <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>       option;
-00152     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        end;
-00153 } <a class="code" href="struct__DMXConfigOption.html">DMXConfigOption</a>, *<a class="code" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>;
-00154 
-<a name="l00156"></a><a class="code" href="struct__DMXConfigParam.html">00156</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigParam.html">_DMXConfigParam</a> {
-00157     <span class="keywordtype">int</span>                      argc;
-00158     <span class="keyword">const</span> <span class="keywordtype">char</span>               **argv;
-00159     
-00160     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        start;
-00161     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        open;
-00162     <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>       param;
-00163     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        close;
-00164     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>        end; <span class="comment">/* Either open/close OR end */</span>
-00165     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigParam.html">_DMXConfigParam</a>   *next;
-00166 } <a class="code" href="struct__DMXConfigParam.html">DMXConfigParam</a>, *<a class="code" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>;
-00167 
-<a name="l00169"></a><a class="code" href="struct__DMXConfigSub.html">00169</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigSub.html">_DMXConfigSub</a> {
-00170     DMXConfigType             type;
-00171     <a class="code" href="dmxparse_8h.html#a9">DMXConfigCommentPtr</a>       comment;
-00172     <a class="code" href="dmxparse_8h.html#a15">DMXConfigDisplayPtr</a>       display;
-00173     <a class="code" href="dmxparse_8h.html#a17">DMXConfigWallPtr</a>          wall;
-00174     <a class="code" href="dmxparse_8h.html#a19">DMXConfigOptionPtr</a>        option;
-00175     <a class="code" href="dmxparse_8h.html#a21">DMXConfigParamPtr</a>         param;
-00176     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigSub.html">_DMXConfigSub</a>      *next;
-00177 } <a class="code" href="struct__DMXConfigSub.html">DMXConfigSub</a>, *<a class="code" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>;
-00178 
-<a name="l00180"></a><a class="code" href="struct__DMXConfigVirtual.html">00180</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> {
-00181                                 <span class="comment">/* Summary information */</span>
-00182     <span class="keyword">const</span> <span class="keywordtype">char</span>                *name;
-00183     <span class="keywordtype">int</span>                       width, height;
-00184 
-00185                                 <span class="comment">/* Raw configuration information */</span>
-00186     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>         start;
-00187     <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>        vname;
-00188     <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>          dim;
-00189     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>         open;
-00190     <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>           subentry;
-00191     <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>         close;
-00192 } <a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtual</a>, *<a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>;
-00193 
-<a name="l00195"></a><a class="code" href="struct__DMXConfigEntry.html">00195</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> {
-00196     DMXConfigType            type;
-00197     <a class="code" href="dmxparse_8h.html#a9">DMXConfigCommentPtr</a>      comment;
-00198     <a class="code" href="dmxparse_8h.html#a25">DMXConfigVirtualPtr</a>      <span class="keyword">virtual</span>;
-00199     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>   *next;
-00200 } <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntry</a>, *<a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>;
-00201 
-00202 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a>   dmxConfigEntry;
-00203 
-00204 <span class="keyword">extern</span> <span class="keywordtype">int</span>                 yylex(<span class="keywordtype">void</span>);
-00205 <span class="keyword">extern</span> <span class="keywordtype">int</span>                 yydebug;
-00206 <span class="keyword">extern</span> <span class="keywordtype">void</span>                yyerror(<span class="keyword">const</span> <span class="keywordtype">char</span> *message);
-00207 
-00208 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a0">dmxConfigLog</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
-00209 <span class="keyword">extern</span> <span class="keywordtype">void</span>                *dmxConfigAlloc(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytes);
-00210 <span class="keyword">extern</span> <span class="keywordtype">void</span>                *dmxConfigRealloc(<span class="keywordtype">void</span> *orig,
-00211                                              <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> orig_bytes,
-00212                                              <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytes);
-00213 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>          *dmxConfigCopyString(<span class="keyword">const</span> <span class="keywordtype">char</span> *string,
-00214                                                 <span class="keywordtype">int</span> length);
-00215 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFree(<span class="keywordtype">void</span> *area);
-00216 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a>   dmxConfigCreateToken(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
-00217                                                 <span class="keyword">const</span> <span class="keywordtype">char</span> *comment);
-00218 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeToken(DMXConfigTokenPtr p);
-00219 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a>  dmxConfigCreateString(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
-00220                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *comment,
-00221                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *string);
-00222 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeString(DMXConfigStringPtr p);
-00223 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a5">DMXConfigNumberPtr</a>  dmxConfigCreateNumber(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
-00224                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *comment,
-00225                                                  <span class="keywordtype">int</span> number);
-00226 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeNumber(DMXConfigNumberPtr p);
-00227 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a>    dmxConfigCreatePair(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
-00228                                                <span class="keyword">const</span> <span class="keywordtype">char</span> *comment,
-00229                                                <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y,
-00230                                                <span class="keywordtype">int</span> xsign, <span class="keywordtype">int</span> ysign);
-00231 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreePair(DMXConfigPairPtr p);
-00232 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a9">DMXConfigCommentPtr</a> dmxConfigCreateComment(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
-00233                                                   <span class="keyword">const</span> <span class="keywordtype">char</span> *comment);
-00234 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeComment(DMXConfigCommentPtr p);
-00235 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a11">DMXConfigPartDimPtr</a> dmxConfigCreatePartDim(DMXConfigPairPtr pDim,
-00236                                                   DMXConfigPairPtr pOffset);
-00237 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreePartDim(DMXConfigPartDimPtr p);
-00238 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a13">DMXConfigFullDimPtr</a> dmxConfigCreateFullDim(DMXConfigPartDimPtr pScrn,
-00239                                                   DMXConfigPartDimPtr pRoot);
-00240 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeFullDim(DMXConfigFullDimPtr p);
-00241 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a15">DMXConfigDisplayPtr</a> dmxConfigCreateDisplay(DMXConfigTokenPtr pStart,
-00242                                                   DMXConfigStringPtr pName,
-00243                                                   DMXConfigFullDimPtr pDim,
-00244                                                   DMXConfigPairPtr pOrigin,
-00245                                                   DMXConfigTokenPtr pEnd);
-00246 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeDisplay(DMXConfigDisplayPtr p);
-00247 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a17">DMXConfigWallPtr</a>    dmxConfigCreateWall(DMXConfigTokenPtr pStart,
-00248                                                DMXConfigPairPtr pWallDim,
-00249                                                DMXConfigPairPtr pDisplayDim,
-00250                                                DMXConfigStringPtr pNameList,
-00251                                                DMXConfigTokenPtr pEnd);
-00252 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeWall(DMXConfigWallPtr p);
-00253 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a19">DMXConfigOptionPtr</a>  dmxConfigCreateOption(DMXConfigTokenPtr pStart,
-00254                                                  DMXConfigStringPtr pOption,
-00255                                                  DMXConfigTokenPtr pEnd);
-00256 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeOption(DMXConfigOptionPtr p);
-00257 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a21">DMXConfigParamPtr</a>   dmxConfigCreateParam(DMXConfigTokenPtr pStart,
-00258                                                 DMXConfigTokenPtr pOpen,
-00259                                                 DMXConfigStringPtr pParam,
-00260                                                 DMXConfigTokenPtr pClose,
-00261                                                 DMXConfigTokenPtr pEnd);
-00262 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeParam(DMXConfigParamPtr p);
-00263 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>          **dmxConfigLookupParam(DMXConfigParamPtr p,
-00264                                                   <span class="keyword">const</span> <span class="keywordtype">char</span> *key,
-00265                                                   <span class="keywordtype">int</span> *argc);
-00266 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigCreateSub(DMXConfigType type,
-00267                                               DMXConfigCommentPtr comment,
-00268                                               DMXConfigDisplayPtr display,
-00269                                               DMXConfigWallPtr wall,
-00270                                               DMXConfigOptionPtr option,
-00271                                               DMXConfigParamPtr param);
-00272 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeSub(DMXConfigSubPtr sub);
-00273 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigSubComment(DMXConfigCommentPtr comment);
-00274 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigSubDisplay(DMXConfigDisplayPtr display);
-00275 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigSubWall(DMXConfigWallPtr wall);
-00276 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigSubOption(DMXConfigOptionPtr option);
-00277 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigSubParam(DMXConfigParamPtr param);
-00278 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a>     dmxConfigAddSub(DMXConfigSubPtr head,
-00279                                            DMXConfigSubPtr sub);
-00280 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a25">DMXConfigVirtualPtr</a> dmxConfigCreateVirtual(DMXConfigTokenPtr pStart,
-00281                                                   DMXConfigStringPtr pName,
-00282                                                   DMXConfigPairPtr pDim,
-00283                                                   DMXConfigTokenPtr pOpen,
-00284                                                   DMXConfigSubPtr pSubentry,
-00285                                                   DMXConfigTokenPtr pClose);
-00286 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeVirtual(DMXConfigVirtualPtr <span class="keyword">virtual</span>);
-00287 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a>   dmxConfigCreateEntry(DMXConfigType type,
-00288                                                 DMXConfigCommentPtr comment,
-00289                                                 DMXConfigVirtualPtr <span class="keyword">virtual</span>);
-00290 <span class="keyword">extern</span> <span class="keywordtype">void</span>                dmxConfigFreeEntry(DMXConfigEntryPtr entry);
-00291 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a>   dmxConfigAddEntry(DMXConfigEntryPtr head,
-00292                                              DMXConfigType type,
-00293                                              DMXConfigCommentPtr comment,
-00294                                              DMXConfigVirtualPtr <span class="keyword">virtual</span>);
-00295 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a>   dmxConfigEntryComment(DMXConfigCommentPtr comment);
-00296 <span class="keyword">extern</span> <a class="code" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a>   dmxConfigEntryVirtual(DMXConfigVirtualPtr <span class="keyword">virtual</span>);
-00297 
-00298 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h.html
index 410075337..989fb475c 100644
--- a/xorg-server/hw/dmx/doc/html/dmxparse_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxparse_8h.html
@@ -6,761 +6,1914 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxparse.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxparse.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br/>
+
+<p><a href="dmxparse_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a></td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aa553d8e6837818d31707e48941f2c755">DMXConfigToken</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aa54f2be8a82814626992b0e2c2fd76ab">DMXConfigTokenPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a997735bb2e5362d670bd0eaf006e1336">DMXConfigString</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a163965084bb791376852afc3c8e2a3cd">DMXConfigStringPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a09ee4bfd4fb105b8d12a3debde0bedd9">DMXConfigNumber</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a0595f026bf3e261dda1479c3c3664ed7">DMXConfigNumberPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a67fb30fb9b3f930220aeea0e7258e5d1">DMXConfigPair</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a311865c935a9669ca901705d5b28db02">DMXConfigPairPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ac53f3a487c56877ce84e621b93c75e63">DMXConfigComment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a3eaf8193499e4474fa2f2c8363ff9558">DMXConfigCommentPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a0040a762f091a14803e78efa90c2b3aa">DMXConfigPartDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a62dde6c86a1db2e243c3d5804770ac98">DMXConfigPartDimPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a8ad44f7990920ef85b4bdb51c98be380">DMXConfigFullDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#af1018551e3cc9ec6836d0d605216e611">DMXConfigFullDimPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a31b5941021484d5b5ae6c905dca6f35a">DMXConfigDisplay</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a77569967e2f40e3e3f05d8e49a4e81f7">DMXConfigDisplayPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a09a530a073d8e23f78a3fdd3cdaa16c6">DMXConfigWall</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a176e5216b55fbc5ed7adb856501826a0">DMXConfigWallPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a9d47b44af4d217c2e6da2d4678611376">DMXConfigOption</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a8671db1fd961dbb11df3f83d1fab8227">DMXConfigOptionPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a5f7052d0d09e5bd5415f5fb9924c799e">DMXConfigParam</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a5af8bd2f2624df3b2fa6e36560f2b0a3">DMXConfigParamPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a2eeff7f31b82f02916abfddeac619406">DMXConfigSub</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aaeef2cb474e931950e496db8005654ff">DMXConfigSubPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ac88a2d841fca93f81e6412228570134d">DMXConfigVirtual</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a7df6222bb31e29b3b6d98cc9d765c70f">DMXConfigVirtualPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a8cb4fa1fa814f09a1cad1712894a8207">DMXConfigEntry</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ab46cf3c98a49f9dbf90120e8afd65e81">DMXConfigEntryPtr</a></td></tr>
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> { <br/>
+&nbsp;&nbsp;<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f">dmxConfigComment</a>, 
+<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face">dmxConfigVirtual</a>, 
+<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f">dmxConfigDisplay</a>, 
+<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212">dmxConfigWall</a>, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2">dmxConfigOption</a>, 
+<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698">dmxConfigParam</a>
+<br/>
+ }</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a9a7bd1b3d14701eb97c03f3ef34deff1">yylex</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a87640c870f7c3d90c830a68620e48de4">yyerror</a> (const char *message)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a2c4e1260c486d4898c5bb21ff221c89d">dmxConfigLog</a> (const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a1794b2e8571596d46f01ff8cf692410f">dmxConfigAlloc</a> (unsigned long bytes)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#af8e13444fded1f7707ab7dfc40655fd3">dmxConfigRealloc</a> (void *orig, unsigned long orig_bytes, unsigned long bytes)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a0d1c3d922b777254300e346b0111943c">dmxConfigCopyString</a> (const char *string, int length)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a890429fea43e1039967b94fadc1f4e29">dmxConfigFree</a> (void *area)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aaf6df2ea6db8e6f959c72fc28c46f1b2">dmxConfigCreateToken</a> (int token, int line, const char *comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a08b933b0269ebf4b22a6b43abbda19e2">dmxConfigFreeToken</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ae285ab0da6d63770365886d413f58432">dmxConfigCreateString</a> (int token, int line, const char *comment, const char *string)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a679f8776dd1a503057891de6483adc49">dmxConfigFreeString</a> (<a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a40cfc16a7a8a6f4b21bfb81d03490458">dmxConfigCreateNumber</a> (int token, int line, const char *comment, int number)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a2b8a343fe122733af82e802a01a5f30b">dmxConfigFreeNumber</a> (<a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a488a03d25bc380f1bdf786693c644957">dmxConfigCreatePair</a> (int token, int line, const char *comment, int x, int y, int xsign, int ysign)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a382b3c46caeb7e134e381d732f8d185e">dmxConfigFreePair</a> (<a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ae0619f5f0850b65fefe4df5112aaac05">dmxConfigCreateComment</a> (int token, int line, const char *comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a1c9b5f8f879ee6872295618c6e1dd232">dmxConfigFreeComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a1740a9f650d43464836c9b0ec44f9659">dmxConfigCreatePartDim</a> (<a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pOffset)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a8cb0f116f7c3c5ac3939cd69df06c0fe">dmxConfigFreePartDim</a> (<a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ac75eb1b376fb8a510d123ca119ef215e">dmxConfigCreateFullDim</a> (<a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> pScrn, <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> pRoot)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ad09f9037b194ad32029047499003a60a">dmxConfigFreeFullDim</a> (<a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ab3f5b4d4a5b535faf87b3bf7cb30d2d0">dmxConfigCreateDisplay</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pName, <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> pDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pOrigin, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a34126fa5dccdee442dce2b2413c43c53">dmxConfigFreeDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a6078c6ad23fc49e4992cade35f7351b2">dmxConfigCreateWall</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pWallDim, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDisplayDim, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pNameList, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aac254e191bb664ec87d44f70f52ce897">dmxConfigFreeWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ad183386657a3549f60760a156fad4fb8">dmxConfigCreateOption</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pOption, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a87d839927d1775c43e099e87f6e2ca8d">dmxConfigFreeOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a0a4ebd4b3769682daf7a6fed9f11744d">dmxConfigCreateParam</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pOpen, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pParam, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pClose, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pEnd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#af978e4f2f42e4d7e01d3d45a4c1b9a4d">dmxConfigFreeParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a782be9a8b3118f8a52825041b5c2e8e8">dmxConfigLookupParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p, const char *key, int *argc)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aa7e24c7be4cc3880e15274a53b627267">dmxConfigCreateSub</a> (<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, <a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> wall, <a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> option, <a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> param)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a07ef1f7f192d2c0d29332fc5c71e89b8">dmxConfigFreeSub</a> (<a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> sub)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a825d125808e8992c740315d3b78e493d">dmxConfigSubComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a4f26909fb7f97007567e5514839c3a53">dmxConfigSubDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#aac05245a327cc10096f1a049e675caef">dmxConfigSubWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> wall)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a23a35d27aa7bf22d815d2a9cff809307">dmxConfigSubOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> option)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a16047d4ba67462084a85156432c7cf05">dmxConfigSubParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> param)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a75e3403d28e2cb5b3b6da5461ef1bbca">dmxConfigAddSub</a> (<a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> head, <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> sub)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a427549ab2ffa269ca34bdb1a60e87bb0">dmxConfigCreateVirtual</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pStart, <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> pName, <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> pDim, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pOpen, <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> pSubentry, <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> pClose)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a6e48a41d83e97afcbd542a210ea30258">dmxConfigFreeVirtual</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a402a182c5c9922807ffc7998b4228b24">dmxConfigCreateEntry</a> (<a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ab18dcd503e9fbe9d81caa16bf07026ea">dmxConfigFreeEntry</a> (<a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#acec532235fc1d75b24779b3ed50aa037">dmxConfigAddEntry</a> (<a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> head, <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> type, <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#acee635a4deedd0f4b488d951346f4622">dmxConfigEntryComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> comment)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#a643b2c9c57d3009965318d20aad1ca0d">dmxConfigEntryVirtual</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> virtual)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#af1733e9f6f810a355a158f16f8bc7899">dmxConfigEntry</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxparse_8h.html#ab138aa8e11f58bcdcc7134adf240ea8c">yydebug</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to DMX configuration file parser. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxparse_8c.html">dmxparse.c</a> </dd></dl>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="ac53f3a487c56877ce84e621b93c75e63"></a><!-- doxytag: member="dmxparse.h::DMXConfigComment" ref="ac53f3a487c56877ce84e621b93c75e63" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>  <a class="el" href="struct__DMXConfigComment.html">DMXConfigComment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed comments not stored with a token. </p>
+
+</div>
+</div>
+<a class="anchor" id="a3eaf8193499e4474fa2f2c8363ff9558"></a><!-- doxytag: member="dmxparse.h::DMXConfigCommentPtr" ref="a3eaf8193499e4474fa2f2c8363ff9558" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a> * <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a31b5941021484d5b5ae6c905dca6f35a"></a><!-- doxytag: member="dmxparse.h::DMXConfigDisplay" ref="a31b5941021484d5b5ae6c905dca6f35a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>  <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplay</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed display information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a77569967e2f40e3e3f05d8e49a4e81f7"></a><!-- doxytag: member="dmxparse.h::DMXConfigDisplayPtr" ref="a77569967e2f40e3e3f05d8e49a4e81f7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> * <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8cb4fa1fa814f09a1cad1712894a8207"></a><!-- doxytag: member="dmxparse.h::DMXConfigEntry" ref="a8cb4fa1fa814f09a1cad1712894a8207" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>  <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntry</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Heads entry storage. </p>
+
+</div>
+</div>
+<a class="anchor" id="ab46cf3c98a49f9dbf90120e8afd65e81"></a><!-- doxytag: member="dmxparse.h::DMXConfigEntryPtr" ref="ab46cf3c98a49f9dbf90120e8afd65e81" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> * <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8ad44f7990920ef85b4bdb51c98be380"></a><!-- doxytag: member="dmxparse.h::DMXConfigFullDim" ref="a8ad44f7990920ef85b4bdb51c98be380" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>  <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores a pair of geometry specifications. </p>
+
+</div>
+</div>
+<a class="anchor" id="af1018551e3cc9ec6836d0d605216e611"></a><!-- doxytag: member="dmxparse.h::DMXConfigFullDimPtr" ref="af1018551e3cc9ec6836d0d605216e611" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> * <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a09ee4bfd4fb105b8d12a3debde0bedd9"></a><!-- doxytag: member="dmxparse.h::DMXConfigNumber" ref="a09ee4bfd4fb105b8d12a3debde0bedd9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>  <a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumber</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed numbers. </p>
+
+</div>
+</div>
+<a class="anchor" id="a0595f026bf3e261dda1479c3c3664ed7"></a><!-- doxytag: member="dmxparse.h::DMXConfigNumberPtr" ref="a0595f026bf3e261dda1479c3c3664ed7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> * <a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a9d47b44af4d217c2e6da2d4678611376"></a><!-- doxytag: member="dmxparse.h::DMXConfigOption" ref="a9d47b44af4d217c2e6da2d4678611376" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>  <a class="el" href="struct__DMXConfigOption.html">DMXConfigOption</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed option information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a8671db1fd961dbb11df3f83d1fab8227"></a><!-- doxytag: member="dmxparse.h::DMXConfigOptionPtr" ref="a8671db1fd961dbb11df3f83d1fab8227" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a> * <a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a67fb30fb9b3f930220aeea0e7258e5d1"></a><!-- doxytag: member="dmxparse.h::DMXConfigPair" ref="a67fb30fb9b3f930220aeea0e7258e5d1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>  <a class="el" href="struct__DMXConfigPair.html">DMXConfigPair</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed pairs (e.g., x y) </p>
+
+</div>
+</div>
+<a class="anchor" id="a311865c935a9669ca901705d5b28db02"></a><!-- doxytag: member="dmxparse.h::DMXConfigPairPtr" ref="a311865c935a9669ca901705d5b28db02" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a> * <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5f7052d0d09e5bd5415f5fb9924c799e"></a><!-- doxytag: member="dmxparse.h::DMXConfigParam" ref="a5f7052d0d09e5bd5415f5fb9924c799e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>  <a class="el" href="struct__DMXConfigParam.html">DMXConfigParam</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed param information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a5af8bd2f2624df3b2fa6e36560f2b0a3"></a><!-- doxytag: member="dmxparse.h::DMXConfigParamPtr" ref="a5af8bd2f2624df3b2fa6e36560f2b0a3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a> * <a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0040a762f091a14803e78efa90c2b3aa"></a><!-- doxytag: member="dmxparse.h::DMXConfigPartDim" ref="a0040a762f091a14803e78efa90c2b3aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>  <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores a geometry specification. </p>
+
+</div>
+</div>
+<a class="anchor" id="a62dde6c86a1db2e243c3d5804770ac98"></a><!-- doxytag: member="dmxparse.h::DMXConfigPartDimPtr" ref="a62dde6c86a1db2e243c3d5804770ac98" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> * <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a997735bb2e5362d670bd0eaf006e1336"></a><!-- doxytag: member="dmxparse.h::DMXConfigString" ref="a997735bb2e5362d670bd0eaf006e1336" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>  <a class="el" href="struct__DMXConfigString.html">DMXConfigString</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed strings. </p>
+
+</div>
+</div>
+<a class="anchor" id="a163965084bb791376852afc3c8e2a3cd"></a><!-- doxytag: member="dmxparse.h::DMXConfigStringPtr" ref="a163965084bb791376852afc3c8e2a3cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a> * <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2eeff7f31b82f02916abfddeac619406"></a><!-- doxytag: member="dmxparse.h::DMXConfigSub" ref="a2eeff7f31b82f02916abfddeac619406" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>  <a class="el" href="struct__DMXConfigSub.html">DMXConfigSub</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores options under an entry (subentry). </p>
+
+</div>
+</div>
+<a class="anchor" id="aaeef2cb474e931950e496db8005654ff"></a><!-- doxytag: member="dmxparse.h::DMXConfigSubPtr" ref="aaeef2cb474e931950e496db8005654ff" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a> * <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aa553d8e6837818d31707e48941f2c755"></a><!-- doxytag: member="dmxparse.h::DMXConfigToken" ref="aa553d8e6837818d31707e48941f2c755" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>  <a class="el" href="struct__DMXConfigToken.html">DMXConfigToken</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores tokens not stored in other structures (e.g., keywords and ;) </p>
+
+</div>
+</div>
+<a class="anchor" id="aa54f2be8a82814626992b0e2c2fd76ab"></a><!-- doxytag: member="dmxparse.h::DMXConfigTokenPtr" ref="aa54f2be8a82814626992b0e2c2fd76ab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a> * <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ac88a2d841fca93f81e6412228570134d"></a><!-- doxytag: member="dmxparse.h::DMXConfigVirtual" ref="ac88a2d841fca93f81e6412228570134d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>  <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtual</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed virtual information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a7df6222bb31e29b3b6d98cc9d765c70f"></a><!-- doxytag: member="dmxparse.h::DMXConfigVirtualPtr" ref="a7df6222bb31e29b3b6d98cc9d765c70f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> * <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a09a530a073d8e23f78a3fdd3cdaa16c6"></a><!-- doxytag: member="dmxparse.h::DMXConfigWall" ref="a09a530a073d8e23f78a3fdd3cdaa16c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>  <a class="el" href="struct__DMXConfigWall.html">DMXConfigWall</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Stores parsed wall information. </p>
+
+</div>
+</div>
+<a class="anchor" id="a176e5216b55fbc5ed7adb856501826a0"></a><!-- doxytag: member="dmxparse.h::DMXConfigWallPtr" ref="a176e5216b55fbc5ed7adb856501826a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a> * <a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88"></a><!-- doxytag: member="dmxparse.h::DMXConfigType" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f"></a><!-- doxytag: member="dmxConfigComment" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f" args="" -->dmxConfigComment</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face"></a><!-- doxytag: member="dmxConfigVirtual" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face" args="" -->dmxConfigVirtual</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f"></a><!-- doxytag: member="dmxConfigDisplay" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f" args="" -->dmxConfigDisplay</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212"></a><!-- doxytag: member="dmxConfigWall" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212" args="" -->dmxConfigWall</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2"></a><!-- doxytag: member="dmxConfigOption" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2" args="" -->dmxConfigOption</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698"></a><!-- doxytag: member="dmxConfigParam" ref="a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698" args="" -->dmxConfigParam</em>&nbsp;</td><td>
+</td></tr>
+</table>
+</dd>
+</dl>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="acec532235fc1d75b24779b3ed50aa037"></a><!-- doxytag: member="dmxparse.h::dmxConfigAddEntry" ref="acec532235fc1d75b24779b3ed50aa037" args="(DMXConfigEntryPtr head, DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigAddEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>head</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<p>
-<a href="dmxparse_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a></td></tr>
+<p>References <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, and <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a></td></tr>
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a75e3403d28e2cb5b3b6da5461ef1bbca"></a><!-- doxytag: member="dmxparse.h::dmxConfigAddSub" ref="a75e3403d28e2cb5b3b6da5461ef1bbca" args="(DMXConfigSubPtr head, DMXConfigSubPtr sub)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigAddSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>head</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>sub</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a></td></tr>
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a1794b2e8571596d46f01ff8cf692410f"></a><!-- doxytag: member="dmxparse.h::dmxConfigAlloc" ref="a1794b2e8571596d46f01ff8cf692410f" args="(unsigned long bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* dmxConfigAlloc </td>
+          <td>(</td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a></td></tr>
+<p>References <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a></td></tr>
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00088">dmxConfigCopyString()</a>, <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00104">dmxConfigCreateToken()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00082">dmxConfigPushState()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a0d1c3d922b777254300e346b0111943c"></a><!-- doxytag: member="dmxparse.h::dmxConfigCopyString" ref="a0d1c3d922b777254300e346b0111943c" args="(const char *string, int length)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* dmxConfigCopyString </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>length</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a></td></tr>
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ae0619f5f0850b65fefe4df5112aaac05"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateComment" ref="ae0619f5f0850b65fefe4df5112aaac05" args="(int token, int line, const char *comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> dmxConfigCreateComment </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00081">_DMXConfigComment::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00080">_DMXConfigComment::line</a>, and <a class="el" href="dmxparse_8h_source.html#l00079">_DMXConfigComment::token</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a0">DMXConfigToken</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ab3f5b4d4a5b535faf87b3bf7cb30d2d0"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateDisplay" ref="ab3f5b4d4a5b535faf87b3bf7cb30d2d0" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigFullDimPtr pDim, DMXConfigPairPtr pOrigin, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> dmxConfigCreateDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pName</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOrigin</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a1">DMXConfigTokenPtr</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8h_source.html#l00123">_DMXConfigDisplay::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00122">_DMXConfigDisplay::dname</a>, <a class="el" href="dmxparse_8h_source.html#l00125">_DMXConfigDisplay::end</a>, <a class="el" href="dmxparse_8h_source.html#l00108">_DMXConfigDisplay::name</a>, <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>, <a class="el" href="dmxparse_8h_source.html#l00124">_DMXConfigDisplay::origin</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootX</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootXOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootY</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootYOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootYSign</a>, <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnX</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnY</a>, <a class="el" href="dmxparse_8h_source.html#l00112">_DMXConfigDisplay::scrnYSign</a>, <a class="el" href="dmxparse_8h_source.html#l00121">_DMXConfigDisplay::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a2">DMXConfigString</a></td></tr>
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a3">DMXConfigStringPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a402a182c5c9922807ffc7998b4228b24"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateEntry" ref="a402a182c5c9922807ffc7998b4228b24" args="(DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigCreateEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a4">DMXConfigNumber</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a5">DMXConfigNumberPtr</a></td></tr>
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00583">dmxConfigAddEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00599">dmxConfigEntryComment()</a>, and <a class="el" href="dmxparse_8c_source.html#l00604">dmxConfigEntryVirtual()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a6">DMXConfigPair</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ac75eb1b376fb8a510d123ca119ef215e"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateFullDim" ref="ac75eb1b376fb8a510d123ca119ef215e" args="(DMXConfigPartDimPtr pScrn, DMXConfigPartDimPtr pRoot)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> dmxConfigCreateFullDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pScrn</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pRoot</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a7">DMXConfigPairPtr</a></td></tr>
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, and <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a8">DMXConfigComment</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a9">DMXConfigCommentPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a40cfc16a7a8a6f4b21bfb81d03490458"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateNumber" ref="a40cfc16a7a8a6f4b21bfb81d03490458" args="(int token, int line, const char *comment, int number)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a> dmxConfigCreateNumber </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>number</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a10">DMXConfigPartDim</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00062">_DMXConfigNumber::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00061">_DMXConfigNumber::line</a>, <a class="el" href="dmxparse_8h_source.html#l00063">_DMXConfigNumber::number</a>, and <a class="el" href="dmxparse_8h_source.html#l00060">_DMXConfigNumber::token</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a11">DMXConfigPartDimPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ad183386657a3549f60760a156fad4fb8"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateOption" ref="ad183386657a3549f60760a156fad4fb8" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pOption, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> dmxConfigCreateOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOption</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a12">DMXConfigFullDim</a></td></tr>
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00151">_DMXConfigOption::end</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmxparse_8h_source.html#l00150">_DMXConfigOption::option</a>, <a class="el" href="dmxparse_8h_source.html#l00149">_DMXConfigOption::start</a>, <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a13">DMXConfigFullDimPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a488a03d25bc380f1bdf786693c644957"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreatePair" ref="a488a03d25bc380f1bdf786693c644957" args="(int token, int line, const char *comment, int x, int y, int xsign, int ysign)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> dmxConfigCreatePair </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>xsign</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ysign</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a14">DMXConfigDisplay</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00070">_DMXConfigPair::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00069">_DMXConfigPair::line</a>, <a class="el" href="dmxparse_8h_source.html#l00068">_DMXConfigPair::token</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a15">DMXConfigDisplayPtr</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a16">DMXConfigWall</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a0a4ebd4b3769682daf7a6fed9f11744d"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateParam" ref="a0a4ebd4b3769682daf7a6fed9f11744d" args="(DMXConfigTokenPtr pStart, DMXConfigTokenPtr pOpen, DMXConfigStringPtr pParam, DMXConfigTokenPtr pClose, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> dmxConfigCreateParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOpen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pParam</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pClose</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a17">DMXConfigWallPtr</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00156">_DMXConfigParam::argc</a>, <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, <a class="el" href="dmxparse_8h_source.html#l00162">_DMXConfigParam::close</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00163">_DMXConfigParam::end</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, <a class="el" href="dmxparse_8h_source.html#l00160">_DMXConfigParam::open</a>, <a class="el" href="dmxparse_8h_source.html#l00161">_DMXConfigParam::param</a>, <a class="el" href="dmxparse_8h_source.html#l00159">_DMXConfigParam::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a18">DMXConfigOption</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a1740a9f650d43464836c9b0ec44f9659"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreatePartDim" ref="a1740a9f650d43464836c9b0ec44f9659" args="(DMXConfigPairPtr pDim, DMXConfigPairPtr pOffset)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> dmxConfigCreatePartDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOffset</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a19">DMXConfigOptionPtr</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, and <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a20">DMXConfigParam</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a21">DMXConfigParamPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ae285ab0da6d63770365886d413f58432"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateString" ref="ae285ab0da6d63770365886d413f58432" args="(int token, int line, const char *comment, const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> dmxConfigCreateString </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a22">DMXConfigSub</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00053">_DMXConfigString::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00052">_DMXConfigString::line</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00051">_DMXConfigString::token</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a23">DMXConfigSubPtr</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a24">DMXConfigVirtual</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="aa7e24c7be4cc3880e15274a53b627267"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateSub" ref="aa7e24c7be4cc3880e15274a53b627267" args="(DMXConfigType type, DMXConfigCommentPtr comment, DMXConfigDisplayPtr display, DMXConfigWallPtr wall, DMXConfigOptionPtr option, DMXConfigParamPtr param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigCreateSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>display</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>wall</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>option</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>param</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a25">DMXConfigVirtualPtr</a></td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00170">_DMXConfigSub::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a26">DMXConfigEntry</a></td></tr>
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00481">dmxConfigSubComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00487">dmxConfigSubDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00498">dmxConfigSubOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00503">dmxConfigSubParam()</a>, and <a class="el" href="dmxparse_8c_source.html#l00493">dmxConfigSubWall()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a27">DMXConfigEntryPtr</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="aaf6df2ea6db8e6f959c72fc28c46f1b2"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateToken" ref="aaf6df2ea6db8e6f959c72fc28c46f1b2" args="(int token, int line, const char *comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> dmxConfigCreateToken </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>token</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxparse_8h.html#a38">dmxConfigLog</a> (const  char *format,...)</td></tr>
+<p>References <a class="el" href="dmxparse_8h_source.html#l00046">_DMXConfigToken::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00045">_DMXConfigToken::line</a>, and <a class="el" href="dmxparse_8h_source.html#l00044">_DMXConfigToken::token</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to DMX configuration file parser. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxparse_8c.html">dmxparse.c</a></dd></dl>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxparse.h::DMXConfigComment" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a>  <a class="el" href="struct__DMXConfigComment.html">DMXConfigComment</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed comments not stored with a token.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxparse.h::DMXConfigCommentPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a427549ab2ffa269ca34bdb1a60e87bb0"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateVirtual" ref="a427549ab2ffa269ca34bdb1a60e87bb0" args="(DMXConfigTokenPtr pStart, DMXConfigStringPtr pName, DMXConfigPairPtr pDim, DMXConfigTokenPtr pOpen, DMXConfigSubPtr pSubentry, DMXConfigTokenPtr pClose)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigComment.html">_DMXConfigComment</a> * <a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed comments not stored with a token.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxparse.h::DMXConfigDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="memname"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> dmxConfigCreateVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a>  <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplay</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed display information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxparse.h::DMXConfigDisplayPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pName</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pOpen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pSubentry</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pClose</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> * <a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed display information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxparse.h::DMXConfigEntry" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00190">_DMXConfigVirtual::close</a>, <a class="el" href="dmxparse_8h_source.html#l00187">_DMXConfigVirtual::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::height</a>, <a class="el" href="dmxparse_8h_source.html#l00181">_DMXConfigVirtual::name</a>, <a class="el" href="dmxparse_8h_source.html#l00188">_DMXConfigVirtual::open</a>, <a class="el" href="dmxparse_8h_source.html#l00185">_DMXConfigVirtual::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00189">_DMXConfigVirtual::subentry</a>, <a class="el" href="dmxparse_8h_source.html#l00186">_DMXConfigVirtual::vname</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::width</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, and <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6078c6ad23fc49e4992cade35f7351b2"></a><!-- doxytag: member="dmxparse.h::dmxConfigCreateWall" ref="a6078c6ad23fc49e4992cade35f7351b2" args="(DMXConfigTokenPtr pStart, DMXConfigPairPtr pWallDim, DMXConfigPairPtr pDisplayDim, DMXConfigStringPtr pNameList, DMXConfigTokenPtr pEnd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>  <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntry</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> dmxConfigCreateWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pStart</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pWallDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pDisplayDim</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pNameList</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>pEnd</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Heads entry storage.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxparse.h::DMXConfigEntryPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00138">_DMXConfigWall::displayDim</a>, <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8h_source.html#l00140">_DMXConfigWall::end</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::height</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00136">_DMXConfigWall::start</a>, <a class="el" href="dmxparse_8h_source.html#l00137">_DMXConfigWall::wallDim</a>, <a class="el" href="dmxparse_8h_source.html#l00131">_DMXConfigWall::width</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::xwall</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00132">_DMXConfigWall::ywall</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acee635a4deedd0f4b488d951346f4622"></a><!-- doxytag: member="dmxparse.h::dmxConfigEntryComment" ref="acee635a4deedd0f4b488d951346f4622" args="(DMXConfigCommentPtr comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> * <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigEntryComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Heads entry storage.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxparse.h::DMXConfigFullDim" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, and <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a643b2c9c57d3009965318d20aad1ca0d"></a><!-- doxytag: member="dmxparse.h::dmxConfigEntryVirtual" ref="a643b2c9c57d3009965318d20aad1ca0d" args="(DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a>  <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDim</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> dmxConfigEntryVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores a pair of geometry specifications.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxparse.h::DMXConfigFullDimPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, and <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a890429fea43e1039967b94fadc1f4e29"></a><!-- doxytag: member="dmxparse.h::dmxConfigFree" ref="a890429fea43e1039967b94fadc1f4e29" args="(void *area)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> * <a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>
+          <td class="memname">void dmxConfigFree </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>area</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores a pair of geometry specifications.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxparse.h::DMXConfigNumber" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00160">dmxConfigFreeNumber()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c9b5f8f879ee6872295618c6e1dd232"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeComment" ref="a1c9b5f8f879ee6872295618c6e1dd232" args="(DMXConfigCommentPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a>  <a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumber</a>
+          <td class="memname">void dmxConfigFreeComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed numbers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxparse.h::DMXConfigNumberPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00081">_DMXConfigComment::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, and <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a34126fa5dccdee442dce2b2413c43c53"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeDisplay" ref="a34126fa5dccdee442dce2b2413c43c53" args="(DMXConfigDisplayPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> * <a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>
+          <td class="memname">void dmxConfigFreeDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed numbers.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxparse.h::DMXConfigOption" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00123">_DMXConfigDisplay::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00122">_DMXConfigDisplay::dname</a>, <a class="el" href="dmxparse_8h_source.html#l00125">_DMXConfigDisplay::end</a>, and <a class="el" href="dmxparse_8h_source.html#l00121">_DMXConfigDisplay::start</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, and <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab18dcd503e9fbe9d81caa16bf07026ea"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeEntry" ref="ab18dcd503e9fbe9d81caa16bf07026ea" args="(DMXConfigEntryPtr entry)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a>  <a class="el" href="struct__DMXConfigOption.html">DMXConfigOption</a>
+          <td class="memname">void dmxConfigFreeEntry </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>entry</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed option information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxparse.h::DMXConfigOptionPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad09f9037b194ad32029047499003a60a"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeFullDim" ref="ad09f9037b194ad32029047499003a60a" args="(DMXConfigFullDimPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigOption.html">_DMXConfigOption</a> * <a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>
+          <td class="memname">void dmxConfigFreeFullDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed option information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxparse.h::DMXConfigPair" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, and <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2b8a343fe122733af82e802a01a5f30b"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeNumber" ref="a2b8a343fe122733af82e802a01a5f30b" args="(DMXConfigNumberPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a>  <a class="el" href="struct__DMXConfigPair.html">DMXConfigPair</a>
+          <td class="memname">void dmxConfigFreeNumber </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed pairs (e.g., x y)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxparse.h::DMXConfigPairPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00062">_DMXConfigNumber::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a87d839927d1775c43e099e87f6e2ca8d"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeOption" ref="a87d839927d1775c43e099e87f6e2ca8d" args="(DMXConfigOptionPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigPair.html">_DMXConfigPair</a> * <a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>
+          <td class="memname">void dmxConfigFreeOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed pairs (e.g., x y)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxparse.h::DMXConfigParam" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00151">_DMXConfigOption::end</a>, <a class="el" href="dmxparse_8h_source.html#l00150">_DMXConfigOption::option</a>, <a class="el" href="dmxparse_8h_source.html#l00149">_DMXConfigOption::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a382b3c46caeb7e134e381d732f8d185e"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreePair" ref="a382b3c46caeb7e134e381d732f8d185e" args="(DMXConfigPairPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>  <a class="el" href="struct__DMXConfigParam.html">DMXConfigParam</a>
+          <td class="memname">void dmxConfigFreePair </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed param information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxparse.h::DMXConfigParamPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00070">_DMXConfigPair::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af978e4f2f42e4d7e01d3d45a4c1b9a4d"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeParam" ref="af978e4f2f42e4d7e01d3d45a4c1b9a4d" args="(DMXConfigParamPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a> * <a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>
+          <td class="memname">void dmxConfigFreeParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed param information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxparse.h::DMXConfigPartDim" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, <a class="el" href="dmxparse_8h_source.html#l00162">_DMXConfigParam::close</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00163">_DMXConfigParam::end</a>, <a class="el" href="dmxparse_8h_source.html#l00164">_DMXConfigParam::next</a>, <a class="el" href="dmxparse_8h_source.html#l00160">_DMXConfigParam::open</a>, <a class="el" href="dmxparse_8h_source.html#l00161">_DMXConfigParam::param</a>, and <a class="el" href="dmxparse_8h_source.html#l00159">_DMXConfigParam::start</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8cb0f116f7c3c5ac3939cd69df06c0fe"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreePartDim" ref="a8cb0f116f7c3c5ac3939cd69df06c0fe" args="(DMXConfigPartDimPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a>  <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDim</a>
+          <td class="memname">void dmxConfigFreePartDim </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores a geometry specification.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxparse.h::DMXConfigPartDimPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, and <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a679f8776dd1a503057891de6483adc49"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeString" ref="a679f8776dd1a503057891de6483adc49" args="(DMXConfigStringPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> * <a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>
+          <td class="memname">void dmxConfigFreeString </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores a geometry specification.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxparse.h::DMXConfigString" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00053">_DMXConfigString::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a07ef1f7f192d2c0d29332fc5c71e89b8"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeSub" ref="a07ef1f7f192d2c0d29332fc5c71e89b8" args="(DMXConfigSubPtr sub)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>  <a class="el" href="struct__DMXConfigString.html">DMXConfigString</a>
+          <td class="memname">void dmxConfigFreeSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>sub</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed strings.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxparse.h::DMXConfigStringPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00170">_DMXConfigSub::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a08b933b0269ebf4b22a6b43abbda19e2"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeToken" ref="a08b933b0269ebf4b22a6b43abbda19e2" args="(DMXConfigTokenPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a> * <a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>
+          <td class="memname">void dmxConfigFreeToken </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed strings.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxparse.h::DMXConfigSub" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00046">_DMXConfigToken::comment</a>, and <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00542">dmxConfigFreeVirtual()</a>, and <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6e48a41d83e97afcbd542a210ea30258"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeVirtual" ref="a6e48a41d83e97afcbd542a210ea30258" args="(DMXConfigVirtualPtr virtual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>  <a class="el" href="struct__DMXConfigSub.html">DMXConfigSub</a>
+          <td class="memname">void dmxConfigFreeVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>virtual</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores options under an entry (subentry).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxparse.h::DMXConfigSubPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00632">dmxConfigDCCallback()</a>, and <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac254e191bb664ec87d44f70f52ce897"></a><!-- doxytag: member="dmxparse.h::dmxConfigFreeWall" ref="aac254e191bb664ec87d44f70f52ce897" args="(DMXConfigWallPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a> * <a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>
+          <td class="memname">void dmxConfigFreeWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores options under an entry (subentry).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxparse.h::DMXConfigToken" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00138">_DMXConfigWall::displayDim</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00140">_DMXConfigWall::end</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00136">_DMXConfigWall::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00137">_DMXConfigWall::wallDim</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2c4e1260c486d4898c5bb21ff221c89d"></a><!-- doxytag: member="dmxparse.h::dmxConfigLog" ref="a2c4e1260c486d4898c5bb21ff221c89d" args="(const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigLog </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a>  <a class="el" href="struct__DMXConfigToken.html">DMXConfigToken</a>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores tokens not stored in other structures (e.g., keywords and ;)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxparse.h::DMXConfigTokenPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>A general error logging routine that does not depend on the dmxLog functions. </p>
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>, <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>, <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>, and <a class="el" href="dmxparse_8c_source.html#l00076">dmxConfigRealloc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a782be9a8b3118f8a52825041b5c2e8e8"></a><!-- doxytag: member="dmxparse.h::dmxConfigLookupParam" ref="a782be9a8b3118f8a52825041b5c2e8e8" args="(DMXConfigParamPtr p, const char *key, int *argc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char** dmxConfigLookupParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigToken.html">_DMXConfigToken</a> * <a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>key</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>argc</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores tokens not stored in other structures (e.g., keywords and ;)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxparse.h::DMXConfigVirtual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00156">_DMXConfigParam::argc</a>, <a class="el" href="dmxparse_8h_source.html#l00157">_DMXConfigParam::argv</a>, and <a class="el" href="dmxparse_8h_source.html#l00164">_DMXConfigParam::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00320">dmxConfigCopyFromParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af8e13444fded1f7707ab7dfc40655fd3"></a><!-- doxytag: member="dmxparse.h::dmxConfigRealloc" ref="af8e13444fded1f7707ab7dfc40655fd3" args="(void *orig, unsigned long orig_bytes, unsigned long bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* dmxConfigRealloc </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>orig</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>orig_bytes</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a>  <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtual</a>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed virtual information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxparse.h::DMXConfigVirtualPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a825d125808e8992c740315d3b78e493d"></a><!-- doxytag: member="dmxparse.h::dmxConfigSubComment" ref="a825d125808e8992c740315d3b78e493d" args="(DMXConfigCommentPtr comment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> * <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>comment</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed virtual information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxparse.h::DMXConfigWall" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, and <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4f26909fb7f97007567e5514839c3a53"></a><!-- doxytag: member="dmxparse.h::dmxConfigSubDisplay" ref="a4f26909fb7f97007567e5514839c3a53" args="(DMXConfigDisplayPtr display)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a>  <a class="el" href="struct__DMXConfigWall.html">DMXConfigWall</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>display</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed wall information.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxparse.h::DMXConfigWallPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a23a35d27aa7bf22d815d2a9cff809307"></a><!-- doxytag: member="dmxparse.h::dmxConfigSubOption" ref="a23a35d27aa7bf22d815d2a9cff809307" args="(DMXConfigOptionPtr option)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXConfigWall.html">_DMXConfigWall</a> * <a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>option</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Stores parsed wall information.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a38" doxytag="dmxparse.h::dmxConfigLog" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a16047d4ba67462084a85156432c7cf05"></a><!-- doxytag: member="dmxparse.h::dmxConfigSubParam" ref="a16047d4ba67462084a85156432c7cf05" args="(DMXConfigParamPtr param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigLog </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>param</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac05245a327cc10096f1a049e675caef"></a><!-- doxytag: member="dmxparse.h::dmxConfigSubWall" ref="aac05245a327cc10096f1a049e675caef" args="(DMXConfigWallPtr wall)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> dmxConfigSubWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>wall</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, and <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a87640c870f7c3d90c830a68620e48de4"></a><!-- doxytag: member="dmxparse.h::yyerror" ref="a87640c870f7c3d90c830a68620e48de4" args="(const char *message)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void yyerror </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>message</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>...&nbsp;</td>
-          <td class="mdname" nowrap></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a9a7bd1b3d14701eb97c03f3ef34deff1"></a><!-- doxytag: member="dmxparse.h::yylex" ref="a9a7bd1b3d14701eb97c03f3ef34deff1" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int yylex </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="af1733e9f6f810a355a158f16f8bc7899"></a><!-- doxytag: member="dmxparse.h::dmxConfigEntry" ref="af1733e9f6f810a355a158f16f8bc7899" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> <a class="el" href="xdmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">dmxConfigEntry</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab138aa8e11f58bcdcc7134adf240ea8c"></a><!-- doxytag: member="dmxparse.h::yydebug" ref="ab138aa8e11f58bcdcc7134adf240ea8c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxparse_8h.html#ab138aa8e11f58bcdcc7134adf240ea8c">yydebug</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-A general error logging routine that does not depend on the dmxLog functions.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, and <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html
new file mode 100644
index 000000000..95c1086a5
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxparse_8h_source.html
@@ -0,0 +1,316 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxparse.h</h1><a href="dmxparse_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXPARSE_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPARSE_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &lt;stdio.h&gt;</span>              <span class="comment">/* For FILE */</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__DMXConfigToken.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigToken.html">_DMXConfigToken</a> {
+<a name="l00044"></a><a class="code" href="struct__DMXConfigToken.html#a1b38f07f74ea8969f6690894b1a55bc9">00044</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigToken.html#a1b38f07f74ea8969f6690894b1a55bc9">token</a>;
+<a name="l00045"></a><a class="code" href="struct__DMXConfigToken.html#a620f9948af21b7d71d0e2593052efbdb">00045</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigToken.html#a620f9948af21b7d71d0e2593052efbdb">line</a>;
+<a name="l00046"></a><a class="code" href="struct__DMXConfigToken.html#a5d6e98d74416a8cc9cfe453618bc8f60">00046</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigToken.html#a5d6e98d74416a8cc9cfe453618bc8f60">comment</a>;
+<a name="l00047"></a>00047 } <a class="code" href="struct__DMXConfigToken.html">DMXConfigToken</a>, *<a class="code" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>;
+<a name="l00048"></a>00048 
+<a name="l00050"></a><a class="code" href="struct__DMXConfigString.html">00050</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigString.html">_DMXConfigString</a> {
+<a name="l00051"></a><a class="code" href="struct__DMXConfigString.html#a8a9d70fddf92c8b21c1fc22c14bc11dc">00051</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigString.html#a8a9d70fddf92c8b21c1fc22c14bc11dc">token</a>;
+<a name="l00052"></a><a class="code" href="struct__DMXConfigString.html#ae38fed90a55176e6c33013fa06da5c59">00052</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigString.html#ae38fed90a55176e6c33013fa06da5c59">line</a>;
+<a name="l00053"></a><a class="code" href="struct__DMXConfigString.html#a68a3812610093891aa3f6ac9c84a25e9">00053</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigString.html#a68a3812610093891aa3f6ac9c84a25e9">comment</a>;
+<a name="l00054"></a><a class="code" href="struct__DMXConfigString.html#abf71ceee99527eccff9a76622390e89d">00054</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigString.html#abf71ceee99527eccff9a76622390e89d">string</a>;
+<a name="l00055"></a><a class="code" href="struct__DMXConfigString.html#af123e2436273aa9d19799bf8d6d5e2a6">00055</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigString.html">_DMXConfigString</a>  *<a class="code" href="struct__DMXConfigString.html#af123e2436273aa9d19799bf8d6d5e2a6">next</a>;
+<a name="l00056"></a>00056 } <a class="code" href="struct__DMXConfigString.html">DMXConfigString</a>, *<a class="code" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>;
+<a name="l00057"></a>00057 
+<a name="l00059"></a><a class="code" href="struct__DMXConfigNumber.html">00059</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigNumber.html">_DMXConfigNumber</a> {
+<a name="l00060"></a><a class="code" href="struct__DMXConfigNumber.html#a289fd0e588b62964013d3fd435710e92">00060</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigNumber.html#a289fd0e588b62964013d3fd435710e92">token</a>;
+<a name="l00061"></a><a class="code" href="struct__DMXConfigNumber.html#a66c727de8b2853e70cb5f58f2ab62762">00061</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigNumber.html#a66c727de8b2853e70cb5f58f2ab62762">line</a>;
+<a name="l00062"></a><a class="code" href="struct__DMXConfigNumber.html#aa42b9cbe7decdbe3af0249eaae1f0d56">00062</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigNumber.html#aa42b9cbe7decdbe3af0249eaae1f0d56">comment</a>;
+<a name="l00063"></a><a class="code" href="struct__DMXConfigNumber.html#a719e274551cdc47c62fd43f44717df27">00063</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigNumber.html#a719e274551cdc47c62fd43f44717df27">number</a>;
+<a name="l00064"></a>00064 } <a class="code" href="struct__DMXConfigNumber.html">DMXConfigNumber</a>, *<a class="code" href="struct__DMXConfigNumber.html">DMXConfigNumberPtr</a>;
+<a name="l00065"></a>00065 
+<a name="l00067"></a><a class="code" href="struct__DMXConfigPair.html">00067</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigPair.html">_DMXConfigPair</a> {
+<a name="l00068"></a><a class="code" href="struct__DMXConfigPair.html#a530882670c820cc229355ce750e5173a">00068</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a530882670c820cc229355ce750e5173a">token</a>;
+<a name="l00069"></a><a class="code" href="struct__DMXConfigPair.html#a6da615bada6472447bb009d108cdc5d4">00069</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a6da615bada6472447bb009d108cdc5d4">line</a>;
+<a name="l00070"></a><a class="code" href="struct__DMXConfigPair.html#a0f38d4d9feafd30ee2e54d14c15ee72d">00070</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigPair.html#a0f38d4d9feafd30ee2e54d14c15ee72d">comment</a>;
+<a name="l00071"></a><a class="code" href="struct__DMXConfigPair.html#a0e280ace6ccfae354457b60d38f21454">00071</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a0e280ace6ccfae354457b60d38f21454">x</a>;
+<a name="l00072"></a><a class="code" href="struct__DMXConfigPair.html#a0dea17faf035dfdcbf0862760285fdee">00072</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a0dea17faf035dfdcbf0862760285fdee">y</a>;
+<a name="l00073"></a><a class="code" href="struct__DMXConfigPair.html#a4fd6b9063fe2f5790805ce64f8cbfd11">00073</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a4fd6b9063fe2f5790805ce64f8cbfd11">xsign</a>;
+<a name="l00074"></a><a class="code" href="struct__DMXConfigPair.html#a40ec327f714f589c6aa08fd6db4af93a">00074</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigPair.html#a40ec327f714f589c6aa08fd6db4af93a">ysign</a>;
+<a name="l00075"></a>00075 } <a class="code" href="struct__DMXConfigPair.html">DMXConfigPair</a>, *<a class="code" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>;
+<a name="l00076"></a>00076 
+<a name="l00078"></a><a class="code" href="struct__DMXConfigComment.html">00078</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigComment.html">_DMXConfigComment</a> {
+<a name="l00079"></a><a class="code" href="struct__DMXConfigComment.html#af226b22c22c9925ed1bcba04bfa264e5">00079</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigComment.html#af226b22c22c9925ed1bcba04bfa264e5">token</a>;
+<a name="l00080"></a><a class="code" href="struct__DMXConfigComment.html#a5789db611ea38b03cf6cfe75ba9276b0">00080</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigComment.html#a5789db611ea38b03cf6cfe75ba9276b0">line</a>;
+<a name="l00081"></a><a class="code" href="struct__DMXConfigComment.html#a1387eef92c8408b20fbdeea78057bc22">00081</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigComment.html#a1387eef92c8408b20fbdeea78057bc22">comment</a>;
+<a name="l00082"></a>00082 } <a class="code" href="struct__DMXConfigComment.html">DMXConfigComment</a>, *<a class="code" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>;
+<a name="l00083"></a>00083 
+<a name="l00084"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">00084</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00085"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f">00085</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f">dmxConfigComment</a>,
+<a name="l00086"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face">00086</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face">dmxConfigVirtual</a>,
+<a name="l00087"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f">00087</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f">dmxConfigDisplay</a>,
+<a name="l00088"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212">00088</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212">dmxConfigWall</a>,
+<a name="l00089"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2">00089</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2">dmxConfigOption</a>,
+<a name="l00090"></a><a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698">00090</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698">dmxConfigParam</a>
+<a name="l00091"></a>00091 } <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>;
+<a name="l00092"></a>00092 
+<a name="l00094"></a><a class="code" href="struct__DMXConfigPartDim.html">00094</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigPartDim.html">_DMXConfigPartDim</a> {
+<a name="l00095"></a><a class="code" href="struct__DMXConfigPartDim.html#a82c99c55e14ce5ef7d5fe33b76a9810e">00095</a>     DMXConfigPairPtr         <a class="code" href="struct__DMXConfigPartDim.html#a82c99c55e14ce5ef7d5fe33b76a9810e">dim</a>;
+<a name="l00096"></a><a class="code" href="struct__DMXConfigPartDim.html#aab23301813036d4ccb096565865e43ee">00096</a>     DMXConfigPairPtr         <a class="code" href="struct__DMXConfigPartDim.html#aab23301813036d4ccb096565865e43ee">offset</a>;
+<a name="l00097"></a>00097 } <a class="code" href="struct__DMXConfigPartDim.html">DMXConfigPartDim</a>, *<a class="code" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>;
+<a name="l00098"></a>00098 
+<a name="l00100"></a><a class="code" href="struct__DMXConfigFullDim.html">00100</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigFullDim.html">_DMXConfigFullDim</a> {
+<a name="l00101"></a><a class="code" href="struct__DMXConfigFullDim.html#a3fec14505c810d9566a4369187f4ce6b">00101</a>     DMXConfigPartDimPtr      <a class="code" href="struct__DMXConfigFullDim.html#a3fec14505c810d9566a4369187f4ce6b">scrn</a>;
+<a name="l00102"></a><a class="code" href="struct__DMXConfigFullDim.html#a8bc74265fe442d142a610378dabc8afa">00102</a>     DMXConfigPartDimPtr      <a class="code" href="struct__DMXConfigFullDim.html#a8bc74265fe442d142a610378dabc8afa">root</a>;
+<a name="l00103"></a>00103 } <a class="code" href="struct__DMXConfigFullDim.html">DMXConfigFullDim</a>, *<a class="code" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>;
+<a name="l00104"></a>00104 
+<a name="l00106"></a><a class="code" href="struct__DMXConfigDisplay.html">00106</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigDisplay.html">_DMXConfigDisplay</a> {
+<a name="l00107"></a>00107                                 <span class="comment">/* Summary information */</span>
+<a name="l00108"></a><a class="code" href="struct__DMXConfigDisplay.html#aa44b268403b84baaba5f943b00c0caa1">00108</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               *<a class="code" href="struct__DMXConfigDisplay.html#aa44b268403b84baaba5f943b00c0caa1">name</a>;
+<a name="l00109"></a>00109                                 <span class="comment">/* Screen Window Geometry */</span>
+<a name="l00110"></a><a class="code" href="struct__DMXConfigDisplay.html#ad192d6062290e04c1f859eaf68c06122">00110</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#ad192d6062290e04c1f859eaf68c06122">scrnWidth</a>, <a class="code" href="struct__DMXConfigDisplay.html#a713c10234a650fee7fb91f31a6eb76fb">scrnHeight</a>;
+<a name="l00111"></a><a class="code" href="struct__DMXConfigDisplay.html#a0c2fbfb2cac1ca86e8e94cccc96c6079">00111</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#abd861ea01ca7d68f78d195c3b0542b52">scrnX</a>, <a class="code" href="struct__DMXConfigDisplay.html#a0c2fbfb2cac1ca86e8e94cccc96c6079">scrnY</a>;
+<a name="l00112"></a><a class="code" href="struct__DMXConfigDisplay.html#acff064fb3eb17d33c13ca5e19a13840c">00112</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#a4f8d37c6f5e5f14882ea980fa1af87d6">scrnXSign</a>, <a class="code" href="struct__DMXConfigDisplay.html#acff064fb3eb17d33c13ca5e19a13840c">scrnYSign</a>;
+<a name="l00113"></a>00113                                 <span class="comment">/* Root Window Geometry */</span>
+<a name="l00114"></a><a class="code" href="struct__DMXConfigDisplay.html#aa6e3eafb8797b5218c3febec39a319d8">00114</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#aa6e3eafb8797b5218c3febec39a319d8">rootWidth</a>, <a class="code" href="struct__DMXConfigDisplay.html#a576c44a633c820745e0166b0328c9428">rootHeight</a>;
+<a name="l00115"></a><a class="code" href="struct__DMXConfigDisplay.html#afdc4e97d421a7d12002d627cc208e239">00115</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#a1ae1cae8ca5882ca871ac9aa84e63b19">rootX</a>, <a class="code" href="struct__DMXConfigDisplay.html#afdc4e97d421a7d12002d627cc208e239">rootY</a>;
+<a name="l00116"></a><a class="code" href="struct__DMXConfigDisplay.html#ac741ca152d7feff75a0f610c98f575a9">00116</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#a3f8f845a6294f7b2b4d4963296368572">rootXSign</a>, <a class="code" href="struct__DMXConfigDisplay.html#ac741ca152d7feff75a0f610c98f575a9">rootYSign</a>;
+<a name="l00117"></a>00117                                 <span class="comment">/* Origin in global space */</span>
+<a name="l00118"></a><a class="code" href="struct__DMXConfigDisplay.html#a30bc7bf9c591007b64556743ca932108">00118</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigDisplay.html#a66ec2d91b2138ebc44eecbda0033649a">rootXOrigin</a>, <a class="code" href="struct__DMXConfigDisplay.html#a30bc7bf9c591007b64556743ca932108">rootYOrigin</a>;
+<a name="l00119"></a>00119     
+<a name="l00120"></a>00120                                 <span class="comment">/* Raw configuration information */</span>
+<a name="l00121"></a><a class="code" href="struct__DMXConfigDisplay.html#ae23c3e610b522311db14ab8187045060">00121</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigDisplay.html#ae23c3e610b522311db14ab8187045060">start</a>;
+<a name="l00122"></a><a class="code" href="struct__DMXConfigDisplay.html#a89443ebc48309723160157c81b3eb196">00122</a>     DMXConfigStringPtr       <a class="code" href="struct__DMXConfigDisplay.html#a89443ebc48309723160157c81b3eb196">dname</a>;
+<a name="l00123"></a><a class="code" href="struct__DMXConfigDisplay.html#a45c72329b5db1316df0cef1e448a81e7">00123</a>     DMXConfigFullDimPtr      <a class="code" href="struct__DMXConfigDisplay.html#a45c72329b5db1316df0cef1e448a81e7">dim</a>;
+<a name="l00124"></a><a class="code" href="struct__DMXConfigDisplay.html#a7a86b3fc8780285c64b1f71b46d20165">00124</a>     DMXConfigPairPtr         <a class="code" href="struct__DMXConfigDisplay.html#a7a86b3fc8780285c64b1f71b46d20165">origin</a>;
+<a name="l00125"></a><a class="code" href="struct__DMXConfigDisplay.html#a5b4603446018c78bf4d1fa692dd349a1">00125</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigDisplay.html#a5b4603446018c78bf4d1fa692dd349a1">end</a>;
+<a name="l00126"></a>00126 } <a class="code" href="struct__DMXConfigDisplay.html">DMXConfigDisplay</a>, *<a class="code" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>;
+<a name="l00127"></a>00127 
+<a name="l00129"></a><a class="code" href="struct__DMXConfigWall.html">00129</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigWall.html">_DMXConfigWall</a> {
+<a name="l00130"></a>00130                                 <span class="comment">/* Summary information */</span>
+<a name="l00131"></a><a class="code" href="struct__DMXConfigWall.html#a59d29322c1ad5e4f64fc9fe664dc8971">00131</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigWall.html#a59d29322c1ad5e4f64fc9fe664dc8971">width</a>, <a class="code" href="struct__DMXConfigWall.html#ac7426ee8a3094cd592448f5c974c34b4">height</a>; <span class="comment">/* dimensions of displays */</span>
+<a name="l00132"></a><a class="code" href="struct__DMXConfigWall.html#a48eefc8187f8f8df72a50010a8875ccd">00132</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigWall.html#a614b6db00d9553c064ba1f86cedac6f0">xwall</a>, <a class="code" href="struct__DMXConfigWall.html#a48eefc8187f8f8df72a50010a8875ccd">ywall</a>; <span class="comment">/* dimensions of wall, in tiles */</span>
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134     
+<a name="l00135"></a>00135                                 <span class="comment">/* Raw configuration informaiton */</span>
+<a name="l00136"></a><a class="code" href="struct__DMXConfigWall.html#a937d924ff899f484342d19cce6361ffb">00136</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigWall.html#a937d924ff899f484342d19cce6361ffb">start</a>;
+<a name="l00137"></a><a class="code" href="struct__DMXConfigWall.html#a7f260abe78baa2c27ebbf7bc2a5cec42">00137</a>     DMXConfigPairPtr         <a class="code" href="struct__DMXConfigWall.html#a7f260abe78baa2c27ebbf7bc2a5cec42">wallDim</a>;
+<a name="l00138"></a><a class="code" href="struct__DMXConfigWall.html#a8e1cebc88545b248717bcd180b520550">00138</a>     DMXConfigPairPtr         <a class="code" href="struct__DMXConfigWall.html#a8e1cebc88545b248717bcd180b520550">displayDim</a>;
+<a name="l00139"></a><a class="code" href="struct__DMXConfigWall.html#af9c21a05c99a613e29e0c5e715dd3253">00139</a>     DMXConfigStringPtr       <a class="code" href="struct__DMXConfigWall.html#af9c21a05c99a613e29e0c5e715dd3253">nameList</a>;
+<a name="l00140"></a><a class="code" href="struct__DMXConfigWall.html#a4901fad68a8f34db23e33f26a01ceef7">00140</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigWall.html#a4901fad68a8f34db23e33f26a01ceef7">end</a>;
+<a name="l00141"></a>00141 } <a class="code" href="struct__DMXConfigWall.html">DMXConfigWall</a>, *<a class="code" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>;
+<a name="l00142"></a>00142 
+<a name="l00144"></a><a class="code" href="struct__DMXConfigOption.html">00144</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigOption.html">_DMXConfigOption</a> {
+<a name="l00145"></a>00145                                 <span class="comment">/* Summary information */</span>
+<a name="l00146"></a><a class="code" href="struct__DMXConfigOption.html#aaed6fb5c802ae023ca5bff07fab01a55">00146</a>     <span class="keywordtype">char</span>                     *<a class="code" href="struct__DMXConfigOption.html#aaed6fb5c802ae023ca5bff07fab01a55">string</a>;
+<a name="l00147"></a>00147     
+<a name="l00148"></a>00148                                 <span class="comment">/* Raw configuration informaiton */</span>
+<a name="l00149"></a><a class="code" href="struct__DMXConfigOption.html#a0dd287594420b7027c63d2ce5b029449">00149</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigOption.html#a0dd287594420b7027c63d2ce5b029449">start</a>;
+<a name="l00150"></a><a class="code" href="struct__DMXConfigOption.html#aaed667e170cec49dce35060feff00a09">00150</a>     DMXConfigStringPtr       <a class="code" href="struct__DMXConfigOption.html#aaed667e170cec49dce35060feff00a09">option</a>;
+<a name="l00151"></a><a class="code" href="struct__DMXConfigOption.html#a09999687e48be6f09f3fd94125b169a0">00151</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigOption.html#a09999687e48be6f09f3fd94125b169a0">end</a>;
+<a name="l00152"></a>00152 } <a class="code" href="struct__DMXConfigOption.html">DMXConfigOption</a>, *<a class="code" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>;
+<a name="l00153"></a>00153 
+<a name="l00155"></a><a class="code" href="struct__DMXConfigParam.html">00155</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigParam.html">_DMXConfigParam</a> {
+<a name="l00156"></a><a class="code" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">00156</a>     <span class="keywordtype">int</span>                      <a class="code" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">argc</a>;
+<a name="l00157"></a><a class="code" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">00157</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>               **<a class="code" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">argv</a>;
+<a name="l00158"></a>00158     
+<a name="l00159"></a><a class="code" href="struct__DMXConfigParam.html#a51a0d65a06aabf172eff81c5f01018ca">00159</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigParam.html#a51a0d65a06aabf172eff81c5f01018ca">start</a>;
+<a name="l00160"></a><a class="code" href="struct__DMXConfigParam.html#ab5378c0fd40d3c8c6768c758067e0085">00160</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigParam.html#ab5378c0fd40d3c8c6768c758067e0085">open</a>;
+<a name="l00161"></a><a class="code" href="struct__DMXConfigParam.html#af635f42c0d12b9b73c71e0eaa666ec0f">00161</a>     DMXConfigStringPtr       <a class="code" href="struct__DMXConfigParam.html#af635f42c0d12b9b73c71e0eaa666ec0f">param</a>;
+<a name="l00162"></a><a class="code" href="struct__DMXConfigParam.html#a6214d2e4937870d17a82da9e9f64c81d">00162</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigParam.html#a6214d2e4937870d17a82da9e9f64c81d">close</a>;
+<a name="l00163"></a><a class="code" href="struct__DMXConfigParam.html#a115fb02cb41560fcd5b52914a8cb4baa">00163</a>     DMXConfigTokenPtr        <a class="code" href="struct__DMXConfigParam.html#a115fb02cb41560fcd5b52914a8cb4baa">end</a>; <span class="comment">/* Either open/close OR end */</span>
+<a name="l00164"></a><a class="code" href="struct__DMXConfigParam.html#a1e70ee5873aabc8c015330ae0ce3b92f">00164</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigParam.html">_DMXConfigParam</a>   *<a class="code" href="struct__DMXConfigParam.html#a1e70ee5873aabc8c015330ae0ce3b92f">next</a>;
+<a name="l00165"></a>00165 } <a class="code" href="struct__DMXConfigParam.html">DMXConfigParam</a>, *<a class="code" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>;
+<a name="l00166"></a>00166 
+<a name="l00168"></a><a class="code" href="struct__DMXConfigSub.html">00168</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigSub.html">_DMXConfigSub</a> {
+<a name="l00169"></a><a class="code" href="struct__DMXConfigSub.html#a459065584f3b92566855167e989f72ab">00169</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>             <a class="code" href="struct__DMXConfigSub.html#a459065584f3b92566855167e989f72ab">type</a>;
+<a name="l00170"></a><a class="code" href="struct__DMXConfigSub.html#a0c2d9c89e5fd8292b690181b3cd09c93">00170</a>     DMXConfigCommentPtr       <a class="code" href="struct__DMXConfigSub.html#a0c2d9c89e5fd8292b690181b3cd09c93">comment</a>;
+<a name="l00171"></a><a class="code" href="struct__DMXConfigSub.html#ab881a6a0ca612057e889742dd5aaf20e">00171</a>     DMXConfigDisplayPtr       <a class="code" href="struct__DMXConfigSub.html#ab881a6a0ca612057e889742dd5aaf20e">display</a>;
+<a name="l00172"></a><a class="code" href="struct__DMXConfigSub.html#a247f530f0328126dc2467c9f4d40861f">00172</a>     DMXConfigWallPtr          <a class="code" href="struct__DMXConfigSub.html#a247f530f0328126dc2467c9f4d40861f">wall</a>;
+<a name="l00173"></a><a class="code" href="struct__DMXConfigSub.html#ab98f85159fb67ee2fd6a1523e513ef62">00173</a>     DMXConfigOptionPtr        <a class="code" href="struct__DMXConfigSub.html#ab98f85159fb67ee2fd6a1523e513ef62">option</a>;
+<a name="l00174"></a><a class="code" href="struct__DMXConfigSub.html#a5719f3b418be1c7e00f2886ae09175d3">00174</a>     DMXConfigParamPtr         <a class="code" href="struct__DMXConfigSub.html#a5719f3b418be1c7e00f2886ae09175d3">param</a>;
+<a name="l00175"></a><a class="code" href="struct__DMXConfigSub.html#aeb9e7e1226bc01cdc1f256b49e826d43">00175</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigSub.html">_DMXConfigSub</a>      *<a class="code" href="struct__DMXConfigSub.html#aeb9e7e1226bc01cdc1f256b49e826d43">next</a>;
+<a name="l00176"></a>00176 } <a class="code" href="struct__DMXConfigSub.html">DMXConfigSub</a>, *<a class="code" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>;
+<a name="l00177"></a>00177 
+<a name="l00179"></a><a class="code" href="struct__DMXConfigVirtual.html">00179</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigVirtual.html">_DMXConfigVirtual</a> {
+<a name="l00180"></a>00180                                 <span class="comment">/* Summary information */</span>
+<a name="l00181"></a><a class="code" href="struct__DMXConfigVirtual.html#a8478674f4416debdfbdb7bff088c0b3b">00181</a>     <span class="keyword">const</span> <span class="keywordtype">char</span>                *<a class="code" href="struct__DMXConfigVirtual.html#a8478674f4416debdfbdb7bff088c0b3b">name</a>;
+<a name="l00182"></a><a class="code" href="struct__DMXConfigVirtual.html#a9f35c8d1f58fdcbc85a2bdfb14a31d71">00182</a>     <span class="keywordtype">int</span>                       <a class="code" href="struct__DMXConfigVirtual.html#a9f35c8d1f58fdcbc85a2bdfb14a31d71">width</a>, <a class="code" href="struct__DMXConfigVirtual.html#a47c8c908e8f4090be638de0560dc36c3">height</a>;
+<a name="l00183"></a>00183 
+<a name="l00184"></a>00184                                 <span class="comment">/* Raw configuration information */</span>
+<a name="l00185"></a><a class="code" href="struct__DMXConfigVirtual.html#ab70a6b20679f559200b44949fcc9c131">00185</a>     DMXConfigTokenPtr         <a class="code" href="struct__DMXConfigVirtual.html#ab70a6b20679f559200b44949fcc9c131">start</a>;
+<a name="l00186"></a><a class="code" href="struct__DMXConfigVirtual.html#afe71a0e5dd4a384ec05e4cd6f1d53fb1">00186</a>     DMXConfigStringPtr        <a class="code" href="struct__DMXConfigVirtual.html#afe71a0e5dd4a384ec05e4cd6f1d53fb1">vname</a>;
+<a name="l00187"></a><a class="code" href="struct__DMXConfigVirtual.html#abff549a2e1cb399ab859cb7626660539">00187</a>     DMXConfigPairPtr          <a class="code" href="struct__DMXConfigVirtual.html#abff549a2e1cb399ab859cb7626660539">dim</a>;
+<a name="l00188"></a><a class="code" href="struct__DMXConfigVirtual.html#a5198b357593cc6aee669887be1b377cb">00188</a>     DMXConfigTokenPtr         <a class="code" href="struct__DMXConfigVirtual.html#a5198b357593cc6aee669887be1b377cb">open</a>;
+<a name="l00189"></a><a class="code" href="struct__DMXConfigVirtual.html#a49c54be6010a37e78bd137a3c30707c6">00189</a>     DMXConfigSubPtr           <a class="code" href="struct__DMXConfigVirtual.html#a49c54be6010a37e78bd137a3c30707c6">subentry</a>;
+<a name="l00190"></a><a class="code" href="struct__DMXConfigVirtual.html#a18d1aff81158655dd4b7b16afe3078ce">00190</a>     DMXConfigTokenPtr         <a class="code" href="struct__DMXConfigVirtual.html#a18d1aff81158655dd4b7b16afe3078ce">close</a>;
+<a name="l00191"></a>00191 } <a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtual</a>, *<a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>;
+<a name="l00192"></a>00192 
+<a name="l00194"></a><a class="code" href="struct__DMXConfigEntry.html">00194</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> {
+<a name="l00195"></a><a class="code" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">00195</a>     <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>            <a class="code" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">type</a>;
+<a name="l00196"></a><a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">00196</a>     DMXConfigCommentPtr      <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>;
+<a name="l00197"></a><a class="code" href="struct__DMXConfigEntry.html#a8e77b8273c49b31ba999a7a182a4cb2c">00197</a>     DMXConfigVirtualPtr      <span class="keyword">virtual</span>;
+<a name="l00198"></a><a class="code" href="struct__DMXConfigEntry.html#a69f77f180912f1ffce742d974da981d7">00198</a>     <span class="keyword">struct </span><a class="code" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>   *<a class="code" href="struct__DMXConfigEntry.html#a69f77f180912f1ffce742d974da981d7">next</a>;
+<a name="l00199"></a>00199 } <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntry</a>, *<a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>;
+<a name="l00200"></a>00200 
+<a name="l00201"></a>00201 <span class="keyword">extern</span> DMXConfigEntryPtr   <a class="code" href="dmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">dmxConfigEntry</a>;
+<a name="l00202"></a>00202 
+<a name="l00203"></a>00203 <span class="keyword">extern</span> <span class="keywordtype">int</span>                 <a class="code" href="dmxparse_8h.html#a9a7bd1b3d14701eb97c03f3ef34deff1">yylex</a>(<span class="keywordtype">void</span>);
+<a name="l00204"></a>00204 <span class="keyword">extern</span> <span class="keywordtype">int</span>                 <a class="code" href="dmxparse_8h.html#ab138aa8e11f58bcdcc7134adf240ea8c">yydebug</a>;
+<a name="l00205"></a>00205 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8h.html#a87640c870f7c3d90c830a68620e48de4">yyerror</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *message);
+<a name="l00206"></a>00206 
+<a name="l00207"></a>00207 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a2c4e1260c486d4898c5bb21ff221c89d">dmxConfigLog</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *format, ...);
+<a name="l00208"></a>00208 <span class="keyword">extern</span> <span class="keywordtype">void</span>                *<a class="code" href="dmxparse_8c.html#a1794b2e8571596d46f01ff8cf692410f">dmxConfigAlloc</a>(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytes);
+<a name="l00209"></a>00209 <span class="keyword">extern</span> <span class="keywordtype">void</span>                *<a class="code" href="dmxparse_8c.html#af8e13444fded1f7707ab7dfc40655fd3">dmxConfigRealloc</a>(<span class="keywordtype">void</span> *orig,
+<a name="l00210"></a>00210                                              <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> orig_bytes,
+<a name="l00211"></a>00211                                              <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytes);
+<a name="l00212"></a>00212 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>          *<a class="code" href="dmxparse_8c.html#a0d1c3d922b777254300e346b0111943c">dmxConfigCopyString</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *<span class="keywordtype">string</span>,
+<a name="l00213"></a>00213                                                 <span class="keywordtype">int</span> length);
+<a name="l00214"></a>00214 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a890429fea43e1039967b94fadc1f4e29">dmxConfigFree</a>(<span class="keywordtype">void</span> *area);
+<a name="l00215"></a>00215 <span class="keyword">extern</span> DMXConfigTokenPtr   <a class="code" href="dmxparse_8c.html#aaf6df2ea6db8e6f959c72fc28c46f1b2">dmxConfigCreateToken</a>(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
+<a name="l00216"></a>00216                                                 <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>);
+<a name="l00217"></a>00217 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a08b933b0269ebf4b22a6b43abbda19e2">dmxConfigFreeToken</a>(DMXConfigTokenPtr p);
+<a name="l00218"></a>00218 <span class="keyword">extern</span> DMXConfigStringPtr  <a class="code" href="dmxparse_8c.html#ae285ab0da6d63770365886d413f58432">dmxConfigCreateString</a>(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
+<a name="l00219"></a>00219                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00220"></a>00220                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *<span class="keywordtype">string</span>);
+<a name="l00221"></a>00221 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a679f8776dd1a503057891de6483adc49">dmxConfigFreeString</a>(DMXConfigStringPtr p);
+<a name="l00222"></a>00222 <span class="keyword">extern</span> DMXConfigNumberPtr  <a class="code" href="dmxparse_8c.html#a40cfc16a7a8a6f4b21bfb81d03490458">dmxConfigCreateNumber</a>(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
+<a name="l00223"></a>00223                                                  <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00224"></a>00224                                                  <span class="keywordtype">int</span> number);
+<a name="l00225"></a>00225 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a2b8a343fe122733af82e802a01a5f30b">dmxConfigFreeNumber</a>(DMXConfigNumberPtr p);
+<a name="l00226"></a>00226 <span class="keyword">extern</span> DMXConfigPairPtr    <a class="code" href="dmxparse_8c.html#a488a03d25bc380f1bdf786693c644957">dmxConfigCreatePair</a>(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
+<a name="l00227"></a>00227                                                <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00228"></a>00228                                                <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y,
+<a name="l00229"></a>00229                                                <span class="keywordtype">int</span> xsign, <span class="keywordtype">int</span> ysign);
+<a name="l00230"></a>00230 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a382b3c46caeb7e134e381d732f8d185e">dmxConfigFreePair</a>(DMXConfigPairPtr p);
+<a name="l00231"></a>00231 <span class="keyword">extern</span> DMXConfigCommentPtr <a class="code" href="dmxparse_8c.html#ae0619f5f0850b65fefe4df5112aaac05">dmxConfigCreateComment</a>(<span class="keywordtype">int</span> token, <span class="keywordtype">int</span> line,
+<a name="l00232"></a>00232                                                   <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>);
+<a name="l00233"></a>00233 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a1c9b5f8f879ee6872295618c6e1dd232">dmxConfigFreeComment</a>(DMXConfigCommentPtr p);
+<a name="l00234"></a>00234 <span class="keyword">extern</span> DMXConfigPartDimPtr <a class="code" href="dmxparse_8c.html#a1740a9f650d43464836c9b0ec44f9659">dmxConfigCreatePartDim</a>(DMXConfigPairPtr pDim,
+<a name="l00235"></a>00235                                                   DMXConfigPairPtr pOffset);
+<a name="l00236"></a>00236 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a8cb0f116f7c3c5ac3939cd69df06c0fe">dmxConfigFreePartDim</a>(DMXConfigPartDimPtr p);
+<a name="l00237"></a>00237 <span class="keyword">extern</span> DMXConfigFullDimPtr <a class="code" href="dmxparse_8c.html#ac75eb1b376fb8a510d123ca119ef215e">dmxConfigCreateFullDim</a>(DMXConfigPartDimPtr pScrn,
+<a name="l00238"></a>00238                                                   DMXConfigPartDimPtr pRoot);
+<a name="l00239"></a>00239 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#ad09f9037b194ad32029047499003a60a">dmxConfigFreeFullDim</a>(DMXConfigFullDimPtr p);
+<a name="l00240"></a>00240 <span class="keyword">extern</span> DMXConfigDisplayPtr <a class="code" href="dmxparse_8c.html#ab3f5b4d4a5b535faf87b3bf7cb30d2d0">dmxConfigCreateDisplay</a>(DMXConfigTokenPtr pStart,
+<a name="l00241"></a>00241                                                   DMXConfigStringPtr pName,
+<a name="l00242"></a>00242                                                   DMXConfigFullDimPtr pDim,
+<a name="l00243"></a>00243                                                   DMXConfigPairPtr pOrigin,
+<a name="l00244"></a>00244                                                   DMXConfigTokenPtr pEnd);
+<a name="l00245"></a>00245 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a34126fa5dccdee442dce2b2413c43c53">dmxConfigFreeDisplay</a>(DMXConfigDisplayPtr p);
+<a name="l00246"></a>00246 <span class="keyword">extern</span> DMXConfigWallPtr    <a class="code" href="dmxparse_8c.html#a6078c6ad23fc49e4992cade35f7351b2">dmxConfigCreateWall</a>(DMXConfigTokenPtr pStart,
+<a name="l00247"></a>00247                                                DMXConfigPairPtr pWallDim,
+<a name="l00248"></a>00248                                                DMXConfigPairPtr pDisplayDim,
+<a name="l00249"></a>00249                                                DMXConfigStringPtr pNameList,
+<a name="l00250"></a>00250                                                DMXConfigTokenPtr pEnd);
+<a name="l00251"></a>00251 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#aac254e191bb664ec87d44f70f52ce897">dmxConfigFreeWall</a>(DMXConfigWallPtr p);
+<a name="l00252"></a>00252 <span class="keyword">extern</span> DMXConfigOptionPtr  <a class="code" href="dmxparse_8c.html#ad183386657a3549f60760a156fad4fb8">dmxConfigCreateOption</a>(DMXConfigTokenPtr pStart,
+<a name="l00253"></a>00253                                                  DMXConfigStringPtr pOption,
+<a name="l00254"></a>00254                                                  DMXConfigTokenPtr pEnd);
+<a name="l00255"></a>00255 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a87d839927d1775c43e099e87f6e2ca8d">dmxConfigFreeOption</a>(DMXConfigOptionPtr p);
+<a name="l00256"></a>00256 <span class="keyword">extern</span> DMXConfigParamPtr   <a class="code" href="dmxparse_8c.html#a0a4ebd4b3769682daf7a6fed9f11744d">dmxConfigCreateParam</a>(DMXConfigTokenPtr pStart,
+<a name="l00257"></a>00257                                                 DMXConfigTokenPtr pOpen,
+<a name="l00258"></a>00258                                                 DMXConfigStringPtr pParam,
+<a name="l00259"></a>00259                                                 DMXConfigTokenPtr pClose,
+<a name="l00260"></a>00260                                                 DMXConfigTokenPtr pEnd);
+<a name="l00261"></a>00261 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#af978e4f2f42e4d7e01d3d45a4c1b9a4d">dmxConfigFreeParam</a>(DMXConfigParamPtr p);
+<a name="l00262"></a>00262 <span class="keyword">extern</span> <span class="keyword">const</span> <span class="keywordtype">char</span>          **<a class="code" href="dmxparse_8c.html#a782be9a8b3118f8a52825041b5c2e8e8">dmxConfigLookupParam</a>(DMXConfigParamPtr p,
+<a name="l00263"></a>00263                                                   <span class="keyword">const</span> <span class="keywordtype">char</span> *key,
+<a name="l00264"></a>00264                                                   <span class="keywordtype">int</span> *argc);
+<a name="l00265"></a>00265 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#aa7e24c7be4cc3880e15274a53b627267">dmxConfigCreateSub</a>(<a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> <a class="code" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">type</a>,
+<a name="l00266"></a>00266                                               DMXConfigCommentPtr <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00267"></a>00267                                               DMXConfigDisplayPtr display,
+<a name="l00268"></a>00268                                               DMXConfigWallPtr wall,
+<a name="l00269"></a>00269                                               DMXConfigOptionPtr option,
+<a name="l00270"></a>00270                                               DMXConfigParamPtr param);
+<a name="l00271"></a>00271 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a07ef1f7f192d2c0d29332fc5c71e89b8">dmxConfigFreeSub</a>(DMXConfigSubPtr sub);
+<a name="l00272"></a>00272 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#a825d125808e8992c740315d3b78e493d">dmxConfigSubComment</a>(DMXConfigCommentPtr <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>);
+<a name="l00273"></a>00273 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#a4f26909fb7f97007567e5514839c3a53">dmxConfigSubDisplay</a>(DMXConfigDisplayPtr display);
+<a name="l00274"></a>00274 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#aac05245a327cc10096f1a049e675caef">dmxConfigSubWall</a>(DMXConfigWallPtr wall);
+<a name="l00275"></a>00275 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#a23a35d27aa7bf22d815d2a9cff809307">dmxConfigSubOption</a>(DMXConfigOptionPtr option);
+<a name="l00276"></a>00276 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#a16047d4ba67462084a85156432c7cf05">dmxConfigSubParam</a>(DMXConfigParamPtr param);
+<a name="l00277"></a>00277 <span class="keyword">extern</span> DMXConfigSubPtr     <a class="code" href="dmxparse_8c.html#a75e3403d28e2cb5b3b6da5461ef1bbca">dmxConfigAddSub</a>(DMXConfigSubPtr head,
+<a name="l00278"></a>00278                                            DMXConfigSubPtr sub);
+<a name="l00279"></a>00279 <span class="keyword">extern</span> DMXConfigVirtualPtr <a class="code" href="dmxparse_8c.html#a427549ab2ffa269ca34bdb1a60e87bb0">dmxConfigCreateVirtual</a>(DMXConfigTokenPtr pStart,
+<a name="l00280"></a>00280                                                   DMXConfigStringPtr pName,
+<a name="l00281"></a>00281                                                   DMXConfigPairPtr pDim,
+<a name="l00282"></a>00282                                                   DMXConfigTokenPtr pOpen,
+<a name="l00283"></a>00283                                                   DMXConfigSubPtr pSubentry,
+<a name="l00284"></a>00284                                                   DMXConfigTokenPtr pClose);
+<a name="l00285"></a>00285 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#a6e48a41d83e97afcbd542a210ea30258">dmxConfigFreeVirtual</a>(DMXConfigVirtualPtr <span class="keyword">virtual</span>);
+<a name="l00286"></a>00286 <span class="keyword">extern</span> DMXConfigEntryPtr   <a class="code" href="dmxparse_8c.html#a402a182c5c9922807ffc7998b4228b24">dmxConfigCreateEntry</a>(<a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> <a class="code" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">type</a>,
+<a name="l00287"></a>00287                                                 DMXConfigCommentPtr <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00288"></a>00288                                                 DMXConfigVirtualPtr <span class="keyword">virtual</span>);
+<a name="l00289"></a>00289 <span class="keyword">extern</span> <span class="keywordtype">void</span>                <a class="code" href="dmxparse_8c.html#ab18dcd503e9fbe9d81caa16bf07026ea">dmxConfigFreeEntry</a>(DMXConfigEntryPtr entry);
+<a name="l00290"></a>00290 <span class="keyword">extern</span> DMXConfigEntryPtr   <a class="code" href="dmxparse_8c.html#acec532235fc1d75b24779b3ed50aa037">dmxConfigAddEntry</a>(DMXConfigEntryPtr head,
+<a name="l00291"></a>00291                                              <a class="code" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> <a class="code" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">type</a>,
+<a name="l00292"></a>00292                                              DMXConfigCommentPtr <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>,
+<a name="l00293"></a>00293                                              DMXConfigVirtualPtr <span class="keyword">virtual</span>);
+<a name="l00294"></a>00294 <span class="keyword">extern</span> DMXConfigEntryPtr   <a class="code" href="dmxparse_8c.html#acee635a4deedd0f4b488d951346f4622">dmxConfigEntryComment</a>(DMXConfigCommentPtr <a class="code" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a>);
+<a name="l00295"></a>00295 <span class="keyword">extern</span> DMXConfigEntryPtr   <a class="code" href="dmxparse_8c.html#a643b2c9c57d3009965318d20aad1ca0d">dmxConfigEntryVirtual</a>(DMXConfigVirtualPtr <span class="keyword">virtual</span>);
+<a name="l00296"></a>00296 
+<a name="l00297"></a>00297 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8c.html b/xorg-server/hw/dmx/doc/html/dmxpict_8c.html
index 96fd4fe5f..c0f256484 100644
--- a/xorg-server/hw/dmx/doc/html/dmxpict_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxpict_8c.html
@@ -6,1170 +6,1393 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxpict.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "fb.h"</code><br>
-<code>#include "pixmapstr.h"</code><br>
-<code>#include "dixstruct.h"</code><br>
-<code>#include "render.h"</code><br>
-<code>#include "renderproto.h"</code><br>
-<code>#include "picture.h"</code><br>
-<code>#include "picturestr.h"</code><br>
-<code>#include "mipict.h"</code><br>
-<code>#include "fbpict.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a12">dmxInitRender</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a13">dmxResetRender</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a14">dmxPictureInit</a> (ScreenPtr pScreen, PictFormatPtr formats, int nformats)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a16">dmxBEFreeGlyphSet</a> (ScreenPtr pScreen, GlyphSetPtr glyphSet)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a18">dmxCreatePictureList</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a19">dmxCreatePicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a20">dmxBEFreePicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a21">dmxDestroyPictureList</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a22">dmxDestroyPicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a23">dmxChangePictureClip</a> (PicturePtr pPicture, int clipType, pointer value, int n)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a24">dmxDestroyPictureClip</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a25">dmxChangePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a26">dmxValidatePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a27">dmxComposite</a> (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a28">dmxGlyphs</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a29">dmxCompositeRects</a> (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a30">dmxInitIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a31">dmxCloseIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxpict.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;fb.h&quot;</code><br/>
+<code>#include &quot;pixmapstr.h&quot;</code><br/>
+<code>#include &quot;dixstruct.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/render.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/renderproto.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/Xfixes.h&gt;</code><br/>
+<code>#include &quot;picture.h&quot;</code><br/>
+<code>#include &quot;picturestr.h&quot;</code><br/>
+<code>#include &quot;mipict.h&quot;</code><br/>
+<code>#include &quot;fbpict.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aaaa954b686d1322b7cda6a83f24a8c45">dmxProcRenderCreateGlyphSet</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a182c93f585ba30c52c680849edb51c7f">dmxProcRenderFreeGlyphSet</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a3af8c0336c49625930470c6e2bce2a48">dmxProcRenderAddGlyphs</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a31fa7a567bceaf88984a3e862dc9a72e">dmxProcRenderFreeGlyphs</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a612db8702e6a380e12719576a57602e7">dmxProcRenderCompositeGlyphs</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#af7e087c44278e073b515a7adf3788a06">dmxProcRenderSetPictureTransform</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a6cf50414d7688db973f42db898ba16a8">dmxProcRenderSetPictureFilter</a> (ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a3b0dd9ecc0fbb260662ba6c18d69bd08">dmxGlyphErrorHandler</a> (Display *dpy, XErrorEvent *ev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a76cabef9d3047d8f514fb6e17b951145">dmxInitRender</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a93c956636d6aba1f2ce1cab637e00fff">dmxResetRender</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a457aa4df6b01e88a26cc069094e4b07c">dmxPictureInit</a> (ScreenPtr pScreen, PictFormatPtr formats, int nformats)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static XRenderPictFormat *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aa154f0c705ffdaf3770cd87c478db004">dmxFindFormat</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, PictFormatPtr pFmt)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a342746cc3fb1fe0731522315c6dd91fc">dmxBEFreeGlyphSet</a> (ScreenPtr pScreen, GlyphSetPtr glyphSet)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a390ee65e9cbdf613f5f7a6fafa754fff">dmxBECreateGlyphSet</a> (int idx, GlyphSetPtr glyphSet)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Picture&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a314fad65d3e8f6470ed95e052348df3d">dmxDoCreatePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a8c52091268b0f77d74d3a097b396abcf">dmxCreatePictureList</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#ac1b1e577a8993b4c76eba1bfad485396">dmxBECreatePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#ad7adb9c71564816f5f3172c710274d57">dmxCreatePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a7b24ad91d73ffd9475719ec4b0a73f34">dmxBEFreePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a0af49a0382a2763672f3f8bc1e1ee156">dmxDestroyPictureList</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aee92c240df08f4c8a62c291b3efa4d7e">dmxDestroyPicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a80e126a5d7911fec43bad8a9428980d6">dmxChangePictureClip</a> (PicturePtr pPicture, int clipType, pointer value, int n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aa977edb667e68606b2e08b25d99427de">dmxDestroyPictureClip</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a316382a2e169f1662363123670a252c7">dmxChangePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a3a9285c518b050130e40b7e147309350">dmxValidatePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a65851c1a4e9cd6946d67ff5aaf7bce88">dmxComposite</a> (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a8a98dca5e23c501c44fa3e040e31d100">dmxGlyphs</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#ae828cd3db7af3c9e3a615267cd780ac4">dmxCompositeRects</a> (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a5c81bdb404715c2318d3eda49e26fe68">dmxInitIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aa63b1daaacc56332c04832198a9e30b7">dmxCloseIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a05292dc07650c6fb40e13640cfce0df6">dmxUpdateIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#ae54f217c222944bb10731d73e05ed4b2">dmxTrapezoids</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a401f568feed789ffc0bb1cc52573f707">dmxTriangles</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a3e36166fd4db06d364e7cc1762ab5b8c">dmxTriStrip</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a11d3beb5f92c982f9383bb7e606e3157">dmxTriFan</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a2a976139e942aa64e03b8f5357ba82ca">RenderErrBase</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a> [RenderNumberRequests])(ClientPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a> [RenderNumberRequests])(ClientPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8c.html#a80081bafc7043ef16f07b96b9322264c">dmxGlyphLastError</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provide support for the RENDER extension (version 0.8). </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a390ee65e9cbdf613f5f7a6fafa754fff"></a><!-- doxytag: member="dmxpict.c::dmxBECreateGlyphSet" ref="a390ee65e9cbdf613f5f7a6fafa754fff" args="(int idx, GlyphSetPtr glyphSet)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxBECreateGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">GlyphSetPtr&nbsp;</td>
+          <td class="paramname"> <em>glyphSet</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>glyphSet</em> on the backend screen number <em>idx</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a32">dmxUpdateIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxpict_8c_source.html#l00083">dmxGlyphErrorHandler()</a>, <a class="el" href="dmxpict_8c_source.html#l00082">dmxGlyphLastError</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a33">dmxTrapezoids</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, and <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a34">dmxTriangles</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ac1b1e577a8993b4c76eba1bfad485396"></a><!-- doxytag: member="dmxpict.c::dmxBECreatePicture" ref="ac1b1e577a8993b4c76eba1bfad485396" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxBECreatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>pPicture</em> on the backend. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a35">dmxTriStrip</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8c.html#a36">dmxTriFan</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provide support for the RENDER extension (version 0.8).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a16" doxytag="dmxpict.c::dmxBEFreeGlyphSet" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a342746cc3fb1fe0731522315c6dd91fc"></a><!-- doxytag: member="dmxpict.c::dmxBEFreeGlyphSet" ref="a342746cc3fb1fe0731522315c6dd91fc" args="(ScreenPtr pScreen, GlyphSetPtr glyphSet)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeGlyphSet </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxBEFreeGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GlyphSetPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>glyphSet</em></td>
+          <td class="paramtype">GlyphSetPtr&nbsp;</td>
+          <td class="paramname"> <em>glyphSet</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free <em>glyphSet</em> on back-end screen number <em>idx</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxpict.c::dmxBEFreePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Free <em>glyphSet</em> on back-end screen number <em>idx</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, and <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7b24ad91d73ffd9475719ec4b0a73f34"></a><!-- doxytag: member="dmxpict.c::dmxBEFreePicture" ref="a7b24ad91d73ffd9475719ec4b0a73f34" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pPicture</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxpict.c::dmxChangePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy <em>pPicture</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00815">dmxDestroyPictureList()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a316382a2e169f1662363123670a252c7"></a><!-- doxytag: member="dmxpict.c::dmxChangePicture" ref="a316382a2e169f1662363123670a252c7" args="(PicturePtr pPicture, Mask mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">void dmxChangePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Mask&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">Mask&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxpict.c::dmxChangePictureClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a80e126a5d7911fec43bad8a9428980d6"></a><!-- doxytag: member="dmxpict.c::dmxChangePictureClip" ref="a80e126a5d7911fec43bad8a9428980d6" args="(PicturePtr pPicture, int clipType, pointer value, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxChangePictureClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">int dmxChangePictureClip </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>clipType</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>clipType</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the picture's list of clip rectangles.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a31" doxytag="dmxpict.c::dmxCloseIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the picture's list of clip rectangles. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa63b1daaacc56332c04832198a9e30b7"></a><!-- doxytag: member="dmxpict.c::dmxCloseIndexed" ref="aa63b1daaacc56332c04832198a9e30b7" args="(ScreenPtr pScreen, PictFormatPtr pFormat)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCloseIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxCloseIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em></td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxpict.c::dmxComposite" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a65851c1a4e9cd6946d67ff5aaf7bce88"></a><!-- doxytag: member="dmxpict.c::dmxComposite" ref="a65851c1a4e9cd6946d67ff5aaf7bce88" args="(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxComposite </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxComposite </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pMask</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xMask</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>yMask</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>yMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xDst</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>yDst</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>yDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD16&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">CARD16&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD16&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramtype">CARD16&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxpict.c::dmxCompositeRects" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae828cd3db7af3c9e3a615267cd780ac4"></a><!-- doxytag: member="dmxpict.c::dmxCompositeRects" ref="ae828cd3db7af3c9e3a615267cd780ac4" args="(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCompositeRects </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxCompositeRects </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRenderColor *&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramtype">xRenderColor *&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nRect</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nRect</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>rects</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>rects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxpict.c::dmxCreatePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad7adb9c71564816f5f3172c710274d57"></a><!-- doxytag: member="dmxpict.c::dmxCreatePicture" ref="ad7adb9c71564816f5f3172c710274d57" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCreatePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCreatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxpict.c::dmxCreatePictureList" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8c52091268b0f77d74d3a097b396abcf"></a><!-- doxytag: member="dmxpict.c::dmxCreatePictureList" ref="a8c52091268b0f77d74d3a097b396abcf" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCreatePictureList </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCreatePictureList </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a list of pictures. This function is called by <a class="el" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow()</a> during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxpict.c::dmxDestroyPicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a list of pictures. This function is called by <a class="el" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow()</a> during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aee92c240df08f4c8a62c291b3efa4d7e"></a><!-- doxytag: member="dmxpict.c::dmxDestroyPicture" ref="aee92c240df08f4c8a62c291b3efa4d7e" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyPicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyPicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxpict.c::dmxDestroyPictureClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa977edb667e68606b2e08b25d99427de"></a><!-- doxytag: member="dmxpict.c::dmxDestroyPictureClip" ref="aa977edb667e68606b2e08b25d99427de" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyPictureClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyPictureClip </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the picture's list of clip rectangles.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxpict.c::dmxDestroyPictureList" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the picture's list of clip rectangles. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0af49a0382a2763672f3f8bc1e1ee156"></a><!-- doxytag: member="dmxpict.c::dmxDestroyPictureList" ref="a0af49a0382a2763672f3f8bc1e1ee156" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyPictureList </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxDestroyPictureList </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by <a class="el" href="dmxwindow_8c.html#a25a0aafd36f68137e67a3e6d95b78f53">dmxDestroyWindow()</a>. </p>
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a314fad65d3e8f6470ed95e052348df3d"></a><!-- doxytag: member="dmxpict.c::dmxDoCreatePicture" ref="a314fad65d3e8f6470ed95e052348df3d" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Picture dmxDoCreatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by <a class="el" href="dmxwindow_8c.html#a12">dmxDestroyWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxpict.c::dmxGlyphs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a picture on the appropriate screen. This is the actual function that creates the picture. However, if the associated window has not yet been created due to lazy window creation, then delay the picture creation until the window is mapped. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8h_source.html#l00053">_dmxWinPriv::hasPict</a>, <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00740">dmxCreatePictureList()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa154f0c705ffdaf3770cd87c478db004"></a><!-- doxytag: member="dmxpict.c::dmxFindFormat" ref="aa154f0c705ffdaf3770cd87c478db004" args="(DMXScreenInfo *dmxScreen, PictFormatPtr pFmt)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGlyphs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">static XRenderPictFormat* dmxFindFormat </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFmt</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Find the appropriate format on the requested screen given the internal format requested. The list of formats is searched sequentially as the XRenderFindFormat() function does not always find the appropriate format when a specific format is requested. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, and <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3b0dd9ecc0fbb260662ba6c18d69bd08"></a><!-- doxytag: member="dmxpict.c::dmxGlyphErrorHandler" ref="a3b0dd9ecc0fbb260662ba6c18d69bd08" args="(Display *dpy, XErrorEvent *ev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxGlyphErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">XErrorEvent *&nbsp;</td>
+          <td class="paramname"> <em>ev</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00082">dmxGlyphLastError</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8a98dca5e23c501c44fa3e040e31d100"></a><!-- doxytag: member="dmxpict.c::dmxGlyphs" ref="a8a98dca5e23c501c44fa3e040e31d100" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxGlyphs </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nlists</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>GlyphListPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>lists</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nlists</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">GlyphListPtr&nbsp;</td>
+          <td class="paramname"> <em>lists</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>GlyphPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>glyphs</em></td>
+          <td class="paramtype">GlyphPtr *&nbsp;</td>
+          <td class="paramname"> <em>glyphs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by <a class="el" href="dmxpict_8c.html#a8">dmxProcRenderCompositeGlyphs()</a>. This function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="dmxpict.c::dmxInitIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by <a class="el" href="dmxpict_8c.html#a612db8702e6a380e12719576a57602e7">dmxProcRenderCompositeGlyphs()</a>. This function should never be called. </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5c81bdb404715c2318d3eda49e26fe68"></a><!-- doxytag: member="dmxpict.c::dmxInitIndexed" ref="a5c81bdb404715c2318d3eda49e26fe68" args="(ScreenPtr pScreen, PictFormatPtr pFormat)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxInitIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em></td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxpict.c::dmxInitRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a76cabef9d3047d8f514fb6e17b951145"></a><!-- doxytag: member="dmxpict.c::dmxInitRender" ref="a76cabef9d3047d8f514fb6e17b951145" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitRender </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInitRender </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from <a class="el" href="dmxinit_8c.html#a34">InitOutput()</a> since it should be initialized only once per server generation.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxpict.c::dmxPictureInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from <a class="el" href="dmxinit_8c.html#a51c195c51f4f09e981384a4215f82321">InitOutput()</a> since it should be initialized only once per server generation. </p>
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, and <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a457aa4df6b01e88a26cc069094e4b07c"></a><!-- doxytag: member="dmxpict.c::dmxPictureInit" ref="a457aa4df6b01e88a26cc069094e4b07c" args="(ScreenPtr pScreen, PictFormatPtr formats, int nformats)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxPictureInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxPictureInit </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>formats</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>formats</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nformats</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nformats</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01087">dmxGlyphs()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00083">dmxPictPrivateKey</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3af8c0336c49625930470c6e2bce2a48"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderAddGlyphs" ref="a3af8c0336c49625930470c6e2bce2a48" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxProcRenderAddGlyphs </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxpict.c::dmxResetRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Add glyphs to the Glyph Set on each screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a612db8702e6a380e12719576a57602e7"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderCompositeGlyphs" ref="a612db8702e6a380e12719576a57602e7" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResetRender </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static int dmxProcRenderCompositeGlyphs </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Composite glyphs on each screen into the requested picture. If either the src or dest picture has not been allocated due to lazy window creation, this request will gracefully return. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaaa954b686d1322b7cda6a83f24a8c45"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderCreateGlyphSet" ref="aaaa954b686d1322b7cda6a83f24a8c45" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxProcRenderCreateGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from <a class="el" href="dmxscrinit_8c.html#a9">dmxCloseScreen()</a> during the server reset (only for screen #0).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="dmxpict.c::dmxTrapezoids" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a Glyph Set on each screen. Save the glyphset ID from each screen in the Glyph Set's private structure. Fail if the format requested is not available or if the Glyph Set cannot be created on the screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00128">DMX_SET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a31fa7a567bceaf88984a3e862dc9a72e"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderFreeGlyphs" ref="a31fa7a567bceaf88984a3e862dc9a72e" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTrapezoids </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">static int dmxProcRenderFreeGlyphs </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free glyphs from the Glyph Set for each screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a182c93f585ba30c52c680849edb51c7f"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderFreeGlyphSet" ref="a182c93f585ba30c52c680849edb51c7f" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="memname">static int dmxProcRenderFreeGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free the previously allocated Glyph Sets for each screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8h_source.html#l00128">DMX_SET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6cf50414d7688db973f42db898ba16a8"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderSetPictureFilter" ref="a6cf50414d7688db973f42db898ba16a8" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="memname">static int dmxProcRenderSetPictureFilter </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set the picture filter on each screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8c.html#a2a976139e942aa64e03b8f5357ba82ca">RenderErrBase</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af7e087c44278e073b515a7adf3788a06"></a><!-- doxytag: member="dmxpict.c::dmxProcRenderSetPictureTransform" ref="af7e087c44278e073b515a7adf3788a06" args="(ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="memname">static int dmxProcRenderSetPictureTransform </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set the picture transform on each screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8c.html#a2a976139e942aa64e03b8f5357ba82ca">RenderErrBase</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a93c956636d6aba1f2ce1cab637e00fff"></a><!-- doxytag: member="dmxpict.c::dmxResetRender" ref="a93c956636d6aba1f2ce1cab637e00fff" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxResetRender </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from <a class="el" href="dmxscrinit_8c.html#a3a9963b8e65e9ffebe694c05260e530b">dmxCloseScreen()</a> during the server reset (only for screen #0). </p>
+
+<p>References <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, and <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae54f217c222944bb10731d73e05ed4b2"></a><!-- doxytag: member="dmxpict.c::dmxTrapezoids" ref="ae54f217c222944bb10731d73e05ed4b2" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxTrapezoids </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ntrap</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ntrap</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>xTrapezoid *&nbsp;</td>
-          <td class="mdname" nowrap> <em>traps</em></td>
+          <td class="paramtype">xTrapezoid *&nbsp;</td>
+          <td class="paramname"> <em>traps</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a34" doxytag="dmxpict.c::dmxTriangles" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a401f568feed789ffc0bb1cc52573f707"></a><!-- doxytag: member="dmxpict.c::dmxTriangles" ref="a401f568feed789ffc0bb1cc52573f707" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriangles </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriangles </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ntri</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ntri</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xTriangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>tris</em></td>
+          <td class="paramtype">xTriangle *&nbsp;</td>
+          <td class="paramname"> <em>tris</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a36" doxytag="dmxpict.c::dmxTriFan" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11d3beb5f92c982f9383bb7e606e3157"></a><!-- doxytag: member="dmxpict.c::dmxTriFan" ref="a11d3beb5f92c982f9383bb7e606e3157" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriFan </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriFan </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npoint</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npoint</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xPointFixed *&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramtype">xPointFixed *&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a35" doxytag="dmxpict.c::dmxTriStrip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3e36166fd4db06d364e7cc1762ab5b8c"></a><!-- doxytag: member="dmxpict.c::dmxTriStrip" ref="a3e36166fd4db06d364e7cc1762ab5b8c" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriStrip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriStrip </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npoint</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npoint</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xPointFixed *&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramtype">xPointFixed *&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="dmxpict.c::dmxUpdateIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a05292dc07650c6fb40e13640cfce0df6"></a><!-- doxytag: member="dmxpict.c::dmxUpdateIndexed" ref="a05292dc07650c6fb40e13640cfce0df6" args="(ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxUpdateIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxUpdateIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ndef</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ndef</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xColorItem *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdef</em></td>
+          <td class="paramtype">xColorItem *&nbsp;</td>
+          <td class="paramname"> <em>pdef</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxpict.c::dmxValidatePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a3a9285c518b050130e40b7e147309350"></a><!-- doxytag: member="dmxpict.c::dmxValidatePicture" ref="a3a9285c518b050130e40b7e147309350" args="(PicturePtr pPicture, Mask mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxValidatePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">void dmxValidatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Mask&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">Mask&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a80081bafc7043ef16f07b96b9322264c"></a><!-- doxytag: member="dmxpict.c::dmxGlyphLastError" ref="a80081bafc7043ef16f07b96b9322264c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxpict_8c.html#a80081bafc7043ef16f07b96b9322264c">dmxGlyphLastError</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Catch errors that might occur when allocating Glyph Sets. Errors are saved in dmxGlyphLastError for later handling. </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, and <a class="el" href="dmxpict_8c_source.html#l00083">dmxGlyphErrorHandler()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aeba9d541daf04470813b176723c857e8"></a><!-- doxytag: member="dmxpict.c::dmxSaveRenderVector" ref="aeba9d541daf04470813b176723c857e8" args="[RenderNumberRequests])(ClientPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int(* <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>[RenderNumberRequests])(ClientPtr)<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, and <a class="el" href="dmxpict_8c_source.html#l00126">dmxResetRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a04fe5f379830ee6515c7af277f3a7908"></a><!-- doxytag: member="dmxpict.c::ProcRenderVector" ref="a04fe5f379830ee6515c7af277f3a7908" args="[RenderNumberRequests])(ClientPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int(* <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a>[RenderNumberRequests])(ClientPtr)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00096">dmxInitRender()</a>, and <a class="el" href="dmxpict_8c_source.html#l00126">dmxResetRender()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a976139e942aa64e03b8f5357ba82ca"></a><!-- doxytag: member="dmxpict.c::RenderErrBase" ref="a2a976139e942aa64e03b8f5357ba82ca" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxpict_8c.html#a2a976139e942aa64e03b8f5357ba82ca">RenderErrBase</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, and <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html
deleted file mode 100644
index 1043f82bf..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxpict_8h-source.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxpict.h</h1><a href="dmxpict_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00042 <span class="preprocessor">#ifndef DMXPICT_H</span>
-00043 <span class="preprocessor"></span><span class="preprocessor">#define DMXPICT_H</span>
-00044 <span class="preprocessor"></span>
-<a name="l00046"></a><a class="code" href="struct__dmxPictPriv.html">00046</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxPictPriv.html">_dmxPictPriv</a> {
-<a name="l00047"></a><a class="code" href="struct__dmxPictPriv.html#o0">00047</a>     Picture  <a class="code" href="struct__dmxPictPriv.html#o0">pict</a>;              
-<a name="l00048"></a><a class="code" href="struct__dmxPictPriv.html#o1">00048</a>     Mask     <a class="code" href="struct__dmxPictPriv.html#o1">savedMask</a>;         
-00050 } <a class="code" href="struct__dmxPictPriv.html">dmxPictPrivRec</a>, *<a class="code" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>;
-00051 
-00052 
-<a name="l00054"></a><a class="code" href="struct__dmxGlyphPriv.html">00054</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> {
-<a name="l00055"></a><a class="code" href="struct__dmxGlyphPriv.html#o0">00055</a>     GlyphSet  *<a class="code" href="struct__dmxGlyphPriv.html#o0">glyphSets</a>; 
-00056 } <a class="code" href="struct__dmxGlyphPriv.html">dmxGlyphPrivRec</a>, *<a class="code" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>;
-00057 
-00058 
-00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a12">dmxInitRender</a>(<span class="keywordtype">void</span>);
-00060 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a13">dmxResetRender</a>(<span class="keywordtype">void</span>);
-00061 
-00062 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a14">dmxPictureInit</a>(ScreenPtr pScreen,
-00063                            PictFormatPtr formats, <span class="keywordtype">int</span> nformats);
-00064 
-00065 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a18">dmxCreatePictureList</a>(WindowPtr pWindow);
-00066 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a21">dmxDestroyPictureList</a>(WindowPtr pWindow);
-00067 
-00068 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#a19">dmxCreatePicture</a>(PicturePtr pPicture);
-00069 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a22">dmxDestroyPicture</a>(PicturePtr pPicture);
-00070 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#a23">dmxChangePictureClip</a>(PicturePtr pPicture, <span class="keywordtype">int</span> clipType,
-00071                                 pointer value, <span class="keywordtype">int</span> n);
-00072 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a24">dmxDestroyPictureClip</a>(PicturePtr pPicture);
-00073 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a25">dmxChangePicture</a>(PicturePtr pPicture, Mask mask);
-00074 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a26">dmxValidatePicture</a>(PicturePtr pPicture, Mask mask);
-00075 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a27">dmxComposite</a>(CARD8 op,
-00076                          PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
-00077                          INT16 xSrc, INT16 ySrc,
-00078                          INT16 xMask, INT16 yMask,
-00079                          INT16 xDst, INT16 yDst,
-00080                          CARD16 width, CARD16 height);
-00081 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a28">dmxGlyphs</a>(CARD8 op,
-00082                       PicturePtr pSrc, PicturePtr pDst,
-00083                       PictFormatPtr maskFormat,
-00084                       INT16 xSrc, INT16 ySrc,
-00085                       <span class="keywordtype">int</span> nlists, GlyphListPtr lists, GlyphPtr *glyphs);
-00086 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a29">dmxCompositeRects</a>(CARD8 op,
-00087                               PicturePtr pDst,
-00088                               xRenderColor *color,
-00089                               <span class="keywordtype">int</span> nRect, xRectangle *rects);
-00090 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a30">dmxInitIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat);
-00091 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a31">dmxCloseIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat);
-00092 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a32">dmxUpdateIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat,
-00093                              <span class="keywordtype">int</span> ndef, xColorItem *pdef);
-00094 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a33">dmxTrapezoids</a>(CARD8 op,
-00095                           PicturePtr pSrc, PicturePtr pDst,
-00096                           PictFormatPtr maskFormat,
-00097                           INT16 xSrc, INT16 ySrc,
-00098                           <span class="keywordtype">int</span> ntrap, xTrapezoid *traps);
-00099 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a34">dmxTriangles</a>(CARD8 op,
-00100                          PicturePtr pSrc, PicturePtr pDst,
-00101                          PictFormatPtr maskFormat,
-00102                          INT16 xSrc, INT16 ySrc,
-00103                          <span class="keywordtype">int</span> ntri, xTriangle *tris);
-00104 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a35">dmxTriStrip</a>(CARD8 op,
-00105                         PicturePtr pSrc, PicturePtr pDst,
-00106                         PictFormatPtr maskFormat,
-00107                         INT16 xSrc, INT16 ySrc,
-00108                         <span class="keywordtype">int</span> npoint, xPointFixed *points);
-00109 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a36">dmxTriFan</a>(CARD8 op,
-00110                       PicturePtr pSrc, PicturePtr pDst,
-00111                       PictFormatPtr maskFormat,
-00112                       INT16 xSrc, INT16 ySrc,
-00113                       <span class="keywordtype">int</span> npoint, xPointFixed *points);
-00114 
-00115 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a16">dmxBEFreeGlyphSet</a>(ScreenPtr pScreen, GlyphSetPtr glyphSet);
-00116 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a20">dmxBEFreePicture</a>(PicturePtr pPicture);
-00117 
-<a name="l00118"></a><a class="code" href="dmxpict_8h.html#a7">00118</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8h.html#a7">dmxPictPrivateIndex</a>;         
-<a name="l00119"></a><a class="code" href="dmxpict_8h.html#a8">00119</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8h.html#a8">dmxGlyphSetPrivateIndex</a>;     
-<a name="l00123"></a><a class="code" href="dmxpict_8h.html#a0">00123</a> <span class="preprocessor">#define DMX_GET_PICT_PRIV(_pPict)                                       \</span>
-00124 <span class="preprocessor">    (dmxPictPrivPtr)(_pPict)-&gt;devPrivates[dmxPictPrivateIndex].ptr</span>
-00125 <span class="preprocessor"></span>
-<a name="l00127"></a><a class="code" href="dmxpict_8h.html#a1">00127</a> <span class="preprocessor">#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)                             \</span>
-00128 <span class="preprocessor">    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateIndex, (_pPriv))</span>
-00129 <span class="preprocessor"></span>
-<a name="l00130"></a><a class="code" href="dmxpict_8h.html#a2">00130</a> <span class="preprocessor">#define DMX_GET_GLYPH_PRIV(_pGlyph)                                     \</span>
-00131 <span class="preprocessor">    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateIndex)</span>
-00132 <span class="preprocessor"></span>
-00133 <span class="preprocessor">#endif </span><span class="comment">/* DMXPICT_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h.html
index ea00f7a84..722a89152 100644
--- a/xorg-server/hw/dmx/doc/html/dmxpict_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxpict_8h.html
@@ -6,1404 +6,1229 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxpict.h File Reference</h1>
-<p>
-<a href="dmxpict_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a0">DMX_GET_PICT_PRIV</a>(_pPict)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>)(_pPict)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a7">dmxPictPrivateIndex</a>].ptr</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a1">DMX_SET_GLYPH_PRIV</a>(_pGlyph, _pPriv)&nbsp;&nbsp;&nbsp;GlyphSetSetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>, (_pPriv))</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a2">DMX_GET_GLYPH_PRIV</a>(_pGlyph)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>)GlyphSetGetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>)</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a3">dmxPictPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a4">dmxPictPrivPtr</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a5">dmxGlyphPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a6">dmxGlyphPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a9">dmxInitRender</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a10">dmxResetRender</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a11">dmxPictureInit</a> (ScreenPtr pScreen, PictFormatPtr formats, int nformats)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a12">dmxCreatePictureList</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a13">dmxDestroyPictureList</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a14">dmxCreatePicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a15">dmxDestroyPicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a16">dmxChangePictureClip</a> (PicturePtr pPicture, int clipType, pointer value, int n)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a17">dmxDestroyPictureClip</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a18">dmxChangePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a19">dmxValidatePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a20">dmxComposite</a> (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a21">dmxGlyphs</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a22">dmxCompositeRects</a> (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a23">dmxInitIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a24">dmxCloseIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a25">dmxUpdateIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a26">dmxTrapezoids</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a27">dmxTriangles</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a28">dmxTriStrip</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a29">dmxTriFan</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a30">dmxBEFreeGlyphSet</a> (ScreenPtr pScreen, GlyphSetPtr glyphSet)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a31">dmxBEFreePicture</a> (PicturePtr pPicture)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a7">dmxPictPrivateIndex</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpict_8h.html#a8">dmxGlyphSetPrivateIndex</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides access to the externally visible RENDER support functions, global variables and macros for DMX.<p>
-FIXME: Move function definitions for non-externally visible function to .c file.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxpict.h::DMX_GET_GLYPH_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_GLYPH_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pGlyph&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>)GlyphSetGetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>)
+<p><a href="dmxpict_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#af79a539efc23aae2fd9f175e5e9dbf56">DMX_GET_PICT_PRIV</a>(_pPict)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>)dixLookupPrivate(&amp;(_pPict)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a>)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a326b29fc2f94bec3a92a7d2c801df449">DMX_SET_GLYPH_PRIV</a>(_pGlyph, _pPriv)&nbsp;&nbsp;&nbsp;GlyphSetSetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a>, (_pPriv))</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a1f3973dbafad54de511adf9c20a80281">DMX_GET_GLYPH_PRIV</a>(_pGlyph)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>)GlyphSetGetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a>)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#ab9d490e5079b84da8b60bf0aadd4b10e">dmxPictPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#af8d6ee7f8278532ad8b810f448d1cca3">dmxPictPrivPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a9861086a35576e59fe0f9306c4e2588d">dmxGlyphPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a269ea3cc32b511169336925123d1558d">dmxGlyphPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a76cabef9d3047d8f514fb6e17b951145">dmxInitRender</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a93c956636d6aba1f2ce1cab637e00fff">dmxResetRender</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a457aa4df6b01e88a26cc069094e4b07c">dmxPictureInit</a> (ScreenPtr pScreen, PictFormatPtr formats, int nformats)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a8c52091268b0f77d74d3a097b396abcf">dmxCreatePictureList</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a0af49a0382a2763672f3f8bc1e1ee156">dmxDestroyPictureList</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#ad7adb9c71564816f5f3172c710274d57">dmxCreatePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#aee92c240df08f4c8a62c291b3efa4d7e">dmxDestroyPicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a80e126a5d7911fec43bad8a9428980d6">dmxChangePictureClip</a> (PicturePtr pPicture, int clipType, pointer value, int n)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#aa977edb667e68606b2e08b25d99427de">dmxDestroyPictureClip</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a316382a2e169f1662363123670a252c7">dmxChangePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a3a9285c518b050130e40b7e147309350">dmxValidatePicture</a> (PicturePtr pPicture, Mask mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a65851c1a4e9cd6946d67ff5aaf7bce88">dmxComposite</a> (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a8a98dca5e23c501c44fa3e040e31d100">dmxGlyphs</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#ae828cd3db7af3c9e3a615267cd780ac4">dmxCompositeRects</a> (CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a5c81bdb404715c2318d3eda49e26fe68">dmxInitIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#aa63b1daaacc56332c04832198a9e30b7">dmxCloseIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a05292dc07650c6fb40e13640cfce0df6">dmxUpdateIndexed</a> (ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#ae54f217c222944bb10731d73e05ed4b2">dmxTrapezoids</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a401f568feed789ffc0bb1cc52573f707">dmxTriangles</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a3e36166fd4db06d364e7cc1762ab5b8c">dmxTriStrip</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a11d3beb5f92c982f9383bb7e606e3157">dmxTriFan</a> (CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a390ee65e9cbdf613f5f7a6fafa754fff">dmxBECreateGlyphSet</a> (int idx, GlyphSetPtr glyphSet)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a342746cc3fb1fe0731522315c6dd91fc">dmxBEFreeGlyphSet</a> (ScreenPtr pScreen, GlyphSetPtr glyphSet)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#ac1b1e577a8993b4c76eba1bfad485396">dmxBECreatePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a7b24ad91d73ffd9475719ec4b0a73f34">dmxBEFreePicture</a> (PicturePtr pPicture)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpict_8h.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides access to the externally visible RENDER support functions, global variables and macros for DMX.</p>
+<p>FIXME: Move function definitions for non-externally visible function to .c file. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a1f3973dbafad54de511adf9c20a80281"></a><!-- doxytag: member="dmxpict.h::DMX_GET_GLYPH_PRIV" ref="a1f3973dbafad54de511adf9c20a80281" args="(_pGlyph)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_GET_GLYPH_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pGlyph&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>)GlyphSetGetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a>)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get the glyphset private data given a glyphset pointer     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxpict.h::DMX_GET_PICT_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_PICT_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pPict&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>)(_pPict)-&gt;devPrivates[<a class="el" href="dmxscrinit_8c.html#a7">dmxPictPrivateIndex</a>].ptr
+</div>
+<div class="memdoc">
+<p>Get the glyphset private data given a glyphset pointer </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, and <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af79a539efc23aae2fd9f175e5e9dbf56"></a><!-- doxytag: member="dmxpict.h::DMX_GET_PICT_PRIV" ref="af79a539efc23aae2fd9f175e5e9dbf56" args="(_pPict)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_GET_PICT_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pPict&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>)dixLookupPrivate(&amp;(_pPict)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a>)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get the picture private data given a picture pointer     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxpict.h::DMX_SET_GLYPH_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Get the picture private data given a picture pointer </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00740">dmxCreatePictureList()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a326b29fc2f94bec3a92a7d2c801df449"></a><!-- doxytag: member="dmxpict.h::DMX_SET_GLYPH_PRIV" ref="a326b29fc2f94bec3a92a7d2c801df449" args="(_pGlyph, _pPriv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_SET_GLYPH_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pGlyph,         <tr>
-          <td></td>
+          <td class="memname">#define DMX_SET_GLYPH_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pGlyph, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>_pPriv&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;GlyphSetSetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>, (_pPriv))
+          <td class="paramtype">_pPriv&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;GlyphSetSetPrivate((_pGlyph), <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a>, (_pPriv))</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the glyphset private data given a glyphset pointer     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxpict.h::dmxGlyphPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> * <a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>
+</div>
+<div class="memdoc">
+<p>Set the glyphset private data given a glyphset pointer </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, and <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a269ea3cc32b511169336925123d1558d"></a><!-- doxytag: member="dmxpict.h::dmxGlyphPrivPtr" ref="a269ea3cc32b511169336925123d1558d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> * <a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Glyph Set private structure     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxpict.h::dmxGlyphPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a9861086a35576e59fe0f9306c4e2588d"></a><!-- doxytag: member="dmxpict.h::dmxGlyphPrivRec" ref="a9861086a35576e59fe0f9306c4e2588d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>  <a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a>  <a class="el" href="struct__dmxGlyphPriv.html">dmxGlyphPrivRec</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Glyph Set private structure     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxpict.h::dmxPictPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Glyph Set private structure </p>
+
+</div>
+</div>
+<a class="anchor" id="af8d6ee7f8278532ad8b810f448d1cca3"></a><!-- doxytag: member="dmxpict.h::dmxPictPrivPtr" ref="af8d6ee7f8278532ad8b810f448d1cca3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a> * <a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a> * <a class="el" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Picture private structure     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxpict.h::dmxPictPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab9d490e5079b84da8b60bf0aadd4b10e"></a><!-- doxytag: member="dmxpict.h::dmxPictPrivRec" ref="ab9d490e5079b84da8b60bf0aadd4b10e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>  <a class="el" href="struct__dmxPictPriv.html">dmxPictPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxPictPriv.html">_dmxPictPriv</a>  <a class="el" href="struct__dmxPictPriv.html">dmxPictPrivRec</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Picture private structure     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a30" doxytag="dmxpict.h::dmxBEFreeGlyphSet" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Picture private structure </p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a390ee65e9cbdf613f5f7a6fafa754fff"></a><!-- doxytag: member="dmxpict.h::dmxBECreateGlyphSet" ref="a390ee65e9cbdf613f5f7a6fafa754fff" args="(int idx, GlyphSetPtr glyphSet)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreeGlyphSet </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">int dmxBECreateGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GlyphSetPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>glyphSet</em></td>
+          <td class="paramtype">GlyphSetPtr&nbsp;</td>
+          <td class="paramname"> <em>glyphSet</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Free <em>glyphSet</em> on back-end screen number <em>idx</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a31" doxytag="dmxpict.h::dmxBEFreePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create <em>glyphSet</em> on the backend screen number <em>idx</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxpict_8c_source.html#l00083">dmxGlyphErrorHandler()</a>, <a class="el" href="dmxpict_8c_source.html#l00082">dmxGlyphLastError</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, and <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac1b1e577a8993b4c76eba1bfad485396"></a><!-- doxytag: member="dmxpict.h::dmxBECreatePicture" ref="ac1b1e577a8993b4c76eba1bfad485396" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxBECreatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pPicture</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxpict.h::dmxChangePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create <em>pPicture</em> on the backend. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a342746cc3fb1fe0731522315c6dd91fc"></a><!-- doxytag: member="dmxpict.h::dmxBEFreeGlyphSet" ref="a342746cc3fb1fe0731522315c6dd91fc" args="(ScreenPtr pScreen, GlyphSetPtr glyphSet)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">Bool dmxBEFreeGlyphSet </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Mask&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">GlyphSetPtr&nbsp;</td>
+          <td class="paramname"> <em>glyphSet</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Free <em>glyphSet</em> on back-end screen number <em>idx</em>. </p>
 
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00131">DMX_GET_GLYPH_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00054">_dmxGlyphPriv::glyphSets</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, and <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7b24ad91d73ffd9475719ec4b0a73f34"></a><!-- doxytag: member="dmxpict.h::dmxBEFreePicture" ref="a7b24ad91d73ffd9475719ec4b0a73f34" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEFreePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxpict.h::dmxChangePictureClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy <em>pPicture</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00815">dmxDestroyPictureList()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a316382a2e169f1662363123670a252c7"></a><!-- doxytag: member="dmxpict.h::dmxChangePicture" ref="a316382a2e169f1662363123670a252c7" args="(PicturePtr pPicture, Mask mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxChangePictureClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">void dmxChangePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>clipType</em>, </td>
+          <td class="paramtype">Mask&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Change the attributes of the pictures. If the picture has not yet been created due to lazy window creation, save the mask so that it can be used to appropriately initialize the picture's attributes when it is created later. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a80e126a5d7911fec43bad8a9428980d6"></a><!-- doxytag: member="dmxpict.h::dmxChangePictureClip" ref="a80e126a5d7911fec43bad8a9428980d6" args="(PicturePtr pPicture, int clipType, pointer value, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxChangePictureClip </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>clipType</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the picture's list of clip rectangles.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxpict.h::dmxCloseIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the picture's list of clip rectangles. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa63b1daaacc56332c04832198a9e30b7"></a><!-- doxytag: member="dmxpict.h::dmxCloseIndexed" ref="aa63b1daaacc56332c04832198a9e30b7" args="(ScreenPtr pScreen, PictFormatPtr pFormat)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCloseIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxCloseIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em></td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxpict.h::dmxComposite" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a65851c1a4e9cd6946d67ff5aaf7bce88"></a><!-- doxytag: member="dmxpict.h::dmxComposite" ref="a65851c1a4e9cd6946d67ff5aaf7bce88" args="(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxComposite </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxComposite </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pMask</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xMask</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>yMask</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>yMask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xDst</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>yDst</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>yDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD16&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">CARD16&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>CARD16&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramtype">CARD16&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxpict.h::dmxCompositeRects" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a picture on the appropriate screen by combining the specified rectangle of the transformed src and mask operands with the specified rectangle of the dst using op as the compositing operator. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae828cd3db7af3c9e3a615267cd780ac4"></a><!-- doxytag: member="dmxpict.h::dmxCompositeRects" ref="ae828cd3db7af3c9e3a615267cd780ac4" args="(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCompositeRects </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxCompositeRects </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRenderColor *&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramtype">xRenderColor *&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nRect</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nRect</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xRectangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>rects</em></td>
+          <td class="paramtype">xRectangle *&nbsp;</td>
+          <td class="paramname"> <em>rects</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxpict.h::dmxCreatePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill a rectangle on the appropriate screen by combining the color with the dest picture in the area specified by the list of rectangles. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad7adb9c71564816f5f3172c710274d57"></a><!-- doxytag: member="dmxpict.h::dmxCreatePicture" ref="ad7adb9c71564816f5f3172c710274d57" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxCreatePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxCreatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxpict.h::dmxCreatePictureList" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a picture. This function handles the CreatePicture unwrapping/wrapping and calls dmxDoCreatePicture to actually create the picture on the appropriate screen. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8c52091268b0f77d74d3a097b396abcf"></a><!-- doxytag: member="dmxpict.h::dmxCreatePictureList" ref="a8c52091268b0f77d74d3a097b396abcf" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCreatePictureList </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxCreatePictureList </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a list of pictures. This function is called by <a class="el" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow()</a> during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxpict.h::dmxDestroyPicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a list of pictures. This function is called by <a class="el" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow()</a> during the lazy window creation realization process. It creates the entire list of pictures that are associated with the given window. </p>
+
+<p>References <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aee92c240df08f4c8a62c291b3efa4d7e"></a><!-- doxytag: member="dmxpict.h::dmxDestroyPicture" ref="aee92c240df08f4c8a62c291b3efa4d7e" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyPicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyPicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxpict.h::dmxDestroyPictureClip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy a picture. This function calls the wrapped function that frees the resources in the DMX server associated with this picture. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa977edb667e68606b2e08b25d99427de"></a><!-- doxytag: member="dmxpict.h::dmxDestroyPictureClip" ref="aa977edb667e68606b2e08b25d99427de" args="(PicturePtr pPicture)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxDestroyPictureClip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPicture</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxDestroyPictureClip </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the picture's list of clip rectangles.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxpict.h::dmxDestroyPictureList" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the picture's list of clip rectangles. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0af49a0382a2763672f3f8bc1e1ee156"></a><!-- doxytag: member="dmxpict.h::dmxDestroyPictureList" ref="a0af49a0382a2763672f3f8bc1e1ee156" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyPictureList </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxDestroyPictureList </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by <a class="el" href="dmxwindow_8c.html#a12">dmxDestroyWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxpict.h::dmxGlyphs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy a list of pictures that are associated with the window that is being destroyed. This function is called by <a class="el" href="dmxwindow_8c.html#a25a0aafd36f68137e67a3e6d95b78f53">dmxDestroyWindow()</a>. </p>
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8a98dca5e23c501c44fa3e040e31d100"></a><!-- doxytag: member="dmxpict.h::dmxGlyphs" ref="a8a98dca5e23c501c44fa3e040e31d100" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists, GlyphPtr *glyphs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxGlyphs </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxGlyphs </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nlists</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nlists</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GlyphListPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>lists</em>, </td>
+          <td class="paramtype">GlyphListPtr&nbsp;</td>
+          <td class="paramname"> <em>lists</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>GlyphPtr *&nbsp;</td>
-          <td class="mdname" nowrap> <em>glyphs</em></td>
+          <td class="paramtype">GlyphPtr *&nbsp;</td>
+          <td class="paramname"> <em>glyphs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by <a class="el" href="dmxpict_8c.html#a8">dmxProcRenderCompositeGlyphs()</a>. This function should never be called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxpict.h::dmxInitIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Null function to catch when/if RENDER calls lower level mi hooks. Compositing glyphs is handled by <a class="el" href="dmxpict_8c.html#a612db8702e6a380e12719576a57602e7">dmxProcRenderCompositeGlyphs()</a>. This function should never be called. </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5c81bdb404715c2318d3eda49e26fe68"></a><!-- doxytag: member="dmxpict.h::dmxInitIndexed" ref="a5c81bdb404715c2318d3eda49e26fe68" args="(ScreenPtr pScreen, PictFormatPtr pFormat)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxInitIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em></td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxpict.h::dmxInitRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a76cabef9d3047d8f514fb6e17b951145"></a><!-- doxytag: member="dmxpict.h::dmxInitRender" ref="a76cabef9d3047d8f514fb6e17b951145" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxInitRender </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxInitRender </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from <a class="el" href="dmxinit_8c.html#a34">InitOutput()</a> since it should be initialized only once per server generation.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxpict.h::dmxPictureInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the Proc Vector for the RENDER extension. The functions here cannot be handled by the mi layer RENDER hooks either because the required information is no longer available when it reaches the mi layer or no mi layer hooks exist. This function is called from <a class="el" href="dmxinit_8c.html#a51c195c51f4f09e981384a4215f82321">InitOutput()</a> since it should be initialized only once per server generation. </p>
+
+<p>References <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, and <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a457aa4df6b01e88a26cc069094e4b07c"></a><!-- doxytag: member="dmxpict.h::dmxPictureInit" ref="a457aa4df6b01e88a26cc069094e4b07c" args="(ScreenPtr pScreen, PictFormatPtr formats, int nformats)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxPictureInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Bool dmxPictureInit </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>formats</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>formats</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nformats</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nformats</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxpict.h::dmxResetRender" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the RENDER extension, allocate the picture privates and wrap mi function hooks. If the shadow frame buffer is used, then call the appropriate fb initialization function. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01087">dmxGlyphs()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00083">dmxPictPrivateKey</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a93c956636d6aba1f2ce1cab637e00fff"></a><!-- doxytag: member="dmxpict.h::dmxResetRender" ref="a93c956636d6aba1f2ce1cab637e00fff" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResetRender </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxResetRender </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from <a class="el" href="dmxscrinit_8c.html#a9">dmxCloseScreen()</a> during the server reset (only for screen #0).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxpict.h::dmxTrapezoids" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Reset the Proc Vector for the RENDER extension back to the original functions. This function is called from <a class="el" href="dmxscrinit_8c.html#a3a9963b8e65e9ffebe694c05260e530b">dmxCloseScreen()</a> during the server reset (only for screen #0). </p>
+
+<p>References <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxSaveRenderVector</a>, and <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">ProcRenderVector</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae54f217c222944bb10731d73e05ed4b2"></a><!-- doxytag: member="dmxpict.h::dmxTrapezoids" ref="ae54f217c222944bb10731d73e05ed4b2" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTrapezoids </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTrapezoids </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ntrap</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ntrap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xTrapezoid *&nbsp;</td>
-          <td class="mdname" nowrap> <em>traps</em></td>
+          <td class="paramtype">xTrapezoid *&nbsp;</td>
+          <td class="paramname"> <em>traps</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxpict.h::dmxTriangles" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a list of trapezoids on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a401f568feed789ffc0bb1cc52573f707"></a><!-- doxytag: member="dmxpict.h::dmxTriangles" ref="a401f568feed789ffc0bb1cc52573f707" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntri, xTriangle *tris)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriangles </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriangles </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ntri</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ntri</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xTriangle *&nbsp;</td>
-          <td class="mdname" nowrap> <em>tris</em></td>
+          <td class="paramtype">xTriangle *&nbsp;</td>
+          <td class="paramname"> <em>tris</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxpict.h::dmxTriFan" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a list of triangles on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11d3beb5f92c982f9383bb7e606e3157"></a><!-- doxytag: member="dmxpict.h::dmxTriFan" ref="a11d3beb5f92c982f9383bb7e606e3157" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriFan </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriFan </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npoint</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npoint</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xPointFixed *&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramtype">xPointFixed *&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxpict.h::dmxTriStrip" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a triangle fan on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3e36166fd4db06d364e7cc1762ab5b8c"></a><!-- doxytag: member="dmxpict.h::dmxTriStrip" ref="a3e36166fd4db06d364e7cc1762ab5b8c" args="(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int npoint, xPointFixed *points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxTriStrip </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">CARD8&nbsp;</td>
-          <td class="mdname" nowrap> <em>op</em>, </td>
+          <td class="memname">void dmxTriStrip </td>
+          <td>(</td>
+          <td class="paramtype">CARD8&nbsp;</td>
+          <td class="paramname"> <em>op</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSrc</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDst</em>, </td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pDst</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>maskFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>maskFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>xSrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>xSrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>INT16&nbsp;</td>
-          <td class="mdname" nowrap> <em>ySrc</em>, </td>
+          <td class="paramtype">INT16&nbsp;</td>
+          <td class="paramname"> <em>ySrc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>npoint</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>npoint</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xPointFixed *&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramtype">xPointFixed *&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxpict.h::dmxUpdateIndexed" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Composite a triangle strip on the appropriate screen. For a complete description see the protocol document of the RENDER library. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a05292dc07650c6fb40e13640cfce0df6"></a><!-- doxytag: member="dmxpict.h::dmxUpdateIndexed" ref="a05292dc07650c6fb40e13640cfce0df6" args="(ScreenPtr pScreen, PictFormatPtr pFormat, int ndef, xColorItem *pdef)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxUpdateIndexed </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxUpdateIndexed </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>PictFormatPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pFormat</em>, </td>
+          <td class="paramtype">PictFormatPtr&nbsp;</td>
+          <td class="paramname"> <em>pFormat</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ndef</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ndef</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xColorItem *&nbsp;</td>
-          <td class="mdname" nowrap> <em>pdef</em></td>
+          <td class="paramtype">xColorItem *&nbsp;</td>
+          <td class="paramname"> <em>pdef</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Indexed color visuals are not yet supported.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxpict.h::dmxValidatePicture" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Indexed color visuals are not yet supported. </p>
+
+</div>
+</div>
+<a class="anchor" id="a3a9285c518b050130e40b7e147309350"></a><!-- doxytag: member="dmxpict.h::dmxValidatePicture" ref="a3a9285c518b050130e40b7e147309350" args="(PicturePtr pPicture, Mask mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxValidatePicture </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PicturePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPicture</em>, </td>
+          <td class="memname">void dmxValidatePicture </td>
+          <td>(</td>
+          <td class="paramtype">PicturePtr&nbsp;</td>
+          <td class="paramname"> <em>pPicture</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Mask&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">Mask&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxpict.h::dmxGlyphSetPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>
+</div>
+<div class="memdoc">
+<p>Validate the picture's attributes before rendering to it. Update any picture attributes that have been changed by one of the higher layers. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpict_8h_source.html#l00124">DMX_GET_PICT_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, <a class="el" href="dmxpict_8h_source.html#l00046">_dmxPictPriv::pict</a>, and <a class="el" href="dmxpict_8h_source.html#l00047">_dmxPictPriv::savedMask</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="af4a0d93e32ac272f72e3b5a6642fb135"></a><!-- doxytag: member="dmxpict.h::dmxGlyphSetPrivateKey" ref="af4a0d93e32ac272f72e3b5a6642fb135" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for GlyphSets     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxpict.h::dmxPictPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Index for glyphset private data</p>
+<p>Private index for GlyphSets </p>
+
+</div>
+</div>
+<a class="anchor" id="a4b033f36c5e01a808f7d6460eb7c1af3"></a><!-- doxytag: member="dmxpict.h::dmxPictPrivateKey" ref="a4b033f36c5e01a808f7d6460eb7c1af3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a7">dmxPictPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Picts     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Index for picture private data</p>
+<p>Private index for Picts </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html
new file mode 100644
index 000000000..7616ee671
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxpict_8h_source.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxpict.h</h1><a href="dmxpict_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00041"></a>00041 <span class="preprocessor">#ifndef DMXPICT_H</span>
+<a name="l00042"></a>00042 <span class="preprocessor"></span><span class="preprocessor">#define DMXPICT_H</span>
+<a name="l00043"></a>00043 <span class="preprocessor"></span>
+<a name="l00045"></a><a class="code" href="struct__dmxPictPriv.html">00045</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxPictPriv.html">_dmxPictPriv</a> {
+<a name="l00046"></a><a class="code" href="struct__dmxPictPriv.html#a29ce8f04c93049d70c37ab68c3fb0997">00046</a>     Picture  <a class="code" href="struct__dmxPictPriv.html#a29ce8f04c93049d70c37ab68c3fb0997">pict</a>;              
+<a name="l00047"></a><a class="code" href="struct__dmxPictPriv.html#a5e1f06f9c1dc3f27729b77a910d388f7">00047</a>     Mask     <a class="code" href="struct__dmxPictPriv.html#a5e1f06f9c1dc3f27729b77a910d388f7">savedMask</a>;         
+<a name="l00049"></a>00049 } <a class="code" href="struct__dmxPictPriv.html">dmxPictPrivRec</a>, *<a class="code" href="struct__dmxPictPriv.html">dmxPictPrivPtr</a>;
+<a name="l00050"></a>00050 
+<a name="l00051"></a>00051 
+<a name="l00053"></a><a class="code" href="struct__dmxGlyphPriv.html">00053</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxGlyphPriv.html">_dmxGlyphPriv</a> {
+<a name="l00054"></a><a class="code" href="struct__dmxGlyphPriv.html#a041bb4d62519bb607df0085a06fc5f76">00054</a>     GlyphSet  *<a class="code" href="struct__dmxGlyphPriv.html#a041bb4d62519bb607df0085a06fc5f76">glyphSets</a>; 
+<a name="l00055"></a>00055 } <a class="code" href="struct__dmxGlyphPriv.html">dmxGlyphPrivRec</a>, *<a class="code" href="struct__dmxGlyphPriv.html">dmxGlyphPrivPtr</a>;
+<a name="l00056"></a>00056 
+<a name="l00057"></a>00057 
+<a name="l00058"></a>00058 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a76cabef9d3047d8f514fb6e17b951145">dmxInitRender</a>(<span class="keywordtype">void</span>);
+<a name="l00059"></a>00059 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a93c956636d6aba1f2ce1cab637e00fff">dmxResetRender</a>(<span class="keywordtype">void</span>);
+<a name="l00060"></a>00060 
+<a name="l00061"></a>00061 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a457aa4df6b01e88a26cc069094e4b07c">dmxPictureInit</a>(ScreenPtr pScreen,
+<a name="l00062"></a>00062                            PictFormatPtr formats, <span class="keywordtype">int</span> nformats);
+<a name="l00063"></a>00063 
+<a name="l00064"></a>00064 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a8c52091268b0f77d74d3a097b396abcf">dmxCreatePictureList</a>(WindowPtr pWindow);
+<a name="l00065"></a>00065 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a0af49a0382a2763672f3f8bc1e1ee156">dmxDestroyPictureList</a>(WindowPtr pWindow);
+<a name="l00066"></a>00066 
+<a name="l00067"></a>00067 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#ad7adb9c71564816f5f3172c710274d57">dmxCreatePicture</a>(PicturePtr pPicture);
+<a name="l00068"></a>00068 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#aee92c240df08f4c8a62c291b3efa4d7e">dmxDestroyPicture</a>(PicturePtr pPicture);
+<a name="l00069"></a>00069 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#a80e126a5d7911fec43bad8a9428980d6">dmxChangePictureClip</a>(PicturePtr pPicture, <span class="keywordtype">int</span> clipType,
+<a name="l00070"></a>00070                                 pointer value, <span class="keywordtype">int</span> n);
+<a name="l00071"></a>00071 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#aa977edb667e68606b2e08b25d99427de">dmxDestroyPictureClip</a>(PicturePtr pPicture);
+<a name="l00072"></a>00072 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a316382a2e169f1662363123670a252c7">dmxChangePicture</a>(PicturePtr pPicture, Mask mask);
+<a name="l00073"></a>00073 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a3a9285c518b050130e40b7e147309350">dmxValidatePicture</a>(PicturePtr pPicture, Mask mask);
+<a name="l00074"></a>00074 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a65851c1a4e9cd6946d67ff5aaf7bce88">dmxComposite</a>(CARD8 op,
+<a name="l00075"></a>00075                          PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
+<a name="l00076"></a>00076                          INT16 xSrc, INT16 ySrc,
+<a name="l00077"></a>00077                          INT16 xMask, INT16 yMask,
+<a name="l00078"></a>00078                          INT16 xDst, INT16 yDst,
+<a name="l00079"></a>00079                          CARD16 width, CARD16 height);
+<a name="l00080"></a>00080 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a8a98dca5e23c501c44fa3e040e31d100">dmxGlyphs</a>(CARD8 op,
+<a name="l00081"></a>00081                       PicturePtr pSrc, PicturePtr pDst,
+<a name="l00082"></a>00082                       PictFormatPtr maskFormat,
+<a name="l00083"></a>00083                       INT16 xSrc, INT16 ySrc,
+<a name="l00084"></a>00084                       <span class="keywordtype">int</span> nlists, GlyphListPtr lists, GlyphPtr *glyphs);
+<a name="l00085"></a>00085 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#ae828cd3db7af3c9e3a615267cd780ac4">dmxCompositeRects</a>(CARD8 op,
+<a name="l00086"></a>00086                               PicturePtr pDst,
+<a name="l00087"></a>00087                               xRenderColor *color,
+<a name="l00088"></a>00088                               <span class="keywordtype">int</span> nRect, xRectangle *rects);
+<a name="l00089"></a>00089 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a5c81bdb404715c2318d3eda49e26fe68">dmxInitIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat);
+<a name="l00090"></a>00090 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#aa63b1daaacc56332c04832198a9e30b7">dmxCloseIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat);
+<a name="l00091"></a>00091 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a05292dc07650c6fb40e13640cfce0df6">dmxUpdateIndexed</a>(ScreenPtr pScreen, PictFormatPtr pFormat,
+<a name="l00092"></a>00092                              <span class="keywordtype">int</span> ndef, xColorItem *pdef);
+<a name="l00093"></a>00093 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#ae54f217c222944bb10731d73e05ed4b2">dmxTrapezoids</a>(CARD8 op,
+<a name="l00094"></a>00094                           PicturePtr pSrc, PicturePtr pDst,
+<a name="l00095"></a>00095                           PictFormatPtr maskFormat,
+<a name="l00096"></a>00096                           INT16 xSrc, INT16 ySrc,
+<a name="l00097"></a>00097                           <span class="keywordtype">int</span> ntrap, xTrapezoid *traps);
+<a name="l00098"></a>00098 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a401f568feed789ffc0bb1cc52573f707">dmxTriangles</a>(CARD8 op,
+<a name="l00099"></a>00099                          PicturePtr pSrc, PicturePtr pDst,
+<a name="l00100"></a>00100                          PictFormatPtr maskFormat,
+<a name="l00101"></a>00101                          INT16 xSrc, INT16 ySrc,
+<a name="l00102"></a>00102                          <span class="keywordtype">int</span> ntri, xTriangle *tris);
+<a name="l00103"></a>00103 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a3e36166fd4db06d364e7cc1762ab5b8c">dmxTriStrip</a>(CARD8 op,
+<a name="l00104"></a>00104                         PicturePtr pSrc, PicturePtr pDst,
+<a name="l00105"></a>00105                         PictFormatPtr maskFormat,
+<a name="l00106"></a>00106                         INT16 xSrc, INT16 ySrc,
+<a name="l00107"></a>00107                         <span class="keywordtype">int</span> npoint, xPointFixed *points);
+<a name="l00108"></a>00108 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxpict_8c.html#a11d3beb5f92c982f9383bb7e606e3157">dmxTriFan</a>(CARD8 op,
+<a name="l00109"></a>00109                       PicturePtr pSrc, PicturePtr pDst,
+<a name="l00110"></a>00110                       PictFormatPtr maskFormat,
+<a name="l00111"></a>00111                       INT16 xSrc, INT16 ySrc,
+<a name="l00112"></a>00112                       <span class="keywordtype">int</span> npoint, xPointFixed *points);
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#a390ee65e9cbdf613f5f7a6fafa754fff">dmxBECreateGlyphSet</a>(<span class="keywordtype">int</span> idx, GlyphSetPtr glyphSet);
+<a name="l00115"></a>00115 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a342746cc3fb1fe0731522315c6dd91fc">dmxBEFreeGlyphSet</a>(ScreenPtr pScreen, GlyphSetPtr glyphSet);
+<a name="l00116"></a>00116 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpict_8c.html#ac1b1e577a8993b4c76eba1bfad485396">dmxBECreatePicture</a>(PicturePtr pPicture);
+<a name="l00117"></a>00117 <span class="keyword">extern</span> Bool <a class="code" href="dmxpict_8c.html#a7b24ad91d73ffd9475719ec4b0a73f34">dmxBEFreePicture</a>(PicturePtr pPicture);
+<a name="l00118"></a>00118 
+<a name="l00119"></a>00119 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxpict_8h.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a>; 
+<a name="l00120"></a>00120 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxpict_8h.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a>; 
+<a name="l00124"></a><a class="code" href="dmxpict_8h.html#af79a539efc23aae2fd9f175e5e9dbf56">00124</a> <span class="preprocessor">#define DMX_GET_PICT_PRIV(_pPict)                                       \</span>
+<a name="l00125"></a>00125 <span class="preprocessor">    (dmxPictPrivPtr)dixLookupPrivate(&amp;(_pPict)-&gt;devPrivates, dmxPictPrivateKey)</span>
+<a name="l00126"></a>00126 <span class="preprocessor"></span>
+<a name="l00128"></a><a class="code" href="dmxpict_8h.html#a326b29fc2f94bec3a92a7d2c801df449">00128</a> <span class="preprocessor">#define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)                             \</span>
+<a name="l00129"></a>00129 <span class="preprocessor">    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))</span>
+<a name="l00130"></a>00130 <span class="preprocessor"></span>
+<a name="l00131"></a><a class="code" href="dmxpict_8h.html#a1f3973dbafad54de511adf9c20a80281">00131</a> <span class="preprocessor">#define DMX_GET_GLYPH_PRIV(_pGlyph)                                     \</span>
+<a name="l00132"></a>00132 <span class="preprocessor">    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)</span>
+<a name="l00133"></a>00133 <span class="preprocessor"></span>
+<a name="l00134"></a>00134 <span class="preprocessor">#endif </span><span class="comment">/* DMXPICT_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html
index 8c6fc4551..68bbc807a 100644
--- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8c.html
@@ -6,226 +6,207 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxpixmap.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "pixmapstr.h"</code><br>
-<code>#include "servermd.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a0">dmxInitPixmap</a> (ScreenPtr pScreen)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxpixmap.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;pixmapstr.h&quot;</code><br/>
+<code>#include &quot;servermd.h&quot;</code><br/>
+<code>#include &quot;privates.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#aacf02a6e5ba85a356f09f66159e71a75">dmxInitPixmap</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#ab785500b50aa10eb1d76274688413770">dmxBECreatePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">PixmapPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#a9d26c08a4286c663250f61e63ffa3343">dmxCreatePixmap</a> (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#aa930f04f91d83243d3e6224f911bf9e8">dmxBEFreePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#a7c602d928744ec2e7be73ef197fc9b12">dmxDestroyPixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8c.html#af943d5ec32fe35ccc74ae190b8d8bb3e">dmxBitmapToRegion</a> (PixmapPtr pPixmap)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provides pixmap support. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ab785500b50aa10eb1d76274688413770"></a><!-- doxytag: member="dmxpixmap.c::dmxBECreatePixmap" ref="ab785500b50aa10eb1d76274688413770" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBECreatePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create a pixmap on the back-end server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a1">dmxBECreatePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>PixmapPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a2">dmxCreatePixmap</a> (ScreenPtr pScreen, int width, int height, int depth)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>, and <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a3">dmxBEFreePixmap</a> (PixmapPtr pPixmap)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa930f04f91d83243d3e6224f911bf9e8"></a><!-- doxytag: member="dmxpixmap.c::dmxBEFreePixmap" ref="aa930f04f91d83243d3e6224f911bf9e8" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEFreePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy the pixmap on the back-end server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a4">dmxDestroyPixmap</a> (PixmapPtr pPixmap)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8c.html#a5">dmxBitmapToRegion</a> (PixmapPtr pPixmap)</td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provides pixmap support.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxpixmap.c::dmxBECreatePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="af943d5ec32fe35ccc74ae190b8d8bb3e"></a><!-- doxytag: member="dmxpixmap.c::dmxBitmapToRegion" ref="af943d5ec32fe35ccc74ae190b8d8bb3e" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreatePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">RegionPtr dmxBitmapToRegion </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a pixmap on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxpixmap.c::dmxBEFreePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+</div>
+<div class="memdoc">
+<p>Create and return a region based on the pixmap pointed to by <em>pPixmap</em>. </p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the pixmap on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxpixmap.c::dmxBitmapToRegion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxBitmapToRegion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create and return a region based on the pixmap pointed to by <em>pPixmap</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxpixmap.c::dmxCreatePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d26c08a4286c663250f61e63ffa3343"></a><!-- doxytag: member="dmxpixmap.c::dmxCreatePixmap" ref="a9d26c08a4286c663250f61e63ffa3343" args="(ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> PixmapPtr dmxCreatePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">PixmapPtr dmxCreatePixmap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>depth</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>depth</em></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>usage_hint</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a pixmap for <em>pScreen</em> with the specified <em>width</em>, <em>height</em>, and <em>depth</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxpixmap.c::dmxDestroyPixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a pixmap for <em>pScreen</em> with the specified <em>width</em>, <em>height</em>, and <em>depth</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c602d928744ec2e7be73ef197fc9b12"></a><!-- doxytag: member="dmxpixmap.c::dmxDestroyPixmap" ref="a7c602d928744ec2e7be73ef197fc9b12" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyPixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxDestroyPixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy the pixmap pointed to by <em>pPixmap</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxpixmap.c::dmxInitPixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy the pixmap pointed to by <em>pPixmap</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf02a6e5ba85a356f09f66159e71a75"></a><!-- doxytag: member="dmxpixmap.c::dmxInitPixmap" ref="aacf02a6e5ba85a356f09f66159e71a75" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitPixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxInitPixmap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize a private area in <em>pScreen</em> for pixmap information.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Initialize a private area in <em>pScreen</em> for pixmap information. </p>
+
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00075">dmxPixPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html
deleted file mode 100644
index faa74a3e0..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h-source.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxpixmap.h</h1><a href="dmxpixmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXPIXMAP_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXPIXMAP_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "pixmapstr.h"</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__dmxPixPriv.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxPixPriv.html">_dmxPixPriv</a> {
-00045     Pixmap   pixmap;
-00046     XImage  *detachedImage;
-00047 } <a class="code" href="struct__dmxPixPriv.html">dmxPixPrivRec</a>, *<a class="code" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>;
-00048 
-00049 
-00050 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#a0">dmxInitPixmap</a>(ScreenPtr pScreen);
-00051 
-00052 <span class="keyword">extern</span> PixmapPtr <a class="code" href="dmxpixmap_8c.html#a2">dmxCreatePixmap</a>(ScreenPtr pScreen,
-00053                                  <span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height, <span class="keywordtype">int</span> depth);
-00054 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#a4">dmxDestroyPixmap</a>(PixmapPtr pPixmap);
-00055 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxpixmap_8c.html#a5">dmxBitmapToRegion</a>(PixmapPtr pPixmap);
-00056 
-00057 <span class="keyword">extern</span> <span class="keywordtype">void</span>      <a class="code" href="dmxpixmap_8c.html#a1">dmxBECreatePixmap</a>(PixmapPtr pPixmap);
-00058 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#a3">dmxBEFreePixmap</a>(PixmapPtr pPixmap);
-00059 
-<a name="l00061"></a><a class="code" href="dmxpixmap_8h.html#a3">00061</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxpixmap_8h.html#a3">dmxPixPrivateIndex</a>;
-00062 
-<a name="l00064"></a><a class="code" href="dmxpixmap_8h.html#a0">00064</a> <span class="preprocessor">#define DMX_GET_PIXMAP_PRIV(_pPix)                                      \</span>
-00065 <span class="preprocessor">    (dmxPixPrivPtr)(_pPix)-&gt;devPrivates[dmxPixPrivateIndex].ptr</span>
-00066 <span class="preprocessor"></span>
-00067 <span class="preprocessor">#endif </span><span class="comment">/* DMXPIXMAP_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html
index 27cc6a5da..8feb86bea 100644
--- a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h.html
@@ -6,337 +6,285 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxpixmap.h File Reference</h1><code>#include "pixmapstr.h"</code><br>
-
-<p>
-<a href="dmxpixmap_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a0">DMX_GET_PIXMAP_PRIV</a>(_pPix)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>)(_pPix)-&gt;devPrivates[<a class="el" href="dmxpixmap_8h.html#a3">dmxPixPrivateIndex</a>].ptr</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a1">dmxPixPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a2">dmxPixPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a4">dmxInitPixmap</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>PixmapPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a5">dmxCreatePixmap</a> (ScreenPtr pScreen, int width, int height, int depth)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a6">dmxDestroyPixmap</a> (PixmapPtr pPixmap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>RegionPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a7">dmxBitmapToRegion</a> (PixmapPtr pPixmap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a8">dmxBECreatePixmap</a> (PixmapPtr pPixmap)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a9">dmxBEFreePixmap</a> (PixmapPtr pPixmap)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxpixmap_8h.html#a3">dmxPixPrivateIndex</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxpixmap.h File Reference</h1><code>#include &quot;pixmapstr.h&quot;</code><br/>
 
+<p><a href="dmxpixmap_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#add8168a70114703a791f8d154d139e2a">DMX_GET_PIXMAP_PRIV</a>(_pPix)&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>)dixLookupPrivate(&amp;(_pPix)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a>)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#af881d895a7a1cac8c226aa3aff5678c7">dmxPixPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#a33d23370f4af28113332cd6112de22f1">dmxPixPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#aacf02a6e5ba85a356f09f66159e71a75">dmxInitPixmap</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">PixmapPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#a9d26c08a4286c663250f61e63ffa3343">dmxCreatePixmap</a> (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#a7c602d928744ec2e7be73ef197fc9b12">dmxDestroyPixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RegionPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#af943d5ec32fe35ccc74ae190b8d8bb3e">dmxBitmapToRegion</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#ab785500b50aa10eb1d76274688413770">dmxBECreatePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#aa930f04f91d83243d3e6224f911bf9e8">dmxBEFreePixmap</a> (PixmapPtr pPixmap)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxpixmap_8h.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for pixmap support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxpixmap_8c.html">dmxpixmap.c</a></dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxpixmap.h::DMX_GET_PIXMAP_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for pixmap support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxpixmap_8c.html">dmxpixmap.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="add8168a70114703a791f8d154d139e2a"></a><!-- doxytag: member="dmxpixmap.h::DMX_GET_PIXMAP_PRIV" ref="add8168a70114703a791f8d154d139e2a" args="(_pPix)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_PIXMAP_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pPix&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>)(_pPix)-&gt;devPrivates[<a class="el" href="dmxpixmap_8h.html#a3">dmxPixPrivateIndex</a>].ptr
+          <td class="memname">#define DMX_GET_PIXMAP_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pPix&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(<a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>)dixLookupPrivate(&amp;(_pPix)-&gt;devPrivates, <a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a>)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Get pixmap private pointer. </p>
 
-<p>
-Get pixmap private pointer.     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxpixmap.h::dmxPixPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a33d23370f4af28113332cd6112de22f1"></a><!-- doxytag: member="dmxpixmap.h::dmxPixPrivPtr" ref="a33d23370f4af28113332cd6112de22f1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a> * <a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a> * <a class="el" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Pixmap private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxpixmap.h::dmxPixPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="af881d895a7a1cac8c226aa3aff5678c7"></a><!-- doxytag: member="dmxpixmap.h::dmxPixPrivRec" ref="af881d895a7a1cac8c226aa3aff5678c7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>  <a class="el" href="struct__dmxPixPriv.html">dmxPixPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxPixPriv.html">_dmxPixPriv</a>  <a class="el" href="struct__dmxPixPriv.html">dmxPixPrivRec</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Pixmap private area. </p>
 
-<p>
-Pixmap private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxpixmap.h::dmxBECreatePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ab785500b50aa10eb1d76274688413770"></a><!-- doxytag: member="dmxpixmap.h::dmxBECreatePixmap" ref="ab785500b50aa10eb1d76274688413770" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECreatePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBECreatePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a pixmap on the back-end server. </p>
 
-<p>
-Create a pixmap on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxpixmap.h::dmxBEFreePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00856">dmxBECreateResources()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxextension_8c_source.html#l01062">dmxBERestoreRenderPict()</a>, and <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa930f04f91d83243d3e6224f911bf9e8"></a><!-- doxytag: member="dmxpixmap.h::dmxBEFreePixmap" ref="aa930f04f91d83243d3e6224f911bf9e8" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEFreePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxBEFreePixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy the pixmap on the back-end server. </p>
 
-<p>
-Destroy the pixmap on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxpixmap.h::dmxBitmapToRegion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01459">dmxBEDestroyResources()</a>, <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af943d5ec32fe35ccc74ae190b8d8bb3e"></a><!-- doxytag: member="dmxpixmap.h::dmxBitmapToRegion" ref="af943d5ec32fe35ccc74ae190b8d8bb3e" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> RegionPtr dmxBitmapToRegion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">RegionPtr dmxBitmapToRegion </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create and return a region based on the pixmap pointed to by <em>pPixmap</em>. </p>
 
-<p>
-Create and return a region based on the pixmap pointed to by <em>pPixmap</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxpixmap.h::dmxCreatePixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d26c08a4286c663250f61e63ffa3343"></a><!-- doxytag: member="dmxpixmap.h::dmxCreatePixmap" ref="a9d26c08a4286c663250f61e63ffa3343" args="(ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> PixmapPtr dmxCreatePixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">PixmapPtr dmxCreatePixmap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>depth</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>depth</em></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>usage_hint</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a pixmap for <em>pScreen</em> with the specified <em>width</em>, <em>height</em>, and <em>depth</em>. </p>
 
-<p>
-Create a pixmap for <em>pScreen</em> with the specified <em>width</em>, <em>height</em>, and <em>depth</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxpixmap.h::dmxDestroyPixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7c602d928744ec2e7be73ef197fc9b12"></a><!-- doxytag: member="dmxpixmap.h::dmxDestroyPixmap" ref="a7c602d928744ec2e7be73ef197fc9b12" args="(PixmapPtr pPixmap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyPixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">PixmapPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pPixmap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxDestroyPixmap </td>
+          <td>(</td>
+          <td class="paramtype">PixmapPtr&nbsp;</td>
+          <td class="paramname"> <em>pPixmap</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy the pixmap pointed to by <em>pPixmap</em>. </p>
 
-<p>
-Destroy the pixmap pointed to by <em>pPixmap</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxpixmap.h::dmxInitPixmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxpixmap_8h_source.html#l00045">_dmxPixPriv::detachedImage</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf02a6e5ba85a356f09f66159e71a75"></a><!-- doxytag: member="dmxpixmap.h::dmxInitPixmap" ref="aacf02a6e5ba85a356f09f66159e71a75" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitPixmap </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxInitPixmap </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize a private area in <em>pScreen</em> for pixmap information. </p>
 
-<p>
-Initialize a private area in <em>pScreen</em> for pixmap information.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxpixmap.h::dmxPixPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00075">dmxPixPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="af5bfb64208a18ade9f50196263c9d847"></a><!-- doxytag: member="dmxpixmap.h::dmxPixPrivateKey" ref="af5bfb64208a18ade9f50196263c9d847" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxpixmap_8h.html#a3">dmxPixPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Private index. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd>dmxpicmap.h </dd>
+<dd>
+<a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a></dd></dl>
+<p>Private index for Pixmaps </p>
 
-<p>
-Private index. <dl compact><dt><b>See also:</b></dt><dd>dmxpicmap.h <p>
-<a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
-    </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00050">dmxInitPixmap()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html
new file mode 100644
index 000000000..3911ae4a7
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxpixmap_8h_source.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxpixmap.h</h1><a href="dmxpixmap_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXPIXMAP_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXPIXMAP_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;pixmapstr.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__dmxPixPriv.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxPixPriv.html">_dmxPixPriv</a> {
+<a name="l00044"></a><a class="code" href="struct__dmxPixPriv.html#a7b3f9090169c50760c7a18e801091c2f">00044</a>     Pixmap   <a class="code" href="struct__dmxPixPriv.html#a7b3f9090169c50760c7a18e801091c2f">pixmap</a>;
+<a name="l00045"></a><a class="code" href="struct__dmxPixPriv.html#a54fab045a345e00ee75ab064ce38118e">00045</a>     XImage  *<a class="code" href="struct__dmxPixPriv.html#a54fab045a345e00ee75ab064ce38118e">detachedImage</a>;
+<a name="l00046"></a>00046 } <a class="code" href="struct__dmxPixPriv.html">dmxPixPrivRec</a>, *<a class="code" href="struct__dmxPixPriv.html">dmxPixPrivPtr</a>;
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048 
+<a name="l00049"></a>00049 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#aacf02a6e5ba85a356f09f66159e71a75">dmxInitPixmap</a>(ScreenPtr pScreen);
+<a name="l00050"></a>00050 
+<a name="l00051"></a>00051 <span class="keyword">extern</span> PixmapPtr <a class="code" href="dmxpixmap_8c.html#a9d26c08a4286c663250f61e63ffa3343">dmxCreatePixmap</a>(ScreenPtr pScreen,
+<a name="l00052"></a>00052                                  <span class="keywordtype">int</span> width, <span class="keywordtype">int</span> height, <span class="keywordtype">int</span> depth,
+<a name="l00053"></a>00053                                  <span class="keywordtype">unsigned</span> usage_hint);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#a7c602d928744ec2e7be73ef197fc9b12">dmxDestroyPixmap</a>(PixmapPtr pPixmap);
+<a name="l00055"></a>00055 <span class="keyword">extern</span> RegionPtr <a class="code" href="dmxpixmap_8c.html#af943d5ec32fe35ccc74ae190b8d8bb3e">dmxBitmapToRegion</a>(PixmapPtr pPixmap);
+<a name="l00056"></a>00056 
+<a name="l00057"></a>00057 <span class="keyword">extern</span> <span class="keywordtype">void</span>      <a class="code" href="dmxpixmap_8c.html#ab785500b50aa10eb1d76274688413770">dmxBECreatePixmap</a>(PixmapPtr pPixmap);
+<a name="l00058"></a>00058 <span class="keyword">extern</span> Bool      <a class="code" href="dmxpixmap_8c.html#aa930f04f91d83243d3e6224f911bf9e8">dmxBEFreePixmap</a>(PixmapPtr pPixmap);
+<a name="l00059"></a>00059 
+<a name="l00061"></a>00061 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxpixmap_8h.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a>;
+<a name="l00062"></a>00062 
+<a name="l00064"></a><a class="code" href="dmxpixmap_8h.html#add8168a70114703a791f8d154d139e2a">00064</a> <span class="preprocessor">#define DMX_GET_PIXMAP_PRIV(_pPix)                                      \</span>
+<a name="l00065"></a>00065 <span class="preprocessor">    (dmxPixPrivPtr)dixLookupPrivate(&amp;(_pPix)-&gt;devPrivates, dmxPixPrivateKey)</span>
+<a name="l00066"></a>00066 <span class="preprocessor"></span>
+<a name="l00067"></a>00067 <span class="preprocessor">#endif </span><span class="comment">/* DMXPIXMAP_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8c.html b/xorg-server/hw/dmx/doc/html/dmxprint_8c.html
index 9a439cf6b..d52dacec5 100644
--- a/xorg-server/hw/dmx/doc/html/dmxprint_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxprint_8c.html
@@ -6,105 +6,697 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxprint.c File Reference</h1><code>#include "<a class="el" href="dmxconfig_8h-source.html">dmxconfig.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprint_8h-source.html">dmxprint.h</a>"</code><br>
-<code>#include "parser.h"</code><br>
-<code>#include &lt;stdio.h&gt;</code><br>
-<code>#include &lt;stdarg.h&gt;</code><br>
-<code>#include &lt;ctype.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><b>stack</b></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprint_8c.html#a25">dmxConfigPrint</a> (FILE *stream, <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprint_8c.html#a26">dmxConfigVirtualPrint</a> (FILE *stream, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxprint.c File Reference</h1><code>#include &quot;<a class="el" href="dmxconfig_8h_source.html">dmxconfig.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprint_8h_source.html">dmxprint.h</a>&quot;</code><br/>
+<code>#include &quot;parser.h&quot;</code><br/>
+<code>#include &lt;stdio.h&gt;</code><br/>
+<code>#include &lt;stdarg.h&gt;</code><br/>
+<code>#include &lt;ctype.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstack.html">stack</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a28323a9b43eda57024b02a22c998b0e7">dmxConfigIndent</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a8e1ceb3caec6ac5eb7d05b18d13250be">dmxConfigNewline</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#acf88c97e19872aeccfceacb4782e15ec">dmxConfigPushState</a> (int base, int comment, int step)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#ac839095403e872d1a2c5c5bf1fb84d34">dmxConfigPushComment</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a640bd88024bf58bbc7613804eadc23ef">dmxConfigPushStep</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#acfbbca478338b0756a3a98db05c51a01">dmxConfigPopState</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a40c141ef8ec32df494f34b9ccb586652">dmxConfigOutput</a> (int addSpace, int doNewline, const char *comment, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#ad2f603ef56a4db866fcb63a8c78e977e">dmxConfigPrintComment</a> (<a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a0d3a4f6b21e174c7779cec1e7bc45458">dmxConfigPrintTokenFlag</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> p, int flag)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a7a5b3d510c5ee1e3e7aa12a84d243e77">dmxConfigPrintToken</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a39008636d8a4d4212908a608d17e4ea0">dmxConfigPrintTokenNopop</a> (<a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#ab7686b37f60596276e593fbc300e580a">dmxConfigPrintQuotedString</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a34972dd599132fc3dc322fa76ee60b8b">dmxConfigPrintString</a> (<a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> p, int quote)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a5aec7187f1c5bed538fc446cbb61cc63">dmxConfigPrintPair</a> (<a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> p, int addSpace)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a7379c323195ec85a062d1d7db2fa07e1">dmxConfigPrintDisplay</a> (<a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a18c2fc381c3949d8740d06691b8c49a8">dmxConfigPrintWall</a> (<a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a6daa4d844ef2d80e3adcc82dba79e34a">dmxConfigPrintOption</a> (<a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a68625f9e37aff73a2a4140662ddf8997">dmxConfigPrintParam</a> (<a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a4430af6fcc1433522052f4577c3ad0f8">dmxConfigPrintSub</a> (<a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a7f0c5119c35d7d20337b9a772f5761b7">dmxConfigPrintVirtual</a> (<a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#aeebcf1d84e771f9d64413521173d366a">dmxConfigPrint</a> (FILE *stream, <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#ae0a45c7fe5f9f4afb7e68856253350be">dmxConfigVirtualPrint</a> (FILE *stream, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static FILE *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a> = NULL</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a913a30aaae68bab9c263fd5208679335">indent</a> = 0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a1910d262855b71da353ed0d07a6c7823">pos</a> = 0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static struct <a class="el" href="structstack.html">stack</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8c.html#a32dfc14ba99dbdf0241b5e2e42553fec">initialStack</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support routines and helper functions to be used to pretty-print DMX configurations.<p>
-Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a25" doxytag="dmxprint.c::dmxConfigPrint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support routines and helper functions to be used to pretty-print DMX configurations.</p>
+<p>Because the DMX configuration file parsing should be capable of being used in a stand-alone fashion (i.e., independent from the DMX server source tree), no dependencies on other DMX routines are made. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a28323a9b43eda57024b02a22c998b0e7"></a><!-- doxytag: member="dmxprint.c::dmxConfigIndent" ref="a28323a9b43eda57024b02a22c998b0e7" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigIndent </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00056">indent</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8e1ceb3caec6ac5eb7d05b18d13250be"></a><!-- doxytag: member="dmxprint.c::dmxConfigNewline" ref="a8e1ceb3caec6ac5eb7d05b18d13250be" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigNewline </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="dmxprint_8c_source.html#l00082">dmxConfigPushState()</a>, and <a class="el" href="dmxprint_8c_source.html#l00446">dmxConfigVirtualPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a40c141ef8ec32df494f34b9ccb586652"></a><!-- doxytag: member="dmxprint.c::dmxConfigOutput" ref="a40c141ef8ec32df494f34b9ccb586652" args="(int addSpace, int doNewline, const char *comment, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigOutput </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>addSpace</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>doNewline</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigPrint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stream</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>entry</em></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00068">dmxConfigIndent()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00094">dmxConfigPushComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00141">dmxConfigPrintComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, and <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="acfbbca478338b0756a3a98db05c51a01"></a><!-- doxytag: member="dmxprint.c::dmxConfigPopState" ref="acfbbca478338b0756a3a98db05c51a01" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPopState </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The configuration information in <em>entry</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxprint.c::dmxConfigVirtualPrint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00062">stack::base</a>, <a class="el" href="dmxparse_8c_source.html#l00099">dmxConfigFree()</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00056">indent</a>, and <a class="el" href="dmxprint_8c_source.html#l00065">stack::next</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aeebcf1d84e771f9d64413521173d366a"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrint" ref="aeebcf1d84e771f9d64413521173d366a" args="(FILE *stream, DMXConfigEntryPtr entry)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigPrint </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>stream</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>entry</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>The configuration information in <em>entry</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used. </p>
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00141">dmxConfigPrintComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>, <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, <a class="el" href="dmxprint_8c_source.html#l00055">str</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00424">dmxConfigWriteFile()</a>, and <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad2f603ef56a4db866fcb63a8c78e977e"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintComment" ref="ad2f603ef56a4db866fcb63a8c78e977e" args="(DMXConfigCommentPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintComment </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00081">_DMXConfigComment::comment</a>, and <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7379c323195ec85a062d1d7db2fa07e1"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintDisplay" ref="a7379c323195ec85a062d1d7db2fa07e1" args="(DMXConfigDisplayPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00095">_DMXConfigPartDim::dim</a>, <a class="el" href="dmxparse_8h_source.html#l00123">_DMXConfigDisplay::dim</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00122">_DMXConfigDisplay::dname</a>, <a class="el" href="dmxparse_8h_source.html#l00125">_DMXConfigDisplay::end</a>, <a class="el" href="dmxparse_8h_source.html#l00108">_DMXConfigDisplay::name</a>, <a class="el" href="dmxparse_8h_source.html#l00096">_DMXConfigPartDim::offset</a>, <a class="el" href="dmxparse_8h_source.html#l00124">_DMXConfigDisplay::origin</a>, <a class="el" href="dmxparse_8h_source.html#l00102">_DMXConfigFullDim::root</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00114">_DMXConfigDisplay::rootWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootX</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootXOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootXSign</a>, <a class="el" href="dmxparse_8h_source.html#l00115">_DMXConfigDisplay::rootY</a>, <a class="el" href="dmxparse_8h_source.html#l00118">_DMXConfigDisplay::rootYOrigin</a>, <a class="el" href="dmxparse_8h_source.html#l00116">_DMXConfigDisplay::rootYSign</a>, <a class="el" href="dmxparse_8h_source.html#l00101">_DMXConfigFullDim::scrn</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnHeight</a>, <a class="el" href="dmxparse_8h_source.html#l00110">_DMXConfigDisplay::scrnWidth</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnX</a>, <a class="el" href="dmxparse_8h_source.html#l00111">_DMXConfigDisplay::scrnY</a>, <a class="el" href="dmxparse_8h_source.html#l00121">_DMXConfigDisplay::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6daa4d844ef2d80e3adcc82dba79e34a"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintOption" ref="a6daa4d844ef2d80e3adcc82dba79e34a" args="(DMXConfigOptionPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintOption </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00151">_DMXConfigOption::end</a>, <a class="el" href="dmxparse_8h_source.html#l00149">_DMXConfigOption::start</a>, <a class="el" href="dmxparse_8h_source.html#l00146">_DMXConfigOption::string</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5aec7187f1c5bed538fc446cbb61cc63"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintPair" ref="a5aec7187f1c5bed538fc446cbb61cc63" args="(DMXConfigPairPtr p, int addSpace)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigVirtualPrint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stream</em>, </td>
+          <td class="memname">static int dmxConfigPrintPair </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>addSpace</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00070">_DMXConfigPair::comment</a>, <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxparse_8h_source.html#l00068">_DMXConfigPair::token</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, <a class="el" href="dmxparse_8h_source.html#l00073">_DMXConfigPair::xsign</a>, <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>, and <a class="el" href="dmxparse_8h_source.html#l00074">_DMXConfigPair::ysign</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a68625f9e37aff73a2a4140662ddf8997"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintParam" ref="a68625f9e37aff73a2a4140662ddf8997" args="(DMXConfigParamPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintParam </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00162">_DMXConfigParam::close</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, <a class="el" href="dmxprint_8c_source.html#l00195">dmxConfigPrintTokenNopop()</a>, <a class="el" href="dmxparse_8h_source.html#l00163">_DMXConfigParam::end</a>, <a class="el" href="dmxparse_8h_source.html#l00164">_DMXConfigParam::next</a>, <a class="el" href="dmxparse_8h_source.html#l00160">_DMXConfigParam::open</a>, <a class="el" href="dmxparse_8h_source.html#l00161">_DMXConfigParam::param</a>, and <a class="el" href="dmxparse_8h_source.html#l00159">_DMXConfigParam::start</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab7686b37f60596276e593fbc300e580a"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintQuotedString" ref="ab7686b37f60596276e593fbc300e580a" args="(const char *s)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxConfigPrintQuotedString </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a34972dd599132fc3dc322fa76ee60b8b"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintString" ref="a34972dd599132fc3dc322fa76ee60b8b" args="(DMXConfigStringPtr p, int quote)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintString </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>quote</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00053">_DMXConfigString::comment</a>, <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxprint_8c_source.html#l00200">dmxConfigPrintQuotedString()</a>, <a class="el" href="dmxparse_8h_source.html#l00055">_DMXConfigString::next</a>, and <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>, <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a4430af6fcc1433522052f4577c3ad0f8"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintSub" ref="a4430af6fcc1433522052f4577c3ad0f8" args="(DMXConfigSubPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintSub </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The configuration information in <em>p</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00170">_DMXConfigSub::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00171">_DMXConfigSub::display</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8h_source.html#l00087">dmxConfigDisplay</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxparse_8h_source.html#l00089">dmxConfigOption</a>, <a class="el" href="dmxparse_8h_source.html#l00090">dmxConfigParam</a>, <a class="el" href="dmxprint_8c_source.html#l00141">dmxConfigPrintComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>, <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>, <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>, <a class="el" href="dmxparse_8h_source.html#l00088">dmxConfigWall</a>, <a class="el" href="dmxparse_8h_source.html#l00175">_DMXConfigSub::next</a>, <a class="el" href="dmxparse_8h_source.html#l00173">_DMXConfigSub::option</a>, <a class="el" href="dmxparse_8h_source.html#l00174">_DMXConfigSub::param</a>, <a class="el" href="dmxparse_8h_source.html#l00169">_DMXConfigSub::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00172">_DMXConfigSub::wall</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7a5b3d510c5ee1e3e7aa12a84d243e77"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintToken" ref="a7a5b3d510c5ee1e3e7aa12a84d243e77" args="(DMXConfigTokenPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintToken </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>, <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0d3a4f6b21e174c7779cec1e7bc45458"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintTokenFlag" ref="a0d3a4f6b21e174c7779cec1e7bc45458" args="(DMXConfigTokenPtr p, int flag)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintTokenFlag </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>flag</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00046">_DMXConfigToken::comment</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>, <a class="el" href="dmxprint_8c_source.html#l00082">dmxConfigPushState()</a>, <a class="el" href="dmxprint_8c_source.html#l00099">dmxConfigPushStep()</a>, <a class="el" href="dmxparse_8h_source.html#l00045">_DMXConfigToken::line</a>, and <a class="el" href="dmxparse_8h_source.html#l00044">_DMXConfigToken::token</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, and <a class="el" href="dmxprint_8c_source.html#l00195">dmxConfigPrintTokenNopop()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a39008636d8a4d4212908a608d17e4ea0"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintTokenNopop" ref="a39008636d8a4d4212908a608d17e4ea0" args="(DMXConfigTokenPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintTokenNopop </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7f0c5119c35d7d20337b9a772f5761b7"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintVirtual" ref="a7f0c5119c35d7d20337b9a772f5761b7" args="(DMXConfigVirtualPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintVirtual </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00190">_DMXConfigVirtual::close</a>, <a class="el" href="dmxparse_8h_source.html#l00187">_DMXConfigVirtual::dim</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>, <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::height</a>, <a class="el" href="dmxparse_8h_source.html#l00181">_DMXConfigVirtual::name</a>, <a class="el" href="dmxparse_8h_source.html#l00188">_DMXConfigVirtual::open</a>, <a class="el" href="dmxparse_8h_source.html#l00185">_DMXConfigVirtual::start</a>, <a class="el" href="dmxparse_8h_source.html#l00054">_DMXConfigString::string</a>, <a class="el" href="dmxparse_8h_source.html#l00189">_DMXConfigVirtual::subentry</a>, <a class="el" href="dmxparse_8h_source.html#l00186">_DMXConfigVirtual::vname</a>, <a class="el" href="dmxparse_8h_source.html#l00182">_DMXConfigVirtual::width</a>, <a class="el" href="dmxparse_8h_source.html#l00071">_DMXConfigPair::x</a>, and <a class="el" href="dmxparse_8h_source.html#l00072">_DMXConfigPair::y</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, and <a class="el" href="dmxprint_8c_source.html#l00446">dmxConfigVirtualPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a18c2fc381c3949d8740d06691b8c49a8"></a><!-- doxytag: member="dmxprint.c::dmxConfigPrintWall" ref="a18c2fc381c3949d8740d06691b8c49a8" args="(DMXConfigWallPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPrintWall </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8h_source.html#l00138">_DMXConfigWall::displayDim</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, <a class="el" href="dmxprint_8c_source.html#l00190">dmxConfigPrintToken()</a>, <a class="el" href="dmxparse_8h_source.html#l00140">_DMXConfigWall::end</a>, <a class="el" href="dmxparse_8h_source.html#l00139">_DMXConfigWall::nameList</a>, <a class="el" href="dmxparse_8h_source.html#l00136">_DMXConfigWall::start</a>, and <a class="el" href="dmxparse_8h_source.html#l00137">_DMXConfigWall::wallDim</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac839095403e872d1a2c5c5bf1fb84d34"></a><!-- doxytag: member="dmxprint.c::dmxConfigPushComment" ref="ac839095403e872d1a2c5c5bf1fb84d34" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPushComment </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00056">indent</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acf88c97e19872aeccfceacb4782e15ec"></a><!-- doxytag: member="dmxprint.c::dmxConfigPushState" ref="acf88c97e19872aeccfceacb4782e15ec" args="(int base, int comment, int step)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPushState </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>base</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>comment</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>step</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxparse_8c_source.html#l00066">dmxConfigAlloc()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, and <a class="el" href="dmxprint_8c_source.html#l00056">indent</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a640bd88024bf58bbc7613804eadc23ef"></a><!-- doxytag: member="dmxprint.c::dmxConfigPushStep" ref="a640bd88024bf58bbc7613804eadc23ef" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxConfigPushStep </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00056">indent</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0a45c7fe5f9f4afb7e68856253350be"></a><!-- doxytag: member="dmxprint.c::dmxConfigVirtualPrint" ref="ae0a45c7fe5f9f4afb7e68856253350be" args="(FILE *stream, DMXConfigVirtualPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxConfigVirtualPrint </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>stream</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>The configuration information in <em>p</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used. </p>
+
+<p>References <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00391">dmxConfigReadFile()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00324">dmxConfigSelectCallback()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a913a30aaae68bab9c263fd5208679335"></a><!-- doxytag: member="dmxprint.c::indent" ref="a913a30aaae68bab9c263fd5208679335" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxprint_8c.html#a913a30aaae68bab9c263fd5208679335">indent</a> = 0<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00068">dmxConfigIndent()</a>, <a class="el" href="dmxprint_8c_source.html#l00104">dmxConfigPopState()</a>, <a class="el" href="dmxprint_8c_source.html#l00094">dmxConfigPushComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00082">dmxConfigPushState()</a>, and <a class="el" href="dmxprint_8c_source.html#l00099">dmxConfigPushStep()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a32dfc14ba99dbdf0241b5e2e42553fec"></a><!-- doxytag: member="dmxprint.c::initialStack" ref="a32dfc14ba99dbdf0241b5e2e42553fec" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="structstack.html">stack</a>  <a class="el" href="dmxprint_8c.html#a32dfc14ba99dbdf0241b5e2e42553fec">initialStack</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1910d262855b71da353ed0d07a6c7823"></a><!-- doxytag: member="dmxprint.c::pos" ref="a1910d262855b71da353ed0d07a6c7823" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxprint_8c.html#a1910d262855b71da353ed0d07a6c7823">pos</a> = 0<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, and <a class="el" href="dmxprint_8c_source.html#l00446">dmxConfigVirtualPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a41b4e3023940f8a5c705ea2863f2cd09"></a><!-- doxytag: member="dmxprint.c::str" ref="a41b4e3023940f8a5c705ea2863f2cd09" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">FILE* <a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a> = NULL<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxprint_8c_source.html#l00068">dmxConfigIndent()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00116">dmxConfigOutput()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="dmxconfig_8c_source.html#l00150">dmxConfigReadFile()</a>, <a class="el" href="dmxprint_8c_source.html#l00446">dmxConfigVirtualPrint()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00424">dmxConfigWriteFile()</a>, <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>, and <a class="el" href="vdltodmx_8c_source.html#l00039">main()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html
deleted file mode 100644
index c1a0d4edb..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxprint_8h-source.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxprint.h</h1><a href="dmxprint_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXPRINT_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPRINT_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keywordtype">void</span> <a class="code" href="dmxprint_8c.html#a25">dmxConfigPrint</a>(FILE *str, <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry);
-00042 <span class="keywordtype">void</span> <a class="code" href="dmxprint_8c.html#a26">dmxConfigVirtualPrint</a>(FILE *str, <a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p);
-00043 
-00044 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h.html
index c12085c7b..ea6c15cb9 100644
--- a/xorg-server/hw/dmx/doc/html/dmxprint_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxprint_8h.html
@@ -6,97 +6,99 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxprint.h File Reference</h1>
-<p>
-<a href="dmxprint_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprint_8h.html#a0">dmxConfigPrint</a> (FILE *str, <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprint_8h.html#a1">dmxConfigVirtualPrint</a> (FILE *str, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p)</td></tr>
-
+<p><a href="dmxprint_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8h.html#a1b8d004f3374959e5851689e058f8133">dmxConfigPrint</a> (FILE *<a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a>, <a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprint_8h.html#aa41675fce5582dbfb44d7094b94efab9">dmxConfigVirtualPrint</a> (FILE *<a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a>, <a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to DMX configuration file pretty-printer. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxprint_8c.html">dmxprint.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxprint.h::dmxConfigPrint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to DMX configuration file pretty-printer. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxprint_8c.html">dmxprint.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a1b8d004f3374959e5851689e058f8133"></a><!-- doxytag: member="dmxprint.h::dmxConfigPrint" ref="a1b8d004f3374959e5851689e058f8133" args="(FILE *str, DMXConfigEntryPtr entry)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigPrint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stream</em>, </td>
+          <td class="memname">void dmxConfigPrint </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>stream</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>entry</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>entry</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>The configuration information in <em>entry</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used. </p>
 
-<p>
-The configuration information in <em>entry</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxprint.h::dmxConfigVirtualPrint" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxparse_8h_source.html#l00196">_DMXConfigEntry::comment</a>, <a class="el" href="dmxparse_8h_source.html#l00085">dmxConfigComment</a>, <a class="el" href="dmxparse_8c_source.html#l00055">dmxConfigLog()</a>, <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00141">dmxConfigPrintComment()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, <a class="el" href="dmxparse_8h_source.html#l00086">dmxConfigVirtual</a>, <a class="el" href="dmxparse_8h_source.html#l00198">_DMXConfigEntry::next</a>, <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, <a class="el" href="dmxprint_8c_source.html#l00055">str</a>, <a class="el" href="dmxparse_8h_source.html#l00195">_DMXConfigEntry::type</a>, and <a class="el" href="dmxparse_8h_source.html#l00197">_DMXConfigEntry::virtual</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00424">dmxConfigWriteFile()</a>, and <a class="el" href="dmxtodmx_8c_source.html#l00043">main()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa41675fce5582dbfb44d7094b94efab9"></a><!-- doxytag: member="dmxprint.h::dmxConfigVirtualPrint" ref="aa41675fce5582dbfb44d7094b94efab9" args="(FILE *str, DMXConfigVirtualPtr p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxConfigVirtualPrint </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stream</em>, </td>
+          <td class="memname">void dmxConfigVirtualPrint </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>stream</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>p</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>The configuration information in <em>p</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used. </p>
 
-<p>
-The configuration information in <em>p</em> will be pretty-printed to the <em>stream</em>. If <em>stream</em> is NULL, then stdout will be used.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxprint_8c_source.html#l00076">dmxConfigNewline()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, <a class="el" href="dmxprint_8c_source.html#l00057">pos</a>, and <a class="el" href="dmxprint_8c_source.html#l00055">str</a>.</p>
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00391">dmxConfigReadFile()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00324">dmxConfigSelectCallback()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html
new file mode 100644
index 000000000..a4b25b8e6
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxprint_8h_source.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxprint.h</h1><a href="dmxprint_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXPRINT_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPRINT_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keywordtype">void</span> <a class="code" href="dmxprint_8c.html#aeebcf1d84e771f9d64413521173d366a">dmxConfigPrint</a>(FILE *<a class="code" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a>, <a class="code" href="struct__DMXConfigEntry.html">DMXConfigEntryPtr</a> entry);
+<a name="l00041"></a>00041 <span class="keywordtype">void</span> <a class="code" href="dmxprint_8c.html#ae0a45c7fe5f9f4afb7e68856253350be">dmxConfigVirtualPrint</a>(FILE *<a class="code" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">str</a>, <a class="code" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> p);
+<a name="l00042"></a>00042 
+<a name="l00043"></a>00043 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8c.html b/xorg-server/hw/dmx/doc/html/dmxprop_8c.html
index 6fa746b53..7bb916b5f 100644
--- a/xorg-server/hw/dmx/doc/html/dmxprop_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxprop_8c.html
@@ -6,221 +6,332 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxprop.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a0">DMX_ATOMNAME</a>&nbsp;&nbsp;&nbsp;"DMX_NAME"</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a1">DMX_IDENT</a>&nbsp;&nbsp;&nbsp;"Xdmx"</td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a5">dmxPropertyIterate</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start, void *(*f)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *), void *closure)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxprop.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#aa5cb343dc33f4f7e12652ca1298a2ed8">DMX_ATOMNAME</a>&nbsp;&nbsp;&nbsp;&quot;DMX_NAME&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a15bb16a878f80c6c8a7aec68aadf3444">DMX_IDENT</a>&nbsp;&nbsp;&nbsp;&quot;Xdmx&quot;</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a45eb0051c6d317735f2bf3b64ddc43e1">dmxPropertyErrorHandler</a> (Display *dpy, XErrorEvent *ev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static const unsigned char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a5393154b62783c7ff9cb657acbf73cca">dmxPropertyIdentifier</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a1353800f90c3a1f46d453caa71a41ab6">dmxPropertyIterate</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start, void *(*f)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *), void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#ab3eb5317487025c8ba44312f16d675f7">dmxPropertyCheckOtherServers</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Atom atom)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a5e976d40a4af5d6cd99b69ead01d0dfb">dmxPropertyCheckOtherWindows</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Atom atom)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#a97a10defd6ace86dae6cf8c8765bf0de">dmxPropertyDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#ad0a551002589f00b2bac2b081283bc83">dmxPropertySameDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *name)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#aa97527eeaaf0744a67a5c5d188daf8c2">dmxPropertyWindow</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>It is possible for one of the DMX "backend displays" to actually be smaller than the dimensions of the backend X server. Therefore, it is possible for more than one of the DMX "backend displays" to be physically located on the same backend X server. This situation must be detected so that cursor motion can be handled in an expected fashion.</p>
+<p>We could analyze the names used for the DMX "backend displays" (e.g., the names passed to the -display command-line parameter), but there are many possible names for a single X display, and failing to detect sameness leads to very unexpected results. Therefore, whenever the DMX server opens a window on a backend X server, a property value is queried and set on that backend to detect when another window is already open on that server.</p>
+<p>Further, it is possible that two different DMX server instantiations both have windows on the same physical backend X server. This case is also detected so that pointer input is not taken from that particular backend X server.</p>
+<p>The routines in this file handle the property management. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="aa5cb343dc33f4f7e12652ca1298a2ed8"></a><!-- doxytag: member="dmxprop.c::DMX_ATOMNAME" ref="aa5cb343dc33f4f7e12652ca1298a2ed8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_ATOMNAME&nbsp;&nbsp;&nbsp;&quot;DMX_NAME&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Holds the window id of all DMX windows on the backend X server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a8">dmxPropertyDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, and <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a9">dmxPropertySameDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *name)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a15bb16a878f80c6c8a7aec68aadf3444"></a><!-- doxytag: member="dmxprop.c::DMX_IDENT" ref="a15bb16a878f80c6c8a7aec68aadf3444" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_IDENT&nbsp;&nbsp;&nbsp;&quot;Xdmx&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>The identification string of this DMX server </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8c.html#a10">dmxPropertyWindow</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, and <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-It is possible for one of the DMX "backend displays" to actually be smaller than the dimensions of the backend X server. Therefore, it is possible for more than one of the DMX "backend displays" to be physically located on the same backend X server. This situation must be detected so that cursor motion can be handled in an expected fashion.<p>
-We could analyze the names used for the DMX "backend displays" (e.g., the names passed to the -display command-line parameter), but there are many possible names for a single X display, and failing to detect sameness leads to very unexpected results. Therefore, whenever the DMX server opens a window on a backend X server, a property value is queried and set on that backend to detect when another window is already open on that server.<p>
-Further, it is possible that two different DMX server instantiations both have windows on the same physical backend X server. This case is also detected so that pointer input is not taken from that particular backend X server.<p>
-The routines in this file handle the property management.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxprop.c::DMX_ATOMNAME" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_ATOMNAME&nbsp;&nbsp;&nbsp;"DMX_NAME"
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Holds the window id of all DMX windows on the backend X server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxprop.c::DMX_IDENT" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ab3eb5317487025c8ba44312f16d675f7"></a><!-- doxytag: member="dmxprop.c::dmxPropertyCheckOtherServers" ref="ab3eb5317487025c8ba44312f16d675f7" args="(DMXScreenInfo *dmxScreen, Atom atom)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_IDENT&nbsp;&nbsp;&nbsp;"Xdmx"
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The identification string of this DMX server     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8" doxytag="dmxprop.c::dmxPropertyDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="memname">static int dmxPropertyCheckOtherServers </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPropertyDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Atom&nbsp;</td>
+          <td class="paramname"> <em>atom</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns 0 if this is the only Xdmx session on the display; 1 otherwise.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxprop.c::dmxPropertyIterate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Returns 0 if this is the only Xdmx session on the display; 1 otherwise. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00070">DMX_IDENT</a>, <a class="el" href="dmxlog_8c_source.html#l00183">dmxLogOutput()</a>, <a class="el" href="dmxlog_8c_source.html#l00207">dmxLogOutputWarning()</a>, <a class="el" href="dmxprop_8c_source.html#l00074">dmxPropertyErrorHandler()</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5e976d40a4af5d6cd99b69ead01d0dfb"></a><!-- doxytag: member="dmxprop.c::dmxPropertyCheckOtherWindows" ref="a5e976d40a4af5d6cd99b69ead01d0dfb" args="(DMXScreenInfo *dmxScreen, Atom atom)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void* dmxPropertyIterate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="memname">static <a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* dmxPropertyCheckOtherWindows </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">Atom&nbsp;</td>
+          <td class="paramname"> <em>atom</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>void *(*&nbsp;</td>
-          <td class="mdname" nowrap> <em>f</em>)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *), </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns NULL if this is the only Xdmx window on the display. Otherwise, returns a pointer to the dmxScreen of the other windows on the display. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxprop_8c_source.html#l00074">dmxPropertyErrorHandler()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a97a10defd6ace86dae6cf8c8765bf0de"></a><!-- doxytag: member="dmxprop.c::dmxPropertyDisplay" ref="a97a10defd6ace86dae6cf8c8765bf0de" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int dmxPropertyDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns 0 if this is the only Xdmx session on the display; 1 otherwise. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, and <a class="el" href="dmx_8h_source.html#l00158">_DMXScreenInfo::shared</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a45eb0051c6d317735f2bf3b64ddc43e1"></a><!-- doxytag: member="dmxprop.c::dmxPropertyErrorHandler" ref="a45eb0051c6d317735f2bf3b64ddc43e1" args="(Display *dpy, XErrorEvent *ev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int dmxPropertyErrorHandler </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>closure</em></td>
+          <td class="paramtype">XErrorEvent *&nbsp;</td>
+          <td class="paramname"> <em>ev</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, and <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5393154b62783c7ff9cb657acbf73cca"></a><!-- doxytag: member="dmxprop.c::dmxPropertyIdentifier" ref="a5393154b62783c7ff9cb657acbf73cca" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static const unsigned char* dmxPropertyIdentifier </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Starting with the <em>start</em> screen, iterate over all of the screens on the same physical X server as <em>start</em>, calling <em>f</em> with the screen and the <em>closure</em>. (The common case is that <em>start</em> is the only DMX window on the backend X server.)     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxprop.c::dmxPropertySameDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a>, and <a class="el" href="dmxprop_8c_source.html#l00070">DMX_IDENT</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>, and <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1353800f90c3a1f46d453caa71a41ab6"></a><!-- doxytag: member="dmxprop.c::dmxPropertyIterate" ref="a1353800f90c3a1f46d453caa71a41ab6" args="(DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *), void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPropertySameDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void* dmxPropertyIterate </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">void *(*)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *)&nbsp;</td>
+          <td class="paramname"> <em>f</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Starting with the <em>start</em> screen, iterate over all of the screens on the same physical X server as <em>start</em>, calling <em>f</em> with the screen and the <em>closure</em>. (The common case is that <em>start</em> is the only DMX window on the backend X server.) </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, and <a class="el" href="dmx_8h_source.html#l00136">_DMXScreenInfo::next</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00206">dmxBackendFindWindow()</a>, <a class="el" href="dmxbackend_8c_source.html#l00177">dmxBackendGetEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>, <a class="el" href="dmxcommon_8c_source.html#l00504">dmxCommonMouOff()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad0a551002589f00b2bac2b081283bc83"></a><!-- doxytag: member="dmxprop.c::dmxPropertySameDisplay" ref="ad0a551002589f00b2bac2b081283bc83" args="(DMXScreenInfo *dmxScreen, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxPropertySameDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Returns 1 if the dmxScreen and the display in <em>name</em> are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxprop.c::dmxPropertyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Returns 1 if the dmxScreen and the display in <em>name</em> are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs). </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa97527eeaaf0744a67a5c5d188daf8c2"></a><!-- doxytag: member="dmxprop.c::dmxPropertyWindow" ref="aa97527eeaaf0744a67a5c5d188daf8c2" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPropertyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxPropertyWindow </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Prints a log message if <em>dmxScreen</em> is on the same backend X server as some other DMX backend (output) screen. Modifies the property (<a class="el" href="dmxprop_8c.html#aa5cb343dc33f4f7e12652ca1298a2ed8">DMX_ATOMNAME</a>) on the backend X server to reflect the creation of <em>dmxScreen</em>.</p>
+<p>The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).</p>
+<p>This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):</p>
+<p>"#DMX_IDENT:&lt;hostname running DMX&gt;:&lt;display name of DMX&gt;,&lt;screen number&gt;" </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00136">_DMXScreenInfo::next</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ac49dfab9200d48f835ce64819c4fc878"></a><!-- doxytag: member="dmxprop.c::display" ref="ac49dfab9200d48f835ce64819c4fc878" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">display</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Prints a log message if <em>dmxScreen</em> is on the same backend X server as some other DMX backend (output) screen. Modifies the property (<a class="el" href="dmxprop_8c.html#a0">DMX_ATOMNAME</a>) on the backend X server to reflect the creation of <em>dmxScreen</em>.<p>
-The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).<p>
-This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):<p>
-"#DMX_IDENT:&lt;hostname running DMX&gt;:&lt;display name of DMX&gt;,&lt;screen number&gt;"     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00496">dmxConfigCanvasInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, and <a class="el" href="dmxcompat_8c_source.html#l00111">dmxVDLRead()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html
deleted file mode 100644
index a623a3b95..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxprop_8h-source.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxprop.h</h1><a href="dmxprop_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXPROP_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPROP_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxprop_8c.html#a8">dmxPropertyDisplay</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxprop_8c.html#a10">dmxPropertyWindow</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> *<a class="code" href="dmxprop_8c.html#a5">dmxPropertyIterate</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start,
-00043                                 <span class="keywordtype">void</span> *(*f)(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen,
-00044                                            <span class="keywordtype">void</span> *closure),
-00045                                 <span class="keywordtype">void</span> *closure);
-00046 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxprop_8c.html#a9">dmxPropertySameDisplay</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *name);
-00047 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h.html
index bc8210b47..c26888a1e 100644
--- a/xorg-server/hw/dmx/doc/html/dmxprop_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxprop_8h.html
@@ -6,122 +6,151 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxprop.h File Reference</h1>
-<p>
-<a href="dmxprop_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8h.html#a0">dmxPropertyDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8h.html#a1">dmxPropertyWindow</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxprop_8h.html#a3">dmxPropertySameDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const  char *name)</td></tr>
-
+<p><a href="dmxprop_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8h.html#a97a10defd6ace86dae6cf8c8765bf0de">dmxPropertyDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8h.html#aa97527eeaaf0744a67a5c5d188daf8c2">dmxPropertyWindow</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8h.html#a4c53640b27c787d65539555cc3bf3c57">dmxPropertyIterate</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start, void *(*f)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure), void *closure)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxprop_8h.html#ad0a551002589f00b2bac2b081283bc83">dmxPropertySameDisplay</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, const char *name)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for property support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxprop_8c.html">dmxprop.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxprop.h::dmxPropertyDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for property support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxprop_8c.html">dmxprop.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a97a10defd6ace86dae6cf8c8765bf0de"></a><!-- doxytag: member="dmxprop.h::dmxPropertyDisplay" ref="a97a10defd6ace86dae6cf8c8765bf0de" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPropertyDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int dmxPropertyDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Returns 0 if this is the only Xdmx session on the display; 1 otherwise. </p>
 
-<p>
-Returns 0 if this is the only Xdmx session on the display; 1 otherwise.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxprop.h::dmxPropertySameDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, and <a class="el" href="dmx_8h_source.html#l00158">_DMXScreenInfo::shared</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4c53640b27c787d65539555cc3bf3c57"></a><!-- doxytag: member="dmxprop.h::dmxPropertyIterate" ref="a4c53640b27c787d65539555cc3bf3c57" args="(DMXScreenInfo *start, void *(*f)(DMXScreenInfo *dmxScreen, void *closure), void *closure)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int dmxPropertySameDisplay </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void* dmxPropertyIterate </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">void *(*)(<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, void *closure)&nbsp;</td>
+          <td class="paramname"> <em>f</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>closure</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Returns 1 if the dmxScreen and the display in <em>name</em> are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxprop.h::dmxPropertyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ad0a551002589f00b2bac2b081283bc83"></a><!-- doxytag: member="dmxprop.h::dmxPropertySameDisplay" ref="ad0a551002589f00b2bac2b081283bc83" args="(DMXScreenInfo *dmxScreen, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int dmxPropertySameDisplay </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPropertyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Returns 1 if the dmxScreen and the display in <em>name</em> are on the same display, or 0 otherwise. We can't just compare the display names because there can be multiple synonyms for the same display, some of which cannot be determined without accessing the display itself (e.g., domain aliases or machines with multiple NICs). </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, and <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aa97527eeaaf0744a67a5c5d188daf8c2"></a><!-- doxytag: member="dmxprop.h::dmxPropertyWindow" ref="aa97527eeaaf0744a67a5c5d188daf8c2" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxPropertyWindow </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Prints a log message if <em>dmxScreen</em> is on the same backend X server as some other DMX backend (output) screen. Modifies the property (<a class="el" href="dmxprop_8c.html#aa5cb343dc33f4f7e12652ca1298a2ed8">DMX_ATOMNAME</a>) on the backend X server to reflect the creation of <em>dmxScreen</em>.</p>
+<p>The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).</p>
+<p>This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):</p>
+<p>"#DMX_IDENT:&lt;hostname running DMX&gt;:&lt;display name of DMX&gt;,&lt;screen number&gt;" </p>
 
-<p>
-Prints a log message if <em>dmxScreen</em> is on the same backend X server as some other DMX backend (output) screen. Modifies the property (<a class="el" href="dmxprop_8c.html#a0">DMX_ATOMNAME</a>) on the backend X server to reflect the creation of <em>dmxScreen</em>.<p>
-The root window of the backend X server holds a list of window ids for all DMX windows (on this DMX server or some other DMX server).<p>
-This list can then be iterated, and the property for each window can be examined. This property contains the following tuple (no quotes):<p>
-"#DMX_IDENT:&lt;hostname running DMX&gt;:&lt;display name of DMX&gt;,&lt;screen number&gt;"     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxprop_8c_source.html#l00067">DMX_ATOMNAME</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00079">dmxPropertyIdentifier()</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, <a class="el" href="dmx_8h_source.html#l00136">_DMXScreenInfo::next</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html
new file mode 100644
index 000000000..cacdb0373
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxprop_8h_source.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxprop.h</h1><a href="dmxprop_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXPROP_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXPROP_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">int</span>  <a class="code" href="dmxprop_8c.html#a97a10defd6ace86dae6cf8c8765bf0de">dmxPropertyDisplay</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxprop_8c.html#aa97527eeaaf0744a67a5c5d188daf8c2">dmxPropertyWindow</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> *<a class="code" href="dmxprop_8c.html#a1353800f90c3a1f46d453caa71a41ab6">dmxPropertyIterate</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *start,
+<a name="l00042"></a>00042                                 <span class="keywordtype">void</span> *(*f)(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen,
+<a name="l00043"></a>00043                                            <span class="keywordtype">void</span> *closure),
+<a name="l00044"></a>00044                                 <span class="keywordtype">void</span> *closure);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxprop_8c.html#ad0a551002589f00b2bac2b081283bc83">dmxPropertySameDisplay</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, <span class="keyword">const</span> <span class="keywordtype">char</span> *name);
+<a name="l00046"></a>00046 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html
deleted file mode 100644
index 679d60e73..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxproto_8h-source.html
+++ /dev/null
@@ -1,431 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxproto.h</h1><a href="dmxproto_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00042 <span class="preprocessor">#ifndef _DMXSTR_H_</span>
-00043 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSTR_H_</span>
-00044 <span class="preprocessor"></span>
-00045 <span class="preprocessor">#define DMX_EXTENSION_NAME  "DMX"</span>
-00046 <span class="preprocessor"></span><span class="preprocessor">#define DMX_EXTENSION_MAJOR 2</span>
-00047 <span class="preprocessor"></span><span class="preprocessor">#define DMX_EXTENSION_MINOR 2</span>
-00048 <span class="preprocessor"></span><span class="preprocessor">#define DMX_EXTENSION_PATCH 20040604</span>
-00049 <span class="preprocessor"></span>
-00050 <span class="comment">/* These values must be larger than LastExtensionError.</span>
-00051 <span class="comment">   The values in dmxext.h and dmxproto.h *MUST* match. */</span>
-00052 <span class="preprocessor">#define DMX_BAD_XINERAMA     1001</span>
-00053 <span class="preprocessor"></span><span class="preprocessor">#define DMX_BAD_VALUE        1002</span>
-00054 <span class="preprocessor"></span>
-00055 <span class="preprocessor">#define X_DMXQueryVersion                   0</span>
-00056 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetScreenCount                 1</span>
-00057 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetScreenInformationDEPRECATED 2</span>
-00058 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetWindowAttributes            3</span>
-00059 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetInputCount                  4</span>
-00060 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetInputAttributes             5</span>
-00061 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXForceWindowCreationDEPRECATED  6</span>
-00062 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXReconfigureScreenDEPRECATED    7</span>
-00063 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXSync                           8</span>
-00064 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXForceWindowCreation            9</span>
-00065 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetScreenAttributes           10</span>
-00066 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXChangeScreensAttributes       11</span>
-00067 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXAddScreen                     12</span>
-00068 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXRemoveScreen                  13</span>
-00069 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXGetDesktopAttributes          14</span>
-00070 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXChangeDesktopAttributes       15</span>
-00071 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXAddInput                      16</span>
-00072 <span class="preprocessor"></span><span class="preprocessor">#define X_DMXRemoveInput                   17</span>
-00073 <span class="preprocessor"></span>
-<a name="l00075"></a><a class="code" href="structxDMXQueryVersionReq.html">00075</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00076     CARD8   reqType;            <span class="comment">/* dmxcode */</span>
-00077     CARD8   dmxReqType;         <span class="comment">/* X_DMXQueryVersion */</span>
-00078     CARD16  length B16;
-00079 } <a class="code" href="structxDMXQueryVersionReq.html">xDMXQueryVersionReq</a>;
-00080 <span class="preprocessor">#define sz_xDMXQueryVersionReq 4</span>
-00081 <span class="preprocessor"></span>
-<a name="l00083"></a><a class="code" href="structxDMXQueryVersionReply.html">00083</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00084     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00085     CARD8   ununsed;
-00086     CARD16  sequenceNumber B16;
-00087     CARD32  length B32;
-00088     CARD32  majorVersion B32;
-00089     CARD32  minorVersion B32;
-00090     CARD32  patchVersion B32;
-00091     CARD32  pad0 B32;
-00092     CARD32  pad1 B32;
-00093     CARD32  pad2 B32;
-00094 } <a class="code" href="structxDMXQueryVersionReply.html">xDMXQueryVersionReply</a>;
-00095 <span class="preprocessor">#define sz_xDMXQueryVersionReply 32</span>
-00096 <span class="preprocessor"></span>
-<a name="l00098"></a><a class="code" href="structxDMXSyncReq.html">00098</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00099     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00100     CARD8   dmxReqType;         <span class="comment">/* X_DMXSync */</span>
-00101     CARD16  length B16;
-00102 } <a class="code" href="structxDMXSyncReq.html">xDMXSyncReq</a>;
-00103 <span class="preprocessor">#define sz_xDMXSyncReq 4</span>
-00104 <span class="preprocessor"></span>
-<a name="l00106"></a><a class="code" href="structxDMXSyncReply.html">00106</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00107     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00108     CARD8   unused;
-00109     CARD16  sequenceNumber B16;
-00110     CARD32  length B32;
-00111     CARD32  status B32;
-00112     CARD32  pad0 B32;
-00113     CARD32  pad1 B32;
-00114     CARD32  pad2 B32;
-00115     CARD32  pad3 B32;
-00116     CARD32  pad4 B32;
-00117 } <a class="code" href="structxDMXSyncReply.html">xDMXSyncReply</a>;
-00118 <span class="preprocessor">#define sz_xDMXSyncReply 32</span>
-00119 <span class="preprocessor"></span>
-<a name="l00121"></a><a class="code" href="structxDMXForceWindowCreationReq.html">00121</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00122     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00123     CARD8   dmxReqType;         <span class="comment">/* X_DMXForceWindowCreation */</span>
-00124     CARD16  length B16;
-00125     CARD32  window B32;
-00126 } <a class="code" href="structxDMXForceWindowCreationReq.html">xDMXForceWindowCreationReq</a>;
-00127 <span class="preprocessor">#define sz_xDMXForceWindowCreationReq 8</span>
-00128 <span class="preprocessor"></span>
-<a name="l00130"></a><a class="code" href="structxDMXForceWindowCreationReply.html">00130</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00131     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00132     CARD8   unused;
-00133     CARD16  sequenceNumber B16;
-00134     CARD32  length B32;
-00135     CARD32  status B32;
-00136     CARD32  pad0 B32;
-00137     CARD32  pad1 B32;
-00138     CARD32  pad2 B32;
-00139     CARD32  pad3 B32;
-00140     CARD32  pad4 B32;
-00141 } <a class="code" href="structxDMXForceWindowCreationReply.html">xDMXForceWindowCreationReply</a>;
-00142 <span class="preprocessor">#define sz_xDMXForceWindowCreationReply 32</span>
-00143 <span class="preprocessor"></span>
-<a name="l00145"></a><a class="code" href="structxDMXGetScreenCountReq.html">00145</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00146     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00147     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetScreenCount */</span>
-00148     CARD16  length B16;
-00149 } <a class="code" href="structxDMXGetScreenCountReq.html">xDMXGetScreenCountReq</a>;
-00150 <span class="preprocessor">#define sz_xDMXGetScreenCountReq 4</span>
-00151 <span class="preprocessor"></span>
-<a name="l00153"></a><a class="code" href="structxDMXGetScreenCountReply.html">00153</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00154     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00155     CARD8   unused;
-00156     CARD16  sequenceNumber B16;
-00157     CARD32  length B32;
-00158     CARD32  screenCount B32;
-00159     CARD32  pad0 B32;
-00160     CARD32  pad1 B32;
-00161     CARD32  pad2 B32;
-00162     CARD32  pad3 B32;
-00163     CARD32  pad4 B32;
-00164 } <a class="code" href="structxDMXGetScreenCountReply.html">xDMXGetScreenCountReply</a>;
-00165 <span class="preprocessor">#define sz_xDMXGetScreenCountReply 32</span>
-00166 <span class="preprocessor"></span>
-<a name="l00168"></a><a class="code" href="structxDMXGetScreenAttributesReq.html">00168</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00169     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00170     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetScreenAttributes */</span>
-00171     CARD16  length B16;
-00172     CARD32  physicalScreen B32;
-00173 } <a class="code" href="structxDMXGetScreenAttributesReq.html">xDMXGetScreenAttributesReq</a>;
-00174 <span class="preprocessor">#define sz_xDMXGetScreenAttributesReq 8</span>
-00175 <span class="preprocessor"></span>
-<a name="l00177"></a><a class="code" href="structxDMXGetScreenAttributesReply.html">00177</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00178     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00179     CARD8   unused;
-00180     CARD16  sequenceNumber B16;
-00181     CARD32  length B32;
-00182     CARD32  displayNameLength B32;
-00183     CARD32  logicalScreen B32;
-00184 
-00185     CARD16  screenWindowWidth B16;
-00186     CARD16  screenWindowHeight B16;
-00187     INT16   screenWindowXoffset B16;
-00188     INT16   screenWindowYoffset B16;
-00189 
-00190     CARD16  rootWindowWidth B16;
-00191     CARD16  rootWindowHeight B16;
-00192     INT16   rootWindowXoffset B16;
-00193     INT16   rootWindowYoffset B16;
-00194     INT16   rootWindowXorigin B16;
-00195     INT16   rootWindowYorigin B16;
-00196 } <a class="code" href="structxDMXGetScreenAttributesReply.html">xDMXGetScreenAttributesReply</a>;
-00197 <span class="preprocessor">#define sz_xDMXGetScreenAttributesReply 36</span>
-00198 <span class="preprocessor"></span>
-<a name="l00200"></a><a class="code" href="structxDMXChangeScreensAttributesReq.html">00200</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00201     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00202     CARD8   dmxReqType;         <span class="comment">/* X_DMXChangeScreensAttributes */</span>
-00203     CARD16  length B16;
-00204     CARD32  screenCount B32;
-00205     CARD32  maskCount B32;
-00206 } <a class="code" href="structxDMXChangeScreensAttributesReq.html">xDMXChangeScreensAttributesReq</a>;
-00207 <span class="preprocessor">#define sz_xDMXChangeScreensAttributesReq 12</span>
-00208 <span class="preprocessor"></span>
-<a name="l00210"></a><a class="code" href="structxDMXChangeScreensAttributesReply.html">00210</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00211     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00212     CARD8   unused;
-00213     CARD16  sequenceNumber B16;
-00214     CARD32  length B32;
-00215     CARD32  status B32;
-00216     CARD32  errorScreen B32;
-00217     CARD32  pad0 B32;
-00218     CARD32  pad1 B32;
-00219     CARD32  pad2 B32;
-00220     CARD32  pad3 B32;
-00221 } <a class="code" href="structxDMXChangeScreensAttributesReply.html">xDMXChangeScreensAttributesReply</a>;
-00222 <span class="preprocessor">#define sz_xDMXChangeScreensAttributesReply 32</span>
-00223 <span class="preprocessor"></span>
-<a name="l00225"></a><a class="code" href="structxDMXAddScreenReq.html">00225</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00226     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00227     CARD8   dmxReqType;         <span class="comment">/* X_DMXAddScreen */</span>
-00228     CARD16  length B16;
-00229     CARD32  displayNameLength B32;
-00230     CARD32  physicalScreen B32;
-00231     CARD32  valueMask B32;
-00232 } <a class="code" href="structxDMXAddScreenReq.html">xDMXAddScreenReq</a>;
-00233 <span class="preprocessor">#define sz_xDMXAddScreenReq 16</span>
-00234 <span class="preprocessor"></span>
-<a name="l00236"></a><a class="code" href="structxDMXAddScreenReply.html">00236</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00237     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00238     CARD8   unused;
-00239     CARD16  sequenceNumber B16;
-00240     CARD32  length B32;
-00241     CARD32  status B32;
-00242     CARD32  physicalScreen B32;
-00243     CARD32  pad0 B32;
-00244     CARD32  pad1 B32;
-00245     CARD32  pad2 B32;
-00246     CARD32  pad3 B32;
-00247 } <a class="code" href="structxDMXAddScreenReply.html">xDMXAddScreenReply</a>;
-00248 <span class="preprocessor">#define sz_xDMXAddScreenReply 32</span>
-00249 <span class="preprocessor"></span>
-<a name="l00251"></a><a class="code" href="structxDMXRemoveScreenReq.html">00251</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00252     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00253     CARD8   dmxReqType;         <span class="comment">/* X_DMXRemoveScreen */</span>
-00254     CARD16  length B16;
-00255     CARD32  physicalScreen B32;
-00256 } <a class="code" href="structxDMXRemoveScreenReq.html">xDMXRemoveScreenReq</a>;
-00257 <span class="preprocessor">#define sz_xDMXRemoveScreenReq 8</span>
-00258 <span class="preprocessor"></span>
-<a name="l00260"></a><a class="code" href="structxDMXRemoveScreenReply.html">00260</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00261     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00262     CARD8   unused;
-00263     CARD16  sequenceNumber B16;
-00264     CARD32  length B32;
-00265     CARD32  status B32;
-00266     CARD32  pad0 B32;
-00267     CARD32  pad1 B32;
-00268     CARD32  pad2 B32;
-00269     CARD32  pad3 B32;
-00270     CARD32  pad4 B32;
-00271 } <a class="code" href="structxDMXRemoveScreenReply.html">xDMXRemoveScreenReply</a>;
-00272 <span class="preprocessor">#define sz_xDMXRemoveScreenReply 32</span>
-00273 <span class="preprocessor"></span>
-<a name="l00275"></a><a class="code" href="structxDMXGetWindowAttributesReq.html">00275</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00276     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00277     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetWindowAttributes */</span>
-00278     CARD16  length B16;
-00279     CARD32  window B32;
-00280 } <a class="code" href="structxDMXGetWindowAttributesReq.html">xDMXGetWindowAttributesReq</a>;
-00281 <span class="preprocessor">#define sz_xDMXGetWindowAttributesReq 8</span>
-00282 <span class="preprocessor"></span>
-<a name="l00284"></a><a class="code" href="structxDMXGetWindowAttributesReply.html">00284</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00285     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00286     CARD8   unused;
-00287     CARD16  sequenceNumber B16;
-00288     CARD32  length B32;
-00289     CARD32  screenCount B32;
-00290     CARD32  pad0 B32;
-00291     CARD32  pad1 B32;
-00292     CARD32  pad2 B32;
-00293     CARD32  pad3 B32;
-00294     CARD32  pad4 B32;
-00295 } <a class="code" href="structxDMXGetWindowAttributesReply.html">xDMXGetWindowAttributesReply</a>;
-00296 <span class="preprocessor">#define sz_xDMXGetWindowAttributesReply 32</span>
-00297 <span class="preprocessor"></span>
-<a name="l00299"></a><a class="code" href="structxDMXGetDesktopAttributesReq.html">00299</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00300     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00301     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetDesktopAttributes */</span>
-00302     CARD16  length B16;
-00303 } <a class="code" href="structxDMXGetDesktopAttributesReq.html">xDMXGetDesktopAttributesReq</a>;
-00304 <span class="preprocessor">#define sz_xDMXGetDesktopAttributesReq 4</span>
-00305 <span class="preprocessor"></span>
-<a name="l00307"></a><a class="code" href="structxDMXGetDesktopAttributesReply.html">00307</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00308     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00309     CARD8   unused;
-00310     CARD16  sequenceNumber B16;
-00311     CARD32  length B32;
-00312     INT16   width;
-00313     INT16   height;
-00314     INT16   shiftX;
-00315     INT16   shiftY;
-00316     CARD32  pad0 B32;
-00317     CARD32  pad1 B32;
-00318     CARD32  pad2 B32;
-00319     CARD32  pad3 B32;
-00320 } <a class="code" href="structxDMXGetDesktopAttributesReply.html">xDMXGetDesktopAttributesReply</a>;
-00321 <span class="preprocessor">#define sz_xDMXGetDesktopAttributesReply 32</span>
-00322 <span class="preprocessor"></span>
-<a name="l00324"></a><a class="code" href="structxDMXChangeDesktopAttributesReq.html">00324</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00325     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00326     CARD8   dmxReqType;         <span class="comment">/* X_DMXChangeDesktopAttributes */</span>
-00327     CARD16  length B16;
-00328     CARD32  valueMask B32;
-00329 } <a class="code" href="structxDMXChangeDesktopAttributesReq.html">xDMXChangeDesktopAttributesReq</a>;
-00330 <span class="preprocessor">#define sz_xDMXChangeDesktopAttributesReq 8</span>
-00331 <span class="preprocessor"></span>
-<a name="l00333"></a><a class="code" href="structxDMXChangeDesktopAttributesReply.html">00333</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00334     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00335     CARD8   unused;
-00336     CARD16  sequenceNumber B16;
-00337     CARD32  length B32;
-00338     CARD32  status B32;
-00339     CARD32  pad0 B32;
-00340     CARD32  pad1 B32;
-00341     CARD32  pad2 B32;
-00342     CARD32  pad3 B32;
-00343     CARD32  pad4 B32;
-00344 } <a class="code" href="structxDMXChangeDesktopAttributesReply.html">xDMXChangeDesktopAttributesReply</a>;
-00345 <span class="preprocessor">#define sz_xDMXChangeDesktopAttributesReply 32</span>
-00346 <span class="preprocessor"></span>
-<a name="l00348"></a><a class="code" href="structxDMXGetInputCountReq.html">00348</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00349     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00350     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetInputCount */</span>
-00351     CARD16  length B16;
-00352 } <a class="code" href="structxDMXGetInputCountReq.html">xDMXGetInputCountReq</a>;
-00353 <span class="preprocessor">#define sz_xDMXGetInputCountReq 4</span>
-00354 <span class="preprocessor"></span>
-<a name="l00356"></a><a class="code" href="structxDMXGetInputCountReply.html">00356</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00357     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00358     CARD8   unused;
-00359     CARD16  sequenceNumber B16;
-00360     CARD32  length B32;
-00361     CARD32  inputCount B32;
-00362     CARD32  pad0 B32;
-00363     CARD32  pad1 B32;
-00364     CARD32  pad2 B32;
-00365     CARD32  pad3 B32;
-00366     CARD32  pad4 B32;
-00367 } <a class="code" href="structxDMXGetInputCountReply.html">xDMXGetInputCountReply</a>;
-00368 <span class="preprocessor">#define sz_xDMXGetInputCountReply 32</span>
-00369 <span class="preprocessor"></span>
-<a name="l00371"></a><a class="code" href="structxDMXGetInputAttributesReq.html">00371</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00372     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00373     CARD8   dmxReqType;         <span class="comment">/* X_DMXGetInputAttributes */</span>
-00374     CARD16  length B16;
-00375     CARD32  deviceId B32;
-00376 } <a class="code" href="structxDMXGetInputAttributesReq.html">xDMXGetInputAttributesReq</a>;
-00377 <span class="preprocessor">#define sz_xDMXGetInputAttributesReq 8</span>
-00378 <span class="preprocessor"></span>
-<a name="l00380"></a><a class="code" href="structxDMXGetInputAttributesReply.html">00380</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00381     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00382     CARD8   unused;
-00383     CARD16  sequenceNumber B16;
-00384     CARD32  length B32;
-00385     CARD32  inputType B32;
-00386     CARD32  physicalScreen B32;
-00387     CARD32  physicalId B32;
-00388     CARD32  nameLength B32;
-00389     BOOL    isCore;
-00390     BOOL    sendsCore;
-00391     BOOL    detached;
-00392     CARD8   pad0;
-00393     CARD32  pad1 B32;
-00394 } <a class="code" href="structxDMXGetInputAttributesReply.html">xDMXGetInputAttributesReply</a>;
-00395 <span class="preprocessor">#define sz_xDMXGetInputAttributesReply 32</span>
-00396 <span class="preprocessor"></span>
-<a name="l00398"></a><a class="code" href="structxDMXAddInputReq.html">00398</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00399     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00400     CARD8   dmxReqType;         <span class="comment">/* X_DMXAddInput */</span>
-00401     CARD16  length B16;
-00402     CARD32  displayNameLength B32;
-00403     CARD32  valueMask;
-00404 } <a class="code" href="structxDMXAddInputReq.html">xDMXAddInputReq</a>;
-00405 <span class="preprocessor">#define sz_xDMXAddInputReq 12</span>
-00406 <span class="preprocessor"></span>
-<a name="l00408"></a><a class="code" href="structxDMXAddInputReply.html">00408</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00409     BYTE    type;               <span class="comment">/* X_Reply */</span>
-00410     CARD8   unused;
-00411     CARD16  sequenceNumber B16;
-00412     CARD32  length B32;
-00413     CARD32  status B32;
-00414     CARD32  physicalId B32;
-00415     CARD32  pad0 B32;
-00416     CARD32  pad1 B32;
-00417     CARD32  pad2 B32;
-00418     CARD32  pad3 B32;
-00419 } <a class="code" href="structxDMXAddInputReply.html">xDMXAddInputReply</a>;
-00420 <span class="preprocessor">#define sz_xDMXAddInputReply 32</span>
-00421 <span class="preprocessor"></span>
-<a name="l00423"></a><a class="code" href="structxDMXRemoveInputReq.html">00423</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00424     CARD8   reqType;            <span class="comment">/* DMXCode */</span>
-00425     CARD8   dmxReqType;         <span class="comment">/* X_DMXRemoveInput */</span>
-00426     CARD16  length B16;
-00427     CARD32  physicalId B32;
-00428 } <a class="code" href="structxDMXRemoveInputReq.html">xDMXRemoveInputReq</a>;
-00429 <span class="preprocessor">#define sz_xDMXRemoveInputReq 8</span>
-00430 <span class="preprocessor"></span>
-<a name="l00432"></a><a class="code" href="structxDMXRemoveInputReply.html">00432</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-00433     BYTE     type;
-00434     CARD8    unused;
-00435     CARD16   sequenceNumber B16;
-00436     CARD32   length B32;
-00437     CARD32   status B32;
-00438     CARD32   pad0 B32;
-00439     CARD32   pad1 B32;
-00440     CARD32   pad2 B32;
-00441     CARD32   pad3 B32;
-00442     CARD32   pad4 B32;
-00443 } <a class="code" href="structxDMXRemoveInputReply.html">xDMXRemoveInputReply</a>;
-00444 <span class="preprocessor">#define sz_xDMXRemoveInputReply 32</span>
-00445 <span class="preprocessor"></span>
-00446 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxproto_8h.html b/xorg-server/hw/dmx/doc/html/dmxproto_8h.html
deleted file mode 100644
index 10353e338..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxproto_8h.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxproto.h File Reference</h1>
-<p>
-<a href="dmxproto_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXAddInputReply.html">xDMXAddInputReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXAddInputReq.html">xDMXAddInputReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXAddScreenReply.html">xDMXAddScreenReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXAddScreenReq.html">xDMXAddScreenReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXChangeDesktopAttributesReply.html">xDMXChangeDesktopAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXChangeDesktopAttributesReq.html">xDMXChangeDesktopAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXChangeScreensAttributesReply.html">xDMXChangeScreensAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXChangeScreensAttributesReq.html">xDMXChangeScreensAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXForceWindowCreationReply.html">xDMXForceWindowCreationReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXForceWindowCreationReq.html">xDMXForceWindowCreationReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetDesktopAttributesReply.html">xDMXGetDesktopAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetDesktopAttributesReq.html">xDMXGetDesktopAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetInputAttributesReply.html">xDMXGetInputAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetInputAttributesReq.html">xDMXGetInputAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetInputCountReply.html">xDMXGetInputCountReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetInputCountReq.html">xDMXGetInputCountReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetScreenAttributesReply.html">xDMXGetScreenAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetScreenAttributesReq.html">xDMXGetScreenAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetScreenCountReply.html">xDMXGetScreenCountReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetScreenCountReq.html">xDMXGetScreenCountReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetWindowAttributesReply.html">xDMXGetWindowAttributesReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXGetWindowAttributesReq.html">xDMXGetWindowAttributesReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXQueryVersionReply.html">xDMXQueryVersionReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXQueryVersionReq.html">xDMXQueryVersionReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXRemoveInputReply.html">xDMXRemoveInputReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXRemoveInputReq.html">xDMXRemoveInputReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXRemoveScreenReply.html">xDMXRemoveScreenReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXRemoveScreenReq.html">xDMXRemoveScreenReq</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXSyncReply.html">xDMXSyncReply</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="structxDMXSyncReq.html">xDMXSyncReq</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file describes the structures necessary to implement the wire protocol for the DMX protocol extension. It should be included only in files that implement the client-side (or server-side) part of the protocol (i.e., client-side applications should <b>not</b> include this file).    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html
index d2425c3be..14e7a8008 100644
--- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8c.html
@@ -6,364 +6,478 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxscrinit.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxshadow_8h-source.html">dmxshadow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxscrinit_8h-source.html">dmxscrinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgc_8h-source.html">dmxgc.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxgcops_8h-source.html">dmxgcops.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxprop_8h-source.html">dmxprop.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxdpms_8h-source.html">dmxdpms.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>"</code><br>
-<code>#include "fb.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "micmap.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a9">dmxCloseScreen</a> (int idx, ScreenPtr pScreen)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxscrinit.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxshadow_8h_source.html">dmxshadow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxscrinit_8h_source.html">dmxscrinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgc_8h_source.html">dmxgc.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxgcops_8h_source.html">dmxgcops.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxprop_8h_source.html">dmxprop.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxdpms_8h_source.html">dmxdpms.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&quot;</code><br/>
+<code>#include &quot;fb.h&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;micmap.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a3a9963b8e65e9ffebe694c05260e530b">dmxCloseScreen</a> (int idx, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#af59f4754af961e2be5f6ef2ce4f5bfcc">dmxSaveScreen</a> (ScreenPtr pScreen, int what)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a51bde87df35cd264d315d09e33c4f9e3">dmxBEScreenInit</a> (int idx, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a673d8a2c038f8ed0da5f910a72a5c4c2">dmxScreenInit</a> (int idx, ScreenPtr pScreen, int argc, char *argv[])</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a95af573befeeedfa4a7d15b574341c36">dmxBECloseScreen</a> (ScreenPtr pScreen)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a4f7aaf448bb3a6c12bccf07600bb1d52">dmxGeneration</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a1bed5fde9231f820a1aa25228649575b">dmxCursorGeneration</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ad44e630c146c4229565af9099435dd9c">dmxGCPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ad44e630c146c4229565af9099435dd9c">dmxGCPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#aded404553276687d3f5ff7b9508765a5">dmxWinPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#aded404553276687d3f5ff7b9508765a5">dmxWinPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a94d6255a4be0d273ed4d90fb768a6094">dmxPixPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#a94d6255a4be0d273ed4d90fb768a6094">dmxPixPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a4e2a5b2ae34073156aef6b406552657f">dmxFontPrivateIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a7897d9161e88c6a522715f635995c864">dmxScreenPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ad3275163fbf66db755e5497df16b9140">dmxScreenPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#a7897d9161e88c6a522715f635995c864">dmxScreenPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ac035360e2c085bc8ff3a8061ea5c21b2">dmxColormapPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ac035360e2c085bc8ff3a8061ea5c21b2">dmxColormapPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#afa3047e4749b013eaa7761baeb3da12b">dmxPictPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#afa3047e4749b013eaa7761baeb3da12b">dmxPictPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#ac5ddcc47c5f64bb86709e1de5e460969">dmxGlyphSetPrivateKeyIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ac5ddcc47c5f64bb86709e1de5e460969">dmxGlyphSetPrivateKeyIndex</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for screen initialization. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a95af573befeeedfa4a7d15b574341c36"></a><!-- doxytag: member="dmxscrinit.c::dmxBECloseScreen" ref="a95af573befeeedfa4a7d15b574341c36" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBECloseScreen </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Close the <em>pScreen</em> resources on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmx_8h_source.html#l00162">_DMXScreenInfo::noCursor</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a11">dmxBEScreenInit</a> (int idx, ScreenPtr pScreen)</td></tr>
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a12">dmxScreenInit</a> (int idx, ScreenPtr pScreen, int argc, char *argv[])</td></tr>
+</div>
+</div>
+<a class="anchor" id="a51bde87df35cd264d315d09e33c4f9e3"></a><!-- doxytag: member="dmxscrinit.c::dmxBEScreenInit" ref="a51bde87df35cd264d315d09e33c4f9e3" args="(int idx, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxBEScreenInit </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize the parts of screen <em>idx</em> that require access to the back-end server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a13">dmxBECloseScreen</a> (ScreenPtr pScreen)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00120">_DMXScreenInfo::beBlackPixel</a>, <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmx_8h_source.html#l00121">_DMXScreenInfo::beWhitePixel</a>, <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmx_8h_source.html#l00162">_DMXScreenInfo::noCursor</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmx_8h_source.html#l00152">_DMXScreenInfo::shadow</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
 
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a2">dmxGCPrivateIndex</a></td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a3">dmxWinPrivateIndex</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a3a9963b8e65e9ffebe694c05260e530b"></a><!-- doxytag: member="dmxscrinit.c::dmxCloseScreen" ref="a3a9963b8e65e9ffebe694c05260e530b" args="(int idx, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxCloseScreen </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Close screen number <em>idx</em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a4">dmxFontPrivateIndex</a></td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxfont_8c_source.html#l00240">dmxResetFonts()</a>, <a class="el" href="dmxpict_8c_source.html#l00126">dmxResetRender()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, and <a class="el" href="dmx_8h_source.html#l00152">_DMXScreenInfo::shadow</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a5">dmxScreenPrivateIndex</a></td></tr>
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a6">dmxColormapPrivateIndex</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="af59f4754af961e2be5f6ef2ce4f5bfcc"></a><!-- doxytag: member="dmxscrinit.c::dmxSaveScreen" ref="af59f4754af961e2be5f6ef2ce4f5bfcc" args="(ScreenPtr pScreen, int what)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static Bool dmxSaveScreen </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>what</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a7">dmxPictPrivateIndex</a></td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a></td></tr>
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for screen initialization.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a13" doxytag="dmxscrinit.c::dmxBECloseScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxBECloseScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+</div>
+<a class="anchor" id="a673d8a2c038f8ed0da5f910a72a5c4c2"></a><!-- doxytag: member="dmxscrinit.c::dmxScreenInit" ref="a673d8a2c038f8ed0da5f910a72a5c4c2" args="(int idx, ScreenPtr pScreen, int argc, char *argv[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxScreenInit </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
         </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Close the <em>pScreen</em> resources on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxscrinit.c::dmxBEScreenInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBEScreenInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>argv</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the parts of screen <em>idx</em> that require access to the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxscrinit.c::dmxCloseScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize screen number <em>idx</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00209">dmxCreateDefColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00068">dmxCursorGeneration</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00598">dmxGetSpans()</a>, <a class="el" href="dmxgc_8c_source.html#l00086">dmxInitGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00050">dmxInitPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00063">dmxInitWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00193">dmxPointerCursorFuncs</a>, <a class="el" href="dmxcursor_8c_source.html#l00977">dmxPointerSpriteFuncs</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, and <a class="el" href="dmx_8h_source.html#l00152">_DMXScreenInfo::shadow</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ac851002ecdb3ee41847403048e47cc8d"></a><!-- doxytag: member="dmxscrinit.c::dmxColormapPrivateKey" ref="ac851002ecdb3ee41847403048e47cc8d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCloseScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxColormapPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ac035360e2c085bc8ff3a8061ea5c21b2">dmxColormapPrivateKeyIndex</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Private index for Colormaps </p>
+
+</div>
+</div>
+<a class="anchor" id="ac035360e2c085bc8ff3a8061ea5c21b2"></a><!-- doxytag: member="dmxscrinit.c::dmxColormapPrivateKeyIndex" ref="ac035360e2c085bc8ff3a8061ea5c21b2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em></td>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#ac035360e2c085bc8ff3a8061ea5c21b2">dmxColormapPrivateKeyIndex</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1bed5fde9231f820a1aa25228649575b"></a><!-- doxytag: member="dmxscrinit.c::dmxCursorGeneration" ref="a1bed5fde9231f820a1aa25228649575b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="memname">unsigned long* <a class="el" href="dmxscrinit_8c.html#a1bed5fde9231f820a1aa25228649575b">dmxCursorGeneration</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a4e2a5b2ae34073156aef6b406552657f"></a><!-- doxytag: member="dmxscrinit.c::dmxFontPrivateIndex" ref="a4e2a5b2ae34073156aef6b406552657f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#a4e2a5b2ae34073156aef6b406552657f">dmxFontPrivateIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Close screen number <em>idx</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxscrinit.c::dmxScreenInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Private index for Fonts </p>
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac268fa35580a060a02ec3ae0ff2b2669"></a><!-- doxytag: member="dmxscrinit.c::dmxGCPrivateKey" ref="ac268fa35580a060a02ec3ae0ff2b2669" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxScreenInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxGCPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ad44e630c146c4229565af9099435dd9c">dmxGCPrivateKeyIndex</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Private index for GCs </p>
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00086">dmxInitGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad44e630c146c4229565af9099435dd9c"></a><!-- doxytag: member="dmxscrinit.c::dmxGCPrivateKeyIndex" ref="ad44e630c146c4229565af9099435dd9c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#ad44e630c146c4229565af9099435dd9c">dmxGCPrivateKeyIndex</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a4f7aaf448bb3a6c12bccf07600bb1d52"></a><!-- doxytag: member="dmxscrinit.c::dmxGeneration" ref="a4f7aaf448bb3a6c12bccf07600bb1d52" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="memname">unsigned long <a class="el" href="dmxscrinit_8c.html#a4f7aaf448bb3a6c12bccf07600bb1d52">dmxGeneration</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00418">dmxConsoleUpdatePosition()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00668">dmxMakeUniqueDeviceName()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af4a0d93e32ac272f72e3b5a6642fb135"></a><!-- doxytag: member="dmxscrinit.c::dmxGlyphSetPrivateKey" ref="af4a0d93e32ac272f72e3b5a6642fb135" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em>[]</td>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxGlyphSetPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#ac5ddcc47c5f64bb86709e1de5e460969">dmxGlyphSetPrivateKeyIndex</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Private index for GlyphSets </p>
+
+</div>
+</div>
+<a class="anchor" id="ac5ddcc47c5f64bb86709e1de5e460969"></a><!-- doxytag: member="dmxscrinit.c::dmxGlyphSetPrivateKeyIndex" ref="ac5ddcc47c5f64bb86709e1de5e460969" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#ac5ddcc47c5f64bb86709e1de5e460969">dmxGlyphSetPrivateKeyIndex</a><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a4b033f36c5e01a808f7d6460eb7c1af3"></a><!-- doxytag: member="dmxscrinit.c::dmxPictPrivateKey" ref="a4b033f36c5e01a808f7d6460eb7c1af3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxPictPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#afa3047e4749b013eaa7761baeb3da12b">dmxPictPrivateKeyIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize screen number <em>idx</em>.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxscrinit.c::dmxColormapPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a6">dmxColormapPrivateIndex</a>
+</div>
+<div class="memdoc">
+<p>Private index for Picts </p>
+
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afa3047e4749b013eaa7761baeb3da12b"></a><!-- doxytag: member="dmxscrinit.c::dmxPictPrivateKeyIndex" ref="afa3047e4749b013eaa7761baeb3da12b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#afa3047e4749b013eaa7761baeb3da12b">dmxPictPrivateKeyIndex</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Colormaps     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxscrinit.c::dmxFontPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af5bfb64208a18ade9f50196263c9d847"></a><!-- doxytag: member="dmxscrinit.c::dmxPixPrivateKey" ref="af5bfb64208a18ade9f50196263c9d847" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a4">dmxFontPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxPixPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#a94d6255a4be0d273ed4d90fb768a6094">dmxPixPrivateKeyIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Fonts     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxscrinit.c::dmxGCPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Private index for Pixmaps </p>
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00050">dmxInitPixmap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94d6255a4be0d273ed4d90fb768a6094"></a><!-- doxytag: member="dmxscrinit.c::dmxPixPrivateKeyIndex" ref="a94d6255a4be0d273ed4d90fb768a6094" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a2">dmxGCPrivateIndex</a>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#a94d6255a4be0d273ed4d90fb768a6094">dmxPixPrivateKeyIndex</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for GCs     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxscrinit.c::dmxGlyphSetPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad3275163fbf66db755e5497df16b9140"></a><!-- doxytag: member="dmxscrinit.c::dmxScreenPrivateKey" ref="ad3275163fbf66db755e5497df16b9140" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a8">dmxGlyphSetPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8h.html#ad3275163fbf66db755e5497df16b9140">dmxScreenPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#a7897d9161e88c6a522715f635995c864">dmxScreenPrivateKeyIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for GlyphSets     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxscrinit.c::dmxPictPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Private index for Screens </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7897d9161e88c6a522715f635995c864"></a><!-- doxytag: member="dmxscrinit.c::dmxScreenPrivateKeyIndex" ref="a7897d9161e88c6a522715f635995c864" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8c.html#a7">dmxPictPrivateIndex</a>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#a7897d9161e88c6a522715f635995c864">dmxScreenPrivateKeyIndex</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Picts     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxscrinit.c::dmxScreenPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af6748237525fb596a210d3b3614312ba"></a><!-- doxytag: member="dmxscrinit.c::dmxWinPrivateKey" ref="af6748237525fb596a210d3b3614312ba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8h.html#a0">dmxScreenPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxwindow_8h.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a> = &amp;<a class="el" href="dmxscrinit_8c.html#aded404553276687d3f5ff7b9508765a5">dmxWinPrivateKeyIndex</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Screens     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxscrinit.c::dmxWinPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Private index for Windows </p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00063">dmxInitWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aded404553276687d3f5ff7b9508765a5"></a><!-- doxytag: member="dmxscrinit.c::dmxWinPrivateKeyIndex" ref="aded404553276687d3f5ff7b9508765a5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxwindow_8h.html#a10">dmxWinPrivateIndex</a>
+          <td class="memname">int <a class="el" href="dmxscrinit_8c.html#aded404553276687d3f5ff7b9508765a5">dmxWinPrivateKeyIndex</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Windows     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html
deleted file mode 100644
index ab7b22fd3..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h-source.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxscrinit.h</h1><a href="dmxscrinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
-00033 <span class="comment"> *</span>
-00034 <span class="comment"> */</span>
-00035 
-00039 <span class="preprocessor">#ifndef DMXSCRINIT_H</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define DMXSCRINIT_H</span>
-00041 <span class="preprocessor"></span>
-00042 <span class="preprocessor">#include "scrnintstr.h"</span>
-00043 
-<a name="l00045"></a><a class="code" href="dmxscrinit_8h.html#a0">00045</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxscrinit_8c.html#a5">dmxScreenPrivateIndex</a>;
-00046 
-00047 <span class="keyword">extern</span> Bool <a class="code" href="dmxscrinit_8c.html#a12">dmxScreenInit</a>(<span class="keywordtype">int</span> idx, ScreenPtr pScreen, <span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> *argv[]);
-00048 
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxscrinit_8c.html#a11">dmxBEScreenInit</a>(<span class="keywordtype">int</span> idx, ScreenPtr pScreen);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxscrinit_8c.html#a13">dmxBECloseScreen</a>(ScreenPtr pScreen);
-00051 
-00052 <span class="preprocessor">#endif </span><span class="comment">/* DMXSCRINIT_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html
index 72415ef97..66fbebc19 100644
--- a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h.html
@@ -6,167 +6,159 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxscrinit.h File Reference</h1><code>#include "scrnintstr.h"</code><br>
-
-<p>
-<a href="dmxscrinit_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8h.html#a1">dmxScreenInit</a> (int idx, ScreenPtr pScreen, int argc, char *argv[])</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8h.html#a2">dmxBEScreenInit</a> (int idx, ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8h.html#a3">dmxBECloseScreen</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxscrinit_8h.html#a0">dmxScreenPrivateIndex</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxscrinit.h File Reference</h1><code>#include &quot;scrnintstr.h&quot;</code><br/>
 
+<p><a href="dmxscrinit_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8h.html#a673d8a2c038f8ed0da5f910a72a5c4c2">dmxScreenInit</a> (int idx, ScreenPtr pScreen, int argc, char *argv[])</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8h.html#a51bde87df35cd264d315d09e33c4f9e3">dmxBEScreenInit</a> (int idx, ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8h.html#a95af573befeeedfa4a7d15b574341c36">dmxBECloseScreen</a> (ScreenPtr pScreen)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxscrinit_8h.html#ad3275163fbf66db755e5497df16b9140">dmxScreenPrivateKey</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for screen initialization. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxscrinit.h::dmxBECloseScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for screen initialization. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a95af573befeeedfa4a7d15b574341c36"></a><!-- doxytag: member="dmxscrinit.h::dmxBECloseScreen" ref="a95af573befeeedfa4a7d15b574341c36" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBECloseScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxBECloseScreen </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Close the <em>pScreen</em> resources on the back-end server. </p>
 
-<p>
-Close the <em>pScreen</em> resources on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxscrinit.h::dmxBEScreenInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmx_8h_source.html#l00162">_DMXScreenInfo::noCursor</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, and <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a51bde87df35cd264d315d09e33c4f9e3"></a><!-- doxytag: member="dmxscrinit.h::dmxBEScreenInit" ref="a51bde87df35cd264d315d09e33c4f9e3" args="(int idx, ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxBEScreenInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="memname">void dmxBEScreenInit </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em></td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize the parts of screen <em>idx</em> that require access to the back-end server. </p>
 
-<p>
-Initialize the parts of screen <em>idx</em> that require access to the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxscrinit.h::dmxScreenInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00120">_DMXScreenInfo::beBlackPixel</a>, <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00102">_DMXScreenInfo::beDepth</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00110">_DMXScreenInfo::beNumPixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00111">_DMXScreenInfo::bePixmapFormats</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmx_8h_source.html#l00121">_DMXScreenInfo::beWhitePixel</a>, <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmx_8h_source.html#l00162">_DMXScreenInfo::noCursor</a>, <a class="el" href="dmx_8h_source.html#l00134">_DMXScreenInfo::scrnDefDrawables</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmx_8h_source.html#l00152">_DMXScreenInfo::shadow</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a673d8a2c038f8ed0da5f910a72a5c4c2"></a><!-- doxytag: member="dmxscrinit.h::dmxScreenInit" ref="a673d8a2c038f8ed0da5f910a72a5c4c2" args="(int idx, ScreenPtr pScreen, int argc, char *argv[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxScreenInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em>, </td>
+          <td class="memname">Bool dmxScreenInit </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>argc</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>argc</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>argv</em>[]</td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>argv</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize screen number <em>idx</em>. </p>
 
-<p>
-Initialize screen number <em>idx</em>.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxscrinit.h::dmxScreenPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00103">_DMXScreenInfo::beBPP</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00108">_DMXScreenInfo::beDepths</a>, <a class="el" href="dmx_8h_source.html#l00107">_DMXScreenInfo::beNumDepths</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmx_8h_source.html#l00104">_DMXScreenInfo::beXDPI</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00209">dmxCreateDefColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00068">dmxCursorGeneration</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00076">dmxFontPrivateIndex</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00598">dmxGetSpans()</a>, <a class="el" href="dmxgc_8c_source.html#l00086">dmxInitGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00050">dmxInitPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00063">dmxInitWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxpict_8c_source.html#l00137">dmxPictureInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00193">dmxPointerCursorFuncs</a>, <a class="el" href="dmxcursor_8c_source.html#l00977">dmxPointerSpriteFuncs</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00089">dmxShadowFB</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, and <a class="el" href="dmx_8h_source.html#l00152">_DMXScreenInfo::shadow</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ad3275163fbf66db755e5497df16b9140"></a><!-- doxytag: member="dmxscrinit.h::dmxScreenPrivateKey" ref="ad3275163fbf66db755e5497df16b9140" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxscrinit_8h.html#a0">dmxScreenPrivateIndex</a>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxscrinit_8h.html#ad3275163fbf66db755e5497df16b9140">dmxScreenPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Private index. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd>dmxscrrinit.c </dd>
+<dd>
+input/dmxconcole.c</dd></dl>
+<p>Private index for Screens </p>
 
-<p>
-Private index for Screens     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html
new file mode 100644
index 000000000..85c30ecb0
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxscrinit_8h_source.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxscrinit.h</h1><a href="dmxscrinit_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *</span>
+<a name="l00033"></a>00033 <span class="comment"> */</span>
+<a name="l00034"></a>00034 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef DMXSCRINIT_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXSCRINIT_H</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00041"></a>00041 <span class="preprocessor">#include &quot;scrnintstr.h&quot;</span>
+<a name="l00042"></a>00042 
+<a name="l00044"></a>00044 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxscrinit_8c.html#ad3275163fbf66db755e5497df16b9140">dmxScreenPrivateKey</a>;
+<a name="l00045"></a>00045 
+<a name="l00046"></a>00046 <span class="keyword">extern</span> Bool <a class="code" href="dmxscrinit_8c.html#a673d8a2c038f8ed0da5f910a72a5c4c2">dmxScreenInit</a>(<span class="keywordtype">int</span> idx, ScreenPtr pScreen, <span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> *argv[]);
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxscrinit_8c.html#a51bde87df35cd264d315d09e33c4f9e3">dmxBEScreenInit</a>(<span class="keywordtype">int</span> idx, ScreenPtr pScreen);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxscrinit_8c.html#a95af573befeeedfa4a7d15b574341c36">dmxBECloseScreen</a>(ScreenPtr pScreen);
+<a name="l00050"></a>00050 
+<a name="l00051"></a>00051 <span class="preprocessor">#endif </span><span class="comment">/* DMXSCRINIT_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html
index 0db2bfa8b..2d3980ba7 100644
--- a/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8c.html
@@ -6,57 +6,66 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxshadow.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxshadow_8h-source.html">dmxshadow.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxshadow_8c.html#a0">dmxShadowUpdateProc</a> (ScreenPtr pScreen, shadowBufPtr pBuf)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxshadow.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxshadow_8h_source.html">dmxshadow.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxshadow_8c.html#af2e3c9fd493e63137db512ab54bf1327">dmxShadowUpdateProc</a> (ScreenPtr pScreen, shadowBufPtr pBuf)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for the shadow frame buffer.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxshadow.c::dmxShadowUpdateProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for the shadow frame buffer. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="af2e3c9fd493e63137db512ab54bf1327"></a><!-- doxytag: member="dmxshadow.c::dmxShadowUpdateProc" ref="af2e3c9fd493e63137db512ab54bf1327" args="(ScreenPtr pScreen, shadowBufPtr pBuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxShadowUpdateProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxShadowUpdateProc </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>shadowBufPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBuf</em></td>
+          <td class="paramtype">shadowBufPtr&nbsp;</td>
+          <td class="paramname"> <em>pBuf</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Update the screen from the shadow frame buffer. </p>
 
-<p>
-Update the screen from the shadow frame buffer.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html
deleted file mode 100644
index 2253c350b..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxshadow_8h-source.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxshadow.h</h1><a href="dmxshadow_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
-00033 <span class="comment"> *</span>
-00034 <span class="comment"> */</span>
-00035 
-00039 <span class="preprocessor">#ifndef DMXSHADOW_H</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define DMXSHADOW_H</span>
-00041 <span class="preprocessor"></span>
-00042 <span class="preprocessor">#include "shadow.h"</span>
-00043 <span class="preprocessor">#include "scrnintstr.h"</span>
-00044 
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxshadow_8c.html#a0">dmxShadowUpdateProc</a>(ScreenPtr pScreen, shadowBufPtr pBuf);
-00046 
-00047 <span class="preprocessor">#endif </span><span class="comment">/* DMXSHADOW_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html
index 05e148ad3..f2ab72b44 100644
--- a/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8h.html
@@ -6,59 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxshadow.h File Reference</h1><code>#include "shadow.h"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-
-<p>
-<a href="dmxshadow_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxshadow_8h.html#a0">dmxShadowUpdateProc</a> (ScreenPtr pScreen, shadowBufPtr pBuf)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxshadow.h File Reference</h1><code>#include &quot;shadow.h&quot;</code><br/>
+<code>#include &quot;scrnintstr.h&quot;</code><br/>
 
+<p><a href="dmxshadow_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxshadow_8h.html#af2e3c9fd493e63137db512ab54bf1327">dmxShadowUpdateProc</a> (ScreenPtr pScreen, shadowBufPtr pBuf)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for shadow framebuffer support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxshadow_8c.html">dmxshadow.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxshadow.h::dmxShadowUpdateProc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for shadow framebuffer support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxshadow_8c.html">dmxshadow.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="af2e3c9fd493e63137db512ab54bf1327"></a><!-- doxytag: member="dmxshadow.h::dmxShadowUpdateProc" ref="af2e3c9fd493e63137db512ab54bf1327" args="(ScreenPtr pScreen, shadowBufPtr pBuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxShadowUpdateProc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxShadowUpdateProc </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>shadowBufPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pBuf</em></td>
+          <td class="paramtype">shadowBufPtr&nbsp;</td>
+          <td class="paramname"> <em>pBuf</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Update the screen from the shadow frame buffer. </p>
 
-<p>
-Update the screen from the shadow frame buffer.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>, <a class="el" href="dmx_8h_source.html#l00154">_DMXScreenInfo::shadowFBImage</a>, and <a class="el" href="dmx_8h_source.html#l00153">_DMXScreenInfo::shadowGC</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html
new file mode 100644
index 000000000..3ba27ee62
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxshadow_8h_source.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxshadow.h</h1><a href="dmxshadow_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *   David H. Dawes &lt;dawes@xfree86.org&gt;</span>
+<a name="l00032"></a>00032 <span class="comment"> *</span>
+<a name="l00033"></a>00033 <span class="comment"> */</span>
+<a name="l00034"></a>00034 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef DMXSHADOW_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXSHADOW_H</span>
+<a name="l00040"></a>00040 <span class="preprocessor"></span>
+<a name="l00041"></a>00041 <span class="preprocessor">#include &quot;shadow.h&quot;</span>
+<a name="l00042"></a>00042 <span class="preprocessor">#include &quot;scrnintstr.h&quot;</span>
+<a name="l00043"></a>00043 
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxshadow_8c.html#af2e3c9fd493e63137db512ab54bf1327">dmxShadowUpdateProc</a>(ScreenPtr pScreen, shadowBufPtr pBuf);
+<a name="l00045"></a>00045 
+<a name="l00046"></a>00046 <span class="preprocessor">#endif </span><span class="comment">/* DMXSHADOW_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html
index 761748dae..71d42cb4a 100644
--- a/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8c.html
@@ -6,216 +6,367 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxsigio.c File Reference</h1><code>#include "inputstr.h"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsigio_8h-source.html">dmxsigio.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxevents_8h-source.html">dmxevents.h</a>"</code><br>
-<code>#include &lt;signal.h&gt;</code><br>
-<code>#include &lt;unistd.h&gt;</code><br>
-<code>#include &lt;sys/fcntl.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a5">dmxSigioBlock</a> (void)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxsigio.c File Reference</h1><code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsigio_8h_source.html">dmxsigio.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxevents_8h_source.html">dmxevents.h</a>&quot;</code><br/>
+<code>#include &lt;signal.h&gt;</code><br/>
+<code>#include &lt;unistd.h&gt;</code><br/>
+<code>#include &lt;fcntl.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#ac5d0c9848f853f8b026b1211b93f78b1">O_ASYNC</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a39d33ce33804efd4d52606d59071c6d8">O_NONBLOCK</a>&nbsp;&nbsp;&nbsp;FNONBLK</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a7d77ce64f0495ed7bb1f5bfcde316371">dmxSigioHandler</a> (int sig)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a0ab74a514a7e18842b085aa001553137">dmxSigioBlock</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#aadc7d1d3b885b68d326ccc8ae1c17d11">dmxSigioUnblock</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a71472c553212e8de00f36e072c378a6c">dmxSigioHook</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a0092cc73f6beb3d16b542a8527f1cbf6">dmxSigioUnhook</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a6651a6fe035f3ba2d8f09a730bc9c0cb">dmxSigioAdd</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a9d563164ebc1ef320b68136f69bec3aa">dmxSigioRemove</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#a86b07a489751508e422ce60fc4ad332d">dmxSigioEnableInput</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#aea86e1800e644fac954c6bbf6012c7aa">dmxSigioDisableInput</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#ac3cccb6a8d72aaa0c7ac64f061d0b877">dmxSigioRegister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int fd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#ac447ef5c9a3aa88a5cb049ea0beecfd2">dmxSigioUnregister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#ac926cb5aa8d124192f381a9e05d49cb8">dmxFdCount</a> = 0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8c.html#ace65587735b6bff523a064f6ad1f978f">dmxInputEnabled</a> = TRUE</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Provides an interface for handling SIGIO signals for input devices. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="ac5d0c9848f853f8b026b1211b93f78b1"></a><!-- doxytag: member="dmxsigio.c::O_ASYNC" ref="ac5d0c9848f853f8b026b1211b93f78b1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define O_ASYNC&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a6">dmxSigioUnblock</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a11">dmxSigioEnableInput</a> (void)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a39d33ce33804efd4d52606d59071c6d8"></a><!-- doxytag: member="dmxsigio.c::O_NONBLOCK" ref="a39d33ce33804efd4d52606d59071c6d8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define O_NONBLOCK&nbsp;&nbsp;&nbsp;FNONBLK</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a12">dmxSigioDisableInput</a> (void)</td></tr>
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00428">kbdLinuxOpenVT()</a>, <a class="el" href="lnx-ms_8c_source.html#l00214">msLinuxInit()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00208">ps2LinuxInit()</a>, and <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a13">dmxSigioRegister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int fd)</td></tr>
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a6651a6fe035f3ba2d8f09a730bc9c0cb"></a><!-- doxytag: member="dmxsigio.c::dmxSigioAdd" ref="a6651a6fe035f3ba2d8f09a730bc9c0cb" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSigioAdd </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8c.html#a14">dmxSigioUnregister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
+<p>References <a class="el" href="dmxinput_8h_source.html#l00078">DMX_ACTIVESIGIO</a>, <a class="el" href="dmxinput_8h_source.html#l00074">DMX_NOSIGIO</a>, <a class="el" href="dmxinput_8h_source.html#l00075">DMX_USESIGIO</a>, <a class="el" href="dmxsigio_8c_source.html#l00050">dmxFdCount</a>, <a class="el" href="dmxsigio_8c_source.html#l00106">dmxSigioHook()</a>, <a class="el" href="dmxsigio_8c_source.html#l00058">O_ASYNC</a>, <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>, <a class="el" href="dmxinput_8h_source.html#l00109">_DMXInputInfo::sigioAdded</a>, <a class="el" href="dmxinput_8h_source.html#l00108">_DMXInputInfo::sigioFd</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Provides an interface for handling SIGIO signals for input devices.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxsigio.c::dmxSigioBlock" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioBlock </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a0ab74a514a7e18842b085aa001553137"></a><!-- doxytag: member="dmxsigio.c::dmxSigioBlock" ref="a0ab74a514a7e18842b085aa001553137" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSigioBlock </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Block SIGIO handling.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxsigio.c::dmxSigioDisableInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Block SIGIO handling. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aea86e1800e644fac954c6bbf6012c7aa"></a><!-- doxytag: member="dmxsigio.c::dmxSigioDisableInput" ref="aea86e1800e644fac954c6bbf6012c7aa" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioDisableInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioDisableInput </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Disable SIGIO handling. This removes the hanlder from the OS. </p>
+
+<p>References <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a86b07a489751508e422ce60fc4ad332d"></a><!-- doxytag: member="dmxsigio.c::dmxSigioEnableInput" ref="a86b07a489751508e422ce60fc4ad332d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSigioEnableInput </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Disable SIGIO handling. This removes the hanlder from the OS.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxsigio.c::dmxSigioEnableInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Enable SIGIO handling. This instantiates the handler with the OS. </p>
+
+<p>References <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7d77ce64f0495ed7bb1f5bfcde316371"></a><!-- doxytag: member="dmxsigio.c::dmxSigioHandler" ref="a7d77ce64f0495ed7bb1f5bfcde316371" args="(int sig)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioEnableInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxSigioHandler </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sig</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00216">_DMXLocalInputInfo::collect_events</a>, <a class="el" href="dmxinput_8h_source.html#l00125">_DMXInputInfo::devs</a>, <a class="el" href="dmxinput_8h_source.html#l00078">DMX_ACTIVESIGIO</a>, <a class="el" href="dmxinput_8h_source.html#l00148">DMX_NO_BLOCK</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00659">dmxEnqueue()</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxevents_8c_source.html#l00556">dmxMotion()</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, <a class="el" href="dmxinput_8h_source.html#l00119">_DMXInputInfo::numDevs</a>, <a class="el" href="dmxinputinit_8h_source.html#l00235">_DMXLocalInputInfo::pDevice</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00106">dmxSigioHook()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a71472c553212e8de00f36e072c378a6c"></a><!-- doxytag: member="dmxsigio.c::dmxSigioHook" ref="a71472c553212e8de00f36e072c378a6c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSigioHook </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Enable SIGIO handling. This instantiates the handler with the OS.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxsigio.c::dmxSigioRegister" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3cccb6a8d72aaa0c7ac64f061d0b877"></a><!-- doxytag: member="dmxsigio.c::dmxSigioRegister" ref="ac3cccb6a8d72aaa0c7ac64f061d0b877" args="(DMXInputInfo *dmxInput, int fd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioRegister </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxSigioRegister </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fd</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Make a note that the input device described in <em>dmxInput</em> will be using the file descriptor <em>fd</em> for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with <a class="el" href="dmxsigio_8c.html#a86b07a489751508e422ce60fc4ad332d">dmxSigioEnableInput()</a>. </p>
 
+<p>References <a class="el" href="dmxinput_8h_source.html#l00051">DMX_MAX_SIGIO_FDS</a>, <a class="el" href="dmxinput_8h_source.html#l00075">DMX_USESIGIO</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxinput_8h_source.html#l00108">_DMXInputInfo::sigioFd</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d563164ebc1ef320b68136f69bec3aa"></a><!-- doxytag: member="dmxsigio.c::dmxSigioRemove" ref="a9d563164ebc1ef320b68136f69bec3aa" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSigioRemove </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that the input device described in <em>dmxInput</em> will be using the file descriptor <em>fd</em> for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with <a class="el" href="dmxsigio_8c.html#a11">dmxSigioEnableInput()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxsigio.c::dmxSigioUnblock" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00078">DMX_ACTIVESIGIO</a>, <a class="el" href="dmxinput_8h_source.html#l00074">DMX_NOSIGIO</a>, <a class="el" href="dmxinput_8h_source.html#l00075">DMX_USESIGIO</a>, <a class="el" href="dmxsigio_8c_source.html#l00050">dmxFdCount</a>, <a class="el" href="dmxsigio_8c_source.html#l00123">dmxSigioUnhook()</a>, <a class="el" href="dmxsigio_8c_source.html#l00058">O_ASYNC</a>, <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>, <a class="el" href="dmxinput_8h_source.html#l00109">_DMXInputInfo::sigioAdded</a>, <a class="el" href="dmxinput_8h_source.html#l00108">_DMXInputInfo::sigioFd</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00227">dmxSigioUnregister()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aadc7d1d3b885b68d326ccc8ae1c17d11"></a><!-- doxytag: member="dmxsigio.c::dmxSigioUnblock" ref="aadc7d1d3b885b68d326ccc8ae1c17d11" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSigioUnblock </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Unblock SIGIO handling. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0092cc73f6beb3d16b542a8527f1cbf6"></a><!-- doxytag: member="dmxsigio.c::dmxSigioUnhook" ref="a0092cc73f6beb3d16b542a8527f1cbf6" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioUnblock </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static void dmxSigioUnhook </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ac447ef5c9a3aa88a5cb049ea0beecfd2"></a><!-- doxytag: member="dmxsigio.c::dmxSigioUnregister" ref="ac447ef5c9a3aa88a5cb049ea0beecfd2" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSigioUnregister </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Unblock SIGIO handling.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxsigio.c::dmxSigioUnregister" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Remove the notes that <em>dmxInput</em> is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00074">DMX_NOSIGIO</a>, <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="ac926cb5aa8d124192f381a9e05d49cb8"></a><!-- doxytag: member="dmxsigio.c::dmxFdCount" ref="ac926cb5aa8d124192f381a9e05d49cb8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioUnregister </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int <a class="el" href="dmxsigio_8c.html#ac926cb5aa8d124192f381a9e05d49cb8">dmxFdCount</a> = 0<code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ace65587735b6bff523a064f6ad1f978f"></a><!-- doxytag: member="dmxsigio.c::dmxInputEnabled" ref="ace65587735b6bff523a064f6ad1f978f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="dmxsigio_8c.html#ace65587735b6bff523a064f6ad1f978f">dmxInputEnabled</a> = TRUE<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove the notes that <em>dmxInput</em> is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00200">dmxSigioDisableInput()</a>, <a class="el" href="dmxsigio_8c_source.html#l00189">dmxSigioEnableInput()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html
deleted file mode 100644
index 4f41eb80e..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxsigio_8h-source.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxsigio.h</h1><a href="dmxsigio_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXSIGIO_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSIGIO_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a5">dmxSigioBlock</a>(<span class="keywordtype">void</span>);
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a6">dmxSigioUnblock</a>(<span class="keywordtype">void</span>);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a11">dmxSigioEnableInput</a>(<span class="keywordtype">void</span>);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a12">dmxSigioDisableInput</a>(<span class="keywordtype">void</span>);
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a13">dmxSigioRegister</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keywordtype">int</span> fd);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a14">dmxSigioUnregister</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
-00046 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html
index 1e55b7b83..7353f4fbe 100644
--- a/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8h.html
@@ -6,212 +6,182 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxsigio.h File Reference</h1>
-<p>
-<a href="dmxsigio_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a0">dmxSigioBlock</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a1">dmxSigioUnblock</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a2">dmxSigioEnableInput</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a3">dmxSigioDisableInput</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a4">dmxSigioRegister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int fd)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsigio_8h.html#a5">dmxSigioUnregister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
-
+<p><a href="dmxsigio_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#a0ab74a514a7e18842b085aa001553137">dmxSigioBlock</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#aadc7d1d3b885b68d326ccc8ae1c17d11">dmxSigioUnblock</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#a86b07a489751508e422ce60fc4ad332d">dmxSigioEnableInput</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#aea86e1800e644fac954c6bbf6012c7aa">dmxSigioDisableInput</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#ac3cccb6a8d72aaa0c7ac64f061d0b877">dmxSigioRegister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, int fd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsigio_8h.html#ac447ef5c9a3aa88a5cb049ea0beecfd2">dmxSigioUnregister</a> (<a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to SIGIO handling support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxsigio_8c.html">dmxsigio.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxsigio.h::dmxSigioBlock" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to SIGIO handling support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxsigio_8c.html">dmxsigio.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a0ab74a514a7e18842b085aa001553137"></a><!-- doxytag: member="dmxsigio.h::dmxSigioBlock" ref="a0ab74a514a7e18842b085aa001553137" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioBlock </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioBlock </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Block SIGIO handling.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxsigio.h::dmxSigioDisableInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Block SIGIO handling. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aea86e1800e644fac954c6bbf6012c7aa"></a><!-- doxytag: member="dmxsigio.h::dmxSigioDisableInput" ref="aea86e1800e644fac954c6bbf6012c7aa" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioDisableInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioDisableInput </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Disable SIGIO handling. This removes the hanlder from the OS.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxsigio.h::dmxSigioEnableInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Disable SIGIO handling. This removes the hanlder from the OS. </p>
+
+<p>References <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a86b07a489751508e422ce60fc4ad332d"></a><!-- doxytag: member="dmxsigio.h::dmxSigioEnableInput" ref="a86b07a489751508e422ce60fc4ad332d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioEnableInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioEnableInput </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Enable SIGIO handling. This instantiates the handler with the OS.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxsigio.h::dmxSigioRegister" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Enable SIGIO handling. This instantiates the handler with the OS. </p>
+
+<p>References <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxinit_8c_source.html#l00087">dmxInputs</a>, <a class="el" href="dmxinit_8c_source.html#l00086">dmxNumInputs</a>, and <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3cccb6a8d72aaa0c7ac64f061d0b877"></a><!-- doxytag: member="dmxsigio.h::dmxSigioRegister" ref="ac3cccb6a8d72aaa0c7ac64f061d0b877" args="(DMXInputInfo *dmxInput, int fd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioRegister </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxInput</em>, </td>
+          <td class="memname">void dmxSigioRegister </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>fd</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Make a note that the input device described in <em>dmxInput</em> will be using the file descriptor <em>fd</em> for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with <a class="el" href="dmxsigio_8c.html#a11">dmxSigioEnableInput()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxsigio.h::dmxSigioUnblock" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Make a note that the input device described in <em>dmxInput</em> will be using the file descriptor <em>fd</em> for SIGIO signals. Calls AddEnabledDevice ifi SIGIO handling has been enabled with <a class="el" href="dmxsigio_8c.html#a86b07a489751508e422ce60fc4ad332d">dmxSigioEnableInput()</a>. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00051">DMX_MAX_SIGIO_FDS</a>, <a class="el" href="dmxinput_8h_source.html#l00075">DMX_USESIGIO</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxsigio_8c_source.html#l00051">dmxInputEnabled</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxinput_8h_source.html#l00108">_DMXInputInfo::sigioFd</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aadc7d1d3b885b68d326ccc8ae1c17d11"></a><!-- doxytag: member="dmxsigio.h::dmxSigioUnblock" ref="aadc7d1d3b885b68d326ccc8ae1c17d11" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioUnblock </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioUnblock </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Unblock SIGIO handling.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxsigio.h::dmxSigioUnregister" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Unblock SIGIO handling. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac447ef5c9a3aa88a5cb049ea0beecfd2"></a><!-- doxytag: member="dmxsigio.h::dmxSigioUnregister" ref="ac447ef5c9a3aa88a5cb049ea0beecfd2" args="(DMXInputInfo *dmxInput)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSigioUnregister </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dmxInput</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSigioUnregister </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxInput</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove the notes that <em>dmxInput</em> is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Remove the notes that <em>dmxInput</em> is using any file descriptors for SIGIO signals. Calls RemoveEnabledDevice. </p>
+
+<p>References <a class="el" href="dmxinput_8h_source.html#l00074">DMX_NOSIGIO</a>, <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>, <a class="el" href="dmxinput_8h_source.html#l00107">_DMXInputInfo::sigioFdCount</a>, and <a class="el" href="dmxinput_8h_source.html#l00106">_DMXInputInfo::sigioState</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html
new file mode 100644
index 000000000..966734f44
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxsigio_8h_source.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxsigio.h</h1><a href="dmxsigio_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXSIGIO_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSIGIO_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a0ab74a514a7e18842b085aa001553137">dmxSigioBlock</a>(<span class="keywordtype">void</span>);
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#aadc7d1d3b885b68d326ccc8ae1c17d11">dmxSigioUnblock</a>(<span class="keywordtype">void</span>);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#a86b07a489751508e422ce60fc4ad332d">dmxSigioEnableInput</a>(<span class="keywordtype">void</span>);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#aea86e1800e644fac954c6bbf6012c7aa">dmxSigioDisableInput</a>(<span class="keywordtype">void</span>);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#ac3cccb6a8d72aaa0c7ac64f061d0b877">dmxSigioRegister</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput, <span class="keywordtype">int</span> fd);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsigio_8c.html#ac447ef5c9a3aa88a5cb049ea0beecfd2">dmxSigioUnregister</a>(<a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a> *dmxInput);
+<a name="l00045"></a>00045 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8c.html b/xorg-server/hw/dmx/doc/html/dmxstat_8c.html
index 9a9ecfc65..5add0d023 100644
--- a/xorg-server/hw/dmx/doc/html/dmxstat_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxstat_8c.html
@@ -6,260 +6,384 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxstat.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxstat_8h-source.html">dmxstat.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include "Xos.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a></td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a0">DMXStatAvg</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxstat.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxstat_8h_source.html">dmxstat.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html">_DMXStatInfo</a></td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a75a8942c042ee0a2c387e61a28a59b94">DMXStatAvg</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a1a534cc2274afee02c883ac10ea9435f">usec</a> (struct timeval *stop, struct timeval *start)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#aeccae65bbc33f6b7717b2dc1a536d3cd">avg</a> (<a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> *data, unsigned long *max)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a3d01ce5487317c131c32e31f05489c58">dmxStatActivate</a> (const char *interval, const char *displays)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a5637440dfb18ba8ccf47bde3037d93aa">dmxStatAlloc</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a23687b91d203902bb293ba64c391cee4">dmxStatFree</a> (<a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *pt)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#ab17f1e926473a1df95e781c6c7a8e940">dmxStatValue</a> (<a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> *data, unsigned long value)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a1098a195e40df685aaf2fbc238884027">dmxStatSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static CARD32&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a218b57229dca87bd0564671d8f68f15f">dmxStatCallback</a> (OsTimerPtr timer, CARD32 t, pointer arg)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a48ed41878576dd3ff9212deaecb2cc1f">dmxStatInit</a> (void)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#abe67369da5135f53f058261d3c173927">dmxStatInterval</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a9994506527c1e7aac2f30d4ed67ea4a5">dmxStatDisplays</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static OsTimerPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8c.html#a4b07a4c989d24e5cad8f85a24d24406c">dmxStatTimer</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>The DMX server code is written to call <a class="el" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync()</a> whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided in <em><a class="el" href="dmxsync_8c.html">dmxsync.c</a></em>. This file provides routines that evaluate this optimization by counting the number of XSync() calls and monitoring their latency. This functionality can be turned on using the -stat command-line parameter. </p>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a75a8942c042ee0a2c387e61a28a59b94"></a><!-- doxytag: member="dmxstat.c::DMXStatAvg" ref="a75a8942c042ee0a2c387e61a28a59b94" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>  <a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Used to compute a running average of value. </p>
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a6">dmxStatActivate</a> (const  char *interval, const  char *displays)</td></tr>
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aeccae65bbc33f6b7717b2dc1a536d3cd"></a><!-- doxytag: member="dmxstat.c::avg" ref="aeccae65bbc33f6b7717b2dc1a536d3cd" args="(DMXStatAvg *data, unsigned long *max)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static unsigned long avg </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> *&nbsp;</td>
+          <td class="paramname"> <em>data</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned long *&nbsp;</td>
+          <td class="paramname"> <em>max</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a7">dmxStatAlloc</a> (void)</td></tr>
+<p>References <a class="el" href="dmxstat_8c_source.html#l00057">_DMXStatAvg::count</a>, and <a class="el" href="dmxstat_8c_source.html#l00058">_DMXStatAvg::value</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a8">dmxStatFree</a> (<a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *pt)</td></tr>
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a10">dmxStatSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a3d01ce5487317c131c32e31f05489c58"></a><!-- doxytag: member="dmxstat.c::dmxStatActivate" ref="a3d01ce5487317c131c32e31f05489c58" args="(const char *interval, const char *displays)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxStatActivate </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>interval</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>displays</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn on XSync statistic gathering and printing. Print every <em>interval</em> seconds, with lines for the first <em>displays</em>. If <em>interval</em> is NULL, 1 will be used. If <em>displays</em> is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a> in <em><a class="el" href="dmxinit_8c.html">dmxinit.c</a></em>. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a12">dmxStatInit</a> (void)</td></tr>
+<p>References <a class="el" href="dmxstat_8c_source.html#l00074">dmxStatDisplays</a>, and <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>.</p>
 
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8c.html#a1">dmxStatInterval</a></td></tr>
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-The DMX server code is written to call <a class="el" href="dmxsync_8c.html#a9">dmxSync()</a> whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided in #dmxsync.c. This file provides routines that evaluate this optimization by counting the number of XSync() calls and monitoring their latency. This functionality can be turned on using the -stat command-line parameter.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxstat.c::DMXStatAvg" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a5637440dfb18ba8ccf47bde3037d93aa"></a><!-- doxytag: member="dmxstat.c::dmxStatAlloc" ref="a5637440dfb18ba8ccf47bde3037d93aa" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__DMXStatAvg.html">_DMXStatAvg</a>  <a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a>
+          <td class="memname"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* dmxStatAlloc </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Allocate a <em>DMXStatInfo</em> structure. </p>
 
-<p>
-Used to compute a running average of value.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxstat.c::dmxStatActivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a218b57229dca87bd0564671d8f68f15f"></a><!-- doxytag: member="dmxstat.c::dmxStatCallback" ref="a218b57229dca87bd0564671d8f68f15f" args="(OsTimerPtr timer, CARD32 t, pointer arg)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatActivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>interval</em>, </td>
+          <td class="memname">static CARD32 dmxStatCallback </td>
+          <td>(</td>
+          <td class="paramtype">OsTimerPtr&nbsp;</td>
+          <td class="paramname"> <em>timer</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">CARD32&nbsp;</td>
+          <td class="paramname"> <em>t</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>displays</em></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>arg</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Turn on XSync statistic gathering and printing. Print every <em>interval</em> seconds, with lines for the first <em>displays</em>. If <em>interval</em> is NULL, 1 will be used. If <em>displays</em> is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a> in #dmxinit.c.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxstat.c::dmxStatAlloc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* dmxStatAlloc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmxstat_8c_source.html#l00085">avg()</a>, <a class="el" href="dmxstat_8c_source.html#l00069">_DMXStatInfo::bins</a>, <a class="el" href="dmxstat_8h_source.html#l00042">DMX_STAT_BINS</a>, <a class="el" href="dmxstat_8h_source.html#l00041">DMX_STAT_INTERVAL</a>, <a class="el" href="dmxlog_8h_source.html#l00043">dmxDebug</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8c_source.html#l00170">dmxLogCont()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxstat_8c_source.html#l00074">dmxStatDisplays</a>, <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>, <a class="el" href="dmxstat_8c_source.html#l00064">_DMXStatInfo::oldSyncCount</a>, <a class="el" href="dmxstat_8c_source.html#l00067">_DMXStatInfo::pending</a>, <a class="el" href="dmx_8h_source.html#l00182">_DMXScreenInfo::stat</a>, <a class="el" href="dmxstat_8c_source.html#l00063">_DMXStatInfo::syncCount</a>, and <a class="el" href="dmxstat_8c_source.html#l00066">_DMXStatInfo::usec</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00216">dmxStatInit()</a>.</p>
 
-<p>
-Allocate a <em>DMXStatInfo</em> structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxstat.c::dmxStatFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a23687b91d203902bb293ba64c391cee4"></a><!-- doxytag: member="dmxstat.c::dmxStatFree" ref="a23687b91d203902bb293ba64c391cee4" args="(DMXStatInfo *pt)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pt</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxStatFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>pt</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Free the memory used by a <em>DMXStatInfo</em> structure. </p>
 
-<p>
-Free the memory used by a <em>DMXStatInfo</em> structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxstat.c::dmxStatInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a48ed41878576dd3ff9212deaecb2cc1f"></a><!-- doxytag: member="dmxstat.c::dmxStatInit" ref="a48ed41878576dd3ff9212deaecb2cc1f" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxStatInit </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Try to initialize the statistic gathering and printing routines. Initialization only takes place if <a class="el" href="dmxstat_8h.html#a3d01ce5487317c131c32e31f05489c58">dmxStatActivate</a> has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it. </p>
 
-<p>
-Try to initialize the statistic gathering and printing routines. Initialization only takes place if <a class="el" href="dmxstat_8h.html#a6">dmxStatActivate</a> has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxstat.c::dmxStatSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>, and <a class="el" href="dmxstat_8c_source.html#l00075">dmxStatTimer</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1098a195e40df685aaf2fbc238884027"></a><!-- doxytag: member="dmxstat.c::dmxStatSync" ref="a1098a195e40df685aaf2fbc238884027" args="(DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxStatSync </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>stop</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>struct timeval *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stop</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>pending</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Note that a XSync() was just done on <em>dmxScreen</em> with the <em>start</em> and <em>stop</em> times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from <a class="el" href="dmxsync_8c.html#a3f47aabdd830525720f7a01acbac91ef">dmxDoSync</a> in <em><a class="el" href="dmxsync_8c.html">dmxsync.c</a></em> </p>
+
+<p>References <a class="el" href="dmxstat_8c_source.html#l00069">_DMXStatInfo::bins</a>, <a class="el" href="dmxstat_8h_source.html#l00043">DMX_STAT_BIN0</a>, <a class="el" href="dmxstat_8h_source.html#l00044">DMX_STAT_BINMULT</a>, <a class="el" href="dmxstat_8h_source.html#l00042">DMX_STAT_BINS</a>, <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>, <a class="el" href="dmxstat_8c_source.html#l00067">_DMXStatInfo::pending</a>, <a class="el" href="dmx_8h_source.html#l00182">_DMXScreenInfo::stat</a>, <a class="el" href="dmxstat_8c_source.html#l00063">_DMXStatInfo::syncCount</a>, <a class="el" href="dmxstat_8c_source.html#l00066">_DMXStatInfo::usec</a>, and <a class="el" href="dmxstat_8c_source.html#l00079">usec()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab17f1e926473a1df95e781c6c7a8e940"></a><!-- doxytag: member="dmxstat.c::dmxStatValue" ref="ab17f1e926473a1df95e781c6c7a8e940" args="(DMXStatAvg *data, unsigned long value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxStatValue </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> *&nbsp;</td>
+          <td class="paramname"> <em>data</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>struct timeval *&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxstat_8c_source.html#l00057">_DMXStatAvg::count</a>, <a class="el" href="dmxstat_8h_source.html#l00040">DMX_STAT_LENGTH</a>, <a class="el" href="dmxstat_8c_source.html#l00056">_DMXStatAvg::pos</a>, and <a class="el" href="dmxstat_8c_source.html#l00058">_DMXStatAvg::value</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1a534cc2274afee02c883ac10ea9435f"></a><!-- doxytag: member="dmxstat.c::usec" ref="a1a534cc2274afee02c883ac10ea9435f" args="(struct timeval *stop, struct timeval *start)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static unsigned long usec </td>
+          <td>(</td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>stop</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>pending</em></td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>start</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Return the number of microseconds as an unsigned long. Unfortunately, this is only useful for intervals &lt; about 4 sec. </p>
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a9994506527c1e7aac2f30d4ed67ea4a5"></a><!-- doxytag: member="dmxstat.c::dmxStatDisplays" ref="a9994506527c1e7aac2f30d4ed67ea4a5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxstat_8c.html#a9994506527c1e7aac2f30d4ed67ea4a5">dmxStatDisplays</a><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Note that a XSync() was just done on <em>dmxScreen</em> with the <em>start</em> and <em>stop</em> times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from #dmxDoSync in #dmxsync.c     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a1" doxytag="dmxstat.c::dmxStatInterval" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00106">dmxStatActivate()</a>, and <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe67369da5135f53f058261d3c173927"></a><!-- doxytag: member="dmxstat.c::dmxStatInterval" ref="abe67369da5135f53f058261d3c173927" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxstat_8h.html#a5">dmxStatInterval</a>
+          <td class="memname">int <a class="el" href="dmxstat_8h.html#abe67369da5135f53f058261d3c173927">dmxStatInterval</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Only for <a class="el" href="dmxstat_8c.html">dmxstat.c</a> and <a class="el" href="dmxsync_8c.html">dmxsync.c</a> </p>
 
-<p>
-Only for <a class="el" href="dmxstat_8c.html">dmxstat.c</a> and <a class="el" href="dmxsync_8c.html">dmxsync.c</a>     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxstat_8c_source.html#l00106">dmxStatActivate()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00216">dmxStatInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4b07a4c989d24e5cad8f85a24d24406c"></a><!-- doxytag: member="dmxstat.c::dmxStatTimer" ref="a4b07a4c989d24e5cad8f85a24d24406c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">OsTimerPtr <a class="el" href="dmxstat_8c.html#a4b07a4c989d24e5cad8f85a24d24406c">dmxStatTimer</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00216">dmxStatInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html
deleted file mode 100644
index d7579a5d8..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxstat_8h-source.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxstat.h</h1><a href="dmxstat_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXSTAT_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSTAT_H_</span>
-00040 <span class="preprocessor"></span>
-<a name="l00041"></a><a class="code" href="dmxstat_8h.html#a0">00041</a> <span class="preprocessor">#define DMX_STAT_LENGTH     10  </span>
-<a name="l00042"></a><a class="code" href="dmxstat_8h.html#a1">00042</a> <span class="preprocessor">#define DMX_STAT_INTERVAL 1000  </span>
-<a name="l00043"></a><a class="code" href="dmxstat_8h.html#a2">00043</a> <span class="preprocessor">#define DMX_STAT_BINS        3  </span>
-<a name="l00044"></a><a class="code" href="dmxstat_8h.html#a3">00044</a> <span class="preprocessor">#define DMX_STAT_BIN0    10000  </span>
-<a name="l00045"></a><a class="code" href="dmxstat_8h.html#a4">00045</a> <span class="preprocessor">#define DMX_STAT_BINMULT   100  </span>
-<a name="l00047"></a><a class="code" href="dmxstat_8h.html#a5">00047</a> <span class="preprocessor">extern int         dmxStatInterval; </span>
-00048 <span class="preprocessor">extern void        dmxStatActivate(const char *interval, const char *displays);</span>
-00049 <span class="preprocessor"></span><span class="keyword">extern</span> <a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a> *<a class="code" href="dmxstat_8c.html#a7">dmxStatAlloc</a>(<span class="keywordtype">void</span>);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a8">dmxStatFree</a>(<a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a> *);
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a12">dmxStatInit</a>(<span class="keywordtype">void</span>);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a10">dmxStatSync</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen,
-00053                                <span class="keyword">struct</span> timeval *stop, <span class="keyword">struct</span> timeval *start,
-00054                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> pending);
-00055 
-00056 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h.html
index d4fcb0d9c..6e04e6529 100644
--- a/xorg-server/hw/dmx/doc/html/dmxstat_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxstat_8h.html
@@ -6,350 +6,285 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxstat.h File Reference</h1>
-<p>
-<a href="dmxstat_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a0">DMX_STAT_LENGTH</a>&nbsp;&nbsp;&nbsp;10</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a1">DMX_STAT_INTERVAL</a>&nbsp;&nbsp;&nbsp;1000</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a2">DMX_STAT_BINS</a>&nbsp;&nbsp;&nbsp;3</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a3">DMX_STAT_BIN0</a>&nbsp;&nbsp;&nbsp;10000</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a4">DMX_STAT_BINMULT</a>&nbsp;&nbsp;&nbsp;100</td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a6">dmxStatActivate</a> (const  char *interval, const  char *displays)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a7">dmxStatAlloc</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a8">dmxStatFree</a> (<a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a9">dmxStatInit</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a10">dmxStatSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)</td></tr>
-
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxstat_8h.html#a5">dmxStatInterval</a></td></tr>
-
+<p><a href="dmxstat_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#ad38ec0be743fab83c032d231034d4d49">DMX_STAT_LENGTH</a>&nbsp;&nbsp;&nbsp;10</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a4cb43c9c7db58a10d8834a6b95a5c180">DMX_STAT_INTERVAL</a>&nbsp;&nbsp;&nbsp;1000</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#aac0caef45e7427ea05d5425da659ac56">DMX_STAT_BINS</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a8757af3ae82fef58d05e31523454065f">DMX_STAT_BIN0</a>&nbsp;&nbsp;&nbsp;10000</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a9c3e64f7fc0b5305bb6798b298ae6283">DMX_STAT_BINMULT</a>&nbsp;&nbsp;&nbsp;100</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a3d01ce5487317c131c32e31f05489c58">dmxStatActivate</a> (const char *interval, const char *displays)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a5637440dfb18ba8ccf47bde3037d93aa">dmxStatAlloc</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a33d0c28b9f5f129f4328a714f1da1db7">dmxStatFree</a> (<a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a48ed41878576dd3ff9212deaecb2cc1f">dmxStatInit</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#a1098a195e40df685aaf2fbc238884027">dmxStatSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxstat_8h.html#abe67369da5135f53f058261d3c173927">dmxStatInterval</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for statistic gathering interface. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxstat_8c.html">dmxstat.c</a></dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a3" doxytag="dmxstat.h::DMX_STAT_BIN0" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for statistic gathering interface. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxstat_8c.html">dmxstat.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a8757af3ae82fef58d05e31523454065f"></a><!-- doxytag: member="dmxstat.h::DMX_STAT_BIN0" ref="a8757af3ae82fef58d05e31523454065f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_STAT_BIN0&nbsp;&nbsp;&nbsp;10000
+          <td class="memname">#define DMX_STAT_BIN0&nbsp;&nbsp;&nbsp;10000</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>us for bin[0] </p>
 
-<p>
-us for bin[0]     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="dmxstat.h::DMX_STAT_BINMULT" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9c3e64f7fc0b5305bb6798b298ae6283"></a><!-- doxytag: member="dmxstat.h::DMX_STAT_BINMULT" ref="a9c3e64f7fc0b5305bb6798b298ae6283" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_STAT_BINMULT&nbsp;&nbsp;&nbsp;100
+          <td class="memname">#define DMX_STAT_BINMULT&nbsp;&nbsp;&nbsp;100</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>multiplier for next bin[] </p>
 
-<p>
-multiplier for next bin[]     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxstat.h::DMX_STAT_BINS" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac0caef45e7427ea05d5425da659ac56"></a><!-- doxytag: member="dmxstat.h::DMX_STAT_BINS" ref="aac0caef45e7427ea05d5425da659ac56" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_STAT_BINS&nbsp;&nbsp;&nbsp;3
+          <td class="memname">#define DMX_STAT_BINS&nbsp;&nbsp;&nbsp;3</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>number of bins </p>
 
-<p>
-number of bins     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxstat.h::DMX_STAT_INTERVAL" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4cb43c9c7db58a10d8834a6b95a5c180"></a><!-- doxytag: member="dmxstat.h::DMX_STAT_INTERVAL" ref="a4cb43c9c7db58a10d8834a6b95a5c180" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_STAT_INTERVAL&nbsp;&nbsp;&nbsp;1000
+          <td class="memname">#define DMX_STAT_INTERVAL&nbsp;&nbsp;&nbsp;1000</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>msec between printouts </p>
 
-<p>
-msec between printouts     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxstat.h::DMX_STAT_LENGTH" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad38ec0be743fab83c032d231034d4d49"></a><!-- doxytag: member="dmxstat.h::DMX_STAT_LENGTH" ref="ad38ec0be743fab83c032d231034d4d49" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> #define DMX_STAT_LENGTH&nbsp;&nbsp;&nbsp;10
+          <td class="memname">#define DMX_STAT_LENGTH&nbsp;&nbsp;&nbsp;10</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>number of events for moving average </p>
 
-<p>
-number of events for moving average     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a6" doxytag="dmxstat.h::dmxStatActivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a3d01ce5487317c131c32e31f05489c58"></a><!-- doxytag: member="dmxstat.h::dmxStatActivate" ref="a3d01ce5487317c131c32e31f05489c58" args="(const char *interval, const char *displays)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatActivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>interval</em>, </td>
+          <td class="memname">void dmxStatActivate </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>interval</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>displays</em></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>displays</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn on XSync statistic gathering and printing. Print every <em>interval</em> seconds, with lines for the first <em>displays</em>. If <em>interval</em> is NULL, 1 will be used. If <em>displays</em> is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a> in <em><a class="el" href="dmxinit_8c.html">dmxinit.c</a></em>. </p>
 
-<p>
-Turn on XSync statistic gathering and printing. Print every <em>interval</em> seconds, with lines for the first <em>displays</em>. If <em>interval</em> is NULL, 1 will be used. If <em>displays</em> is NULL, 0 will be used (meaning a line for every display will be printed). Note that this function takes string arguments because it will usually be called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a> in #dmxinit.c.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxstat.h::dmxStatAlloc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxstat_8c_source.html#l00074">dmxStatDisplays</a>, and <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5637440dfb18ba8ccf47bde3037d93aa"></a><!-- doxytag: member="dmxstat.h::dmxStatAlloc" ref="a5637440dfb18ba8ccf47bde3037d93aa" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* dmxStatAlloc </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* dmxStatAlloc </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Allocate a <em>DMXStatInfo</em> structure. </p>
 
-<p>
-Allocate a <em>DMXStatInfo</em> structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxstat.h::dmxStatFree" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a33d0c28b9f5f129f4328a714f1da1db7"></a><!-- doxytag: member="dmxstat.h::dmxStatFree" ref="a33d0c28b9f5f129f4328a714f1da1db7" args="(DMXStatInfo *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatFree </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pt</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxStatFree </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>pt</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Free the memory used by a <em>DMXStatInfo</em> structure. </p>
 
-<p>
-Free the memory used by a <em>DMXStatInfo</em> structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxstat.h::dmxStatInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a48ed41878576dd3ff9212deaecb2cc1f"></a><!-- doxytag: member="dmxstat.h::dmxStatInit" ref="a48ed41878576dd3ff9212deaecb2cc1f" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxStatInit </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Try to initialize the statistic gathering and printing routines. Initialization only takes place if <a class="el" href="dmxstat_8h.html#a3d01ce5487317c131c32e31f05489c58">dmxStatActivate</a> has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it. </p>
 
-<p>
-Try to initialize the statistic gathering and printing routines. Initialization only takes place if <a class="el" href="dmxstat_8h.html#a6">dmxStatActivate</a> has already been called. We don't need the same generation protection that we used in dmxSyncInit because our timer is always on a queue -- hence, server generation will always free it.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxstat.h::dmxStatSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>, and <a class="el" href="dmxstat_8c_source.html#l00075">dmxStatTimer</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1098a195e40df685aaf2fbc238884027"></a><!-- doxytag: member="dmxstat.h::dmxStatSync" ref="a1098a195e40df685aaf2fbc238884027" args="(DMXScreenInfo *dmxScreen, struct timeval *stop, struct timeval *start, unsigned long pending)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxStatSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxStatSync </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>struct timeval *&nbsp;</td>
-          <td class="mdname" nowrap> <em>stop</em>, </td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>stop</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>struct timeval *&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="paramtype">struct timeval *&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>pending</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>pending</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Note that a XSync() was just done on <em>dmxScreen</em> with the <em>start</em> and <em>stop</em> times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from <a class="el" href="dmxsync_8c.html#a3f47aabdd830525720f7a01acbac91ef">dmxDoSync</a> in <em><a class="el" href="dmxsync_8c.html">dmxsync.c</a></em> </p>
 
-<p>
-Note that a XSync() was just done on <em>dmxScreen</em> with the <em>start</em> and <em>stop</em> times (from gettimeofday()) and the number of pending-but-not-yet-processed XSync requests. This routine is called from #dmxDoSync in #dmxsync.c     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a5" doxytag="dmxstat.h::dmxStatInterval" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxstat_8c_source.html#l00069">_DMXStatInfo::bins</a>, <a class="el" href="dmxstat_8h_source.html#l00043">DMX_STAT_BIN0</a>, <a class="el" href="dmxstat_8h_source.html#l00044">DMX_STAT_BINMULT</a>, <a class="el" href="dmxstat_8h_source.html#l00042">DMX_STAT_BINS</a>, <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>, <a class="el" href="dmxstat_8c_source.html#l00067">_DMXStatInfo::pending</a>, <a class="el" href="dmx_8h_source.html#l00182">_DMXScreenInfo::stat</a>, <a class="el" href="dmxstat_8c_source.html#l00063">_DMXStatInfo::syncCount</a>, <a class="el" href="dmxstat_8c_source.html#l00066">_DMXStatInfo::usec</a>, and <a class="el" href="dmxstat_8c_source.html#l00079">usec()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="abe67369da5135f53f058261d3c173927"></a><!-- doxytag: member="dmxstat.h::dmxStatInterval" ref="abe67369da5135f53f058261d3c173927" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxstat_8h.html#a5">dmxStatInterval</a>
+          <td class="memname">int <a class="el" href="dmxstat_8h.html#abe67369da5135f53f058261d3c173927">dmxStatInterval</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Only for <a class="el" href="dmxstat_8c.html">dmxstat.c</a> and <a class="el" href="dmxsync_8c.html">dmxsync.c</a> </p>
 
-<p>
-Only for <a class="el" href="dmxstat_8c.html">dmxstat.c</a> and <a class="el" href="dmxsync_8c.html">dmxsync.c</a>     </td>
-  </tr>
-</table>
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxstat_8c_source.html#l00106">dmxStatActivate()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00216">dmxStatInit()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html
new file mode 100644
index 000000000..8b2aa4c7b
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxstat_8h_source.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxstat.h</h1><a href="dmxstat_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXSTAT_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSTAT_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a><a class="code" href="dmxstat_8h.html#ad38ec0be743fab83c032d231034d4d49">00040</a> <span class="preprocessor">#define DMX_STAT_LENGTH     10  </span>
+<a name="l00041"></a><a class="code" href="dmxstat_8h.html#a4cb43c9c7db58a10d8834a6b95a5c180">00041</a> <span class="preprocessor">#define DMX_STAT_INTERVAL 1000  </span>
+<a name="l00042"></a><a class="code" href="dmxstat_8h.html#aac0caef45e7427ea05d5425da659ac56">00042</a> <span class="preprocessor">#define DMX_STAT_BINS        3  </span>
+<a name="l00043"></a><a class="code" href="dmxstat_8h.html#a8757af3ae82fef58d05e31523454065f">00043</a> <span class="preprocessor">#define DMX_STAT_BIN0    10000  </span>
+<a name="l00044"></a><a class="code" href="dmxstat_8h.html#a9c3e64f7fc0b5305bb6798b298ae6283">00044</a> <span class="preprocessor">#define DMX_STAT_BINMULT   100  </span>
+<a name="l00046"></a>00046 <span class="preprocessor">extern int         dmxStatInterval; </span>
+<a name="l00047"></a>00047 <span class="preprocessor">extern void        dmxStatActivate(const char *interval, const char *displays);</span>
+<a name="l00048"></a>00048 <span class="preprocessor"></span><span class="keyword">extern</span> <a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a> *<a class="code" href="dmxstat_8c.html#a5637440dfb18ba8ccf47bde3037d93aa">dmxStatAlloc</a>(<span class="keywordtype">void</span>);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a23687b91d203902bb293ba64c391cee4">dmxStatFree</a>(<a class="code" href="struct__DMXStatInfo.html">DMXStatInfo</a> *);
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a48ed41878576dd3ff9212deaecb2cc1f">dmxStatInit</a>(<span class="keywordtype">void</span>);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>        <a class="code" href="dmxstat_8c.html#a1098a195e40df685aaf2fbc238884027">dmxStatSync</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen,
+<a name="l00052"></a>00052                                <span class="keyword">struct</span> timeval *stop, <span class="keyword">struct</span> timeval *start,
+<a name="l00053"></a>00053                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> pending);
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8c.html b/xorg-server/hw/dmx/doc/html/dmxsync_8c.html
index 76a940dd9..6db2aeb60 100644
--- a/xorg-server/hw/dmx/doc/html/dmxsync_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxsync_8c.html
@@ -6,125 +6,305 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxsync.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxstat_8h-source.html">dmxstat.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxlog_8h-source.html">dmxlog.h</a>"</code><br>
-<code>#include &lt;sys/time.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8c.html#a7">dmxSyncActivate</a> (const  char *interval)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8c.html#a8">dmxSyncInit</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8c.html#a9">dmxSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxsync.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxstat_8h_source.html">dmxstat.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxlog_8h_source.html">dmxlog.h</a>&quot;</code><br/>
+<code>#include &lt;sys/time.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a3f47aabdd830525720f7a01acbac91ef">dmxDoSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static CARD32&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a00478eb7de1c84d98b41ca4c6d4b50e4">dmxSyncCallback</a> (OsTimerPtr timer, CARD32 time, pointer arg)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#aa5bb6eee83aba5bedf3c93fbb85af049">dmxSyncBlockHandler</a> (pointer blockData, OSTimePtr pTimeout, pointer pReadMask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a9329ae45fff6668caaca1fb93792b0b9">dmxSyncWakeupHandler</a> (pointer blockData, int result, pointer pReadMask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate</a> (const char *interval)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a0b349896e58d4291d712e31121fdc0ac">dmxSyncInit</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a01c45efcf0b2d9242b06e1e0fe42bd76">dmxSyncInterval</a> = 100</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static OsTimerPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a9466911712aef6631a5b88d1bcb1afad">dmxSyncTimer</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8c.html#a6fb7fbcbe509b8ffb8637691925d46f2">dmxSyncPending</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-The DMX server code is written to call <a class="el" href="dmxsync_8c.html#a9">dmxSync()</a> whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided here. Statistics about XSync() calls and latency are gathered in #dmxstat.c.<p>
-During the initial conversion from calling XSync() immediately to the XSync() batching method implemented in this file, it was noted that, out of more than 300 <em>x11perf</em> tests, 8 tests became more than 100 times faster, with 68 more than 50X faster, 114 more than 10X faster, and 181 more than 2X faster.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a9" doxytag="dmxsync.c::dmxSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>The DMX server code is written to call <a class="el" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync()</a> whenever an XSync() might be necessary. However, since XSync() requires a two way communication with the other X server, eliminating unnecessary XSync() calls is a key performance optimization. Support for this optimization is provided here. Statistics about XSync() calls and latency are gathered in <em><a class="el" href="dmxstat_8c.html">dmxstat.c</a></em>.</p>
+<p>During the initial conversion from calling XSync() immediately to the XSync() batching method implemented in this file, it was noted that, out of more than 300 <em>x11perf</em> tests, 8 tests became more than 100 times faster, with 68 more than 50X faster, 114 more than 10X faster, and 181 more than 2X faster. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a3f47aabdd830525720f7a01acbac91ef"></a><!-- doxytag: member="dmxsync.c::dmxDoSync" ref="a3f47aabdd830525720f7a01acbac91ef" args="(DMXScreenInfo *dmxScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDoSync </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxstat_8c_source.html#l00073">dmxStatInterval</a>, <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00061">dmxSyncPending</a>, and <a class="el" href="dmx_8h_source.html#l00183">_DMXScreenInfo::needsSync</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab848762f4d2e30d31b87d3e8e10c5967"></a><!-- doxytag: member="dmxsync.c::dmxSync" ref="ab848762f4d2e30d31b87d3e8e10c5967" args="(DMXScreenInfo *dmxScreen, Bool now)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxSync </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>now</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>now</em></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Request an XSync() to the display used by <em>dmxScreen</em>. If <em>now</em> is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with <a class="el" href="dmxsync_8c.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate()</a> before <a class="el" href="dmxsync_8c.html#a0b349896e58d4291d712e31121fdc0ac">dmxSyncInit()</a> was called, then no XSync() batching is performed and this function always calles XSync() immediately.</p>
+<p>(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)</p>
+<p>If <em>dmxScreen</em> is <em>NULL</em>, then all pending syncs will be flushed immediately. </p>
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>, <a class="el" href="dmxsync_8c_source.html#l00061">dmxSyncPending</a>, <a class="el" href="dmxsync_8c_source.html#l00060">dmxSyncTimer</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmx_8h_source.html#l00183">_DMXScreenInfo::needsSync</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxfont_8c_source.html#l00147">dmxCheckFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxextension_8c_source.html#l00292">dmxFlushPendingSyncs()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0a769161d6f8d88067a9cac16f9cf6f"></a><!-- doxytag: member="dmxsync.c::dmxSyncActivate" ref="ae0a769161d6f8d88067a9cac16f9cf6f" args="(const char *interval)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void dmxSyncActivate </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>interval</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Request the XSync() batching optimization with the specified <em>interval</em> (in mS). If the <em>interval</em> is 0, 100mS is used. If the <em>interval</em> is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).</p>
+<p>Note that the parameter to this routine is a string, since it will usually be called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a> in <em><a class="el" href="dmxinit_8c.html">dmxinit.c</a></em> </p>
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa5bb6eee83aba5bedf3c93fbb85af049"></a><!-- doxytag: member="dmxsync.c::dmxSyncBlockHandler" ref="aa5bb6eee83aba5bedf3c93fbb85af049" args="(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSyncBlockHandler </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>blockData</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">OSTimePtr&nbsp;</td>
+          <td class="paramname"> <em>pTimeout</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pReadMask</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Request an XSync() to the display used by <em>dmxScreen</em>. If <em>now</em> is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with <a class="el" href="dmxsync_8c.html#a7">dmxSyncActivate()</a> before <a class="el" href="dmxsync_8c.html#a8">dmxSyncInit()</a> was called, then no XSync() batching is performed and this function always calles XSync() immediately.<p>
-(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)<p>
-If <em>dmxScreen</em> is <em>NULL</em>, then all pending syncs will be flushed immediately.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxsync.c::dmxSyncActivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00060">dmxSyncTimer</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a00478eb7de1c84d98b41ca4c6d4b50e4"></a><!-- doxytag: member="dmxsync.c::dmxSyncCallback" ref="a00478eb7de1c84d98b41ca4c6d4b50e4" args="(OsTimerPtr timer, CARD32 time, pointer arg)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static CARD32 dmxSyncCallback </td>
+          <td>(</td>
+          <td class="paramtype">OsTimerPtr&nbsp;</td>
+          <td class="paramname"> <em>timer</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CARD32&nbsp;</td>
+          <td class="paramname"> <em>time</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSyncActivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>interval</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>arg</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxinit_8c_source.html#l00083">dmxNumScreens</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00061">dmxSyncPending</a>, and <a class="el" href="dmx_8h_source.html#l00183">_DMXScreenInfo::needsSync</a>.</p>
 
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0b349896e58d4291d712e31121fdc0ac"></a><!-- doxytag: member="dmxsync.c::dmxSyncInit" ref="a0b349896e58d4291d712e31121fdc0ac" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxSyncInit </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Request the XSync() batching optimization with the specified <em>interval</em> (in mS). If the <em>interval</em> is 0, 100mS is used. If the <em>interval</em> is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).<p>
-Note that the parameter to this routine is a string, since it will usually be called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a> in #dmxinit.c     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxsync.c::dmxSyncInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the XSync() batching optimization, but only if <a class="el" href="dmxsync_8h.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate</a> was last called with a non-negative value. </p>
+
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00096">dmxSyncBlockHandler()</a>, <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>, and <a class="el" href="dmxsync_8c_source.html#l00102">dmxSyncWakeupHandler()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9329ae45fff6668caaca1fb93792b0b9"></a><!-- doxytag: member="dmxsync.c::dmxSyncWakeupHandler" ref="a9329ae45fff6668caaca1fb93792b0b9" args="(pointer blockData, int result, pointer pReadMask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxSyncWakeupHandler </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>blockData</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>result</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSyncInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>pReadMask</em></td><td>&nbsp;</td>
         </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a01c45efcf0b2d9242b06e1e0fe42bd76"></a><!-- doxytag: member="dmxsync.c::dmxSyncInterval" ref="a01c45efcf0b2d9242b06e1e0fe42bd76" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxsync_8c.html#a01c45efcf0b2d9242b06e1e0fe42bd76">dmxSyncInterval</a> = 100<code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the XSync() batching optimization, but only if <a class="el" href="dmxsync_8h.html#a0">dmxSyncActivate</a> was last called with a non-negative value.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00115">dmxSyncActivate()</a>, and <a class="el" href="dmxsync_8c_source.html#l00124">dmxSyncInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6fb7fbcbe509b8ffb8637691925d46f2"></a><!-- doxytag: member="dmxsync.c::dmxSyncPending" ref="a6fb7fbcbe509b8ffb8637691925d46f2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="dmxsync_8c.html#a6fb7fbcbe509b8ffb8637691925d46f2">dmxSyncPending</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9466911712aef6631a5b88d1bcb1afad"></a><!-- doxytag: member="dmxsync.c::dmxSyncTimer" ref="a9466911712aef6631a5b88d1bcb1afad" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">OsTimerPtr <a class="el" href="dmxsync_8c.html#a9466911712aef6631a5b88d1bcb1afad">dmxSyncTimer</a><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxsync_8c_source.html#l00096">dmxSyncBlockHandler()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html
deleted file mode 100644
index a8c4f0d11..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxsync_8h-source.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxsync.h</h1><a href="dmxsync_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _DMXSYNC_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSYNC_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#a7">dmxSyncActivate</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *interval);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#a8">dmxSyncInit</a>(<span class="keywordtype">void</span>);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#a9">dmxSync</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now);
-00044 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h.html
index 53edcef9c..b5cbb77a3 100644
--- a/xorg-server/hw/dmx/doc/html/dmxsync_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxsync_8h.html
@@ -6,122 +6,117 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>dmxsync.h File Reference</h1>
-<p>
-<a href="dmxsync_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8h.html#a0">dmxSyncActivate</a> (const  char *interval)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8h.html#a1">dmxSyncInit</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxsync_8h.html#a2">dmxSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now)</td></tr>
-
+<p><a href="dmxsync_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8h.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate</a> (const char *interval)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8h.html#a0b349896e58d4291d712e31121fdc0ac">dmxSyncInit</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxsync_8h.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync</a> (<a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for sync support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxsync_8c.html">dmxsync.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxsync.h::dmxSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for sync support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxsync_8c.html">dmxsync.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ab848762f4d2e30d31b87d3e8e10c5967"></a><!-- doxytag: member="dmxsync.h::dmxSync" ref="ab848762f4d2e30d31b87d3e8e10c5967" args="(DMXScreenInfo *dmxScreen, Bool now)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dmxScreen</em>, </td>
+          <td class="memname">void dmxSync </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td>
+          <td class="paramname"> <em>dmxScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>now</em></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>now</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Request an XSync() to the display used by <em>dmxScreen</em>. If <em>now</em> is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with <a class="el" href="dmxsync_8c.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate()</a> before <a class="el" href="dmxsync_8c.html#a0b349896e58d4291d712e31121fdc0ac">dmxSyncInit()</a> was called, then no XSync() batching is performed and this function always calles XSync() immediately.</p>
+<p>(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)</p>
+<p>If <em>dmxScreen</em> is <em>NULL</em>, then all pending syncs will be flushed immediately. </p>
 
-<p>
-Request an XSync() to the display used by <em>dmxScreen</em>. If <em>now</em> is TRUE, call XSync() immediately instead of waiting for the next XSync() batching point. Note that if XSync() batching was deselected with <a class="el" href="dmxsync_8c.html#a7">dmxSyncActivate()</a> before <a class="el" href="dmxsync_8c.html#a8">dmxSyncInit()</a> was called, then no XSync() batching is performed and this function always calles XSync() immediately.<p>
-(Note that this function uses TimerSet but works correctly in the face of a server generation. See the source for details.)<p>
-If <em>dmxScreen</em> is <em>NULL</em>, then all pending syncs will be flushed immediately.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxsync.h::dmxSyncActivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxlog_8h_source.html#l00051">dmxFatal</a>, <a class="el" href="dmxscrinit_8c_source.html#l00067">dmxGeneration</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>, <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>, <a class="el" href="dmxsync_8c_source.html#l00061">dmxSyncPending</a>, <a class="el" href="dmxsync_8c_source.html#l00060">dmxSyncTimer</a>, <a class="el" href="dmx_8h_source.html#l00094">_DMXScreenInfo::name</a>, and <a class="el" href="dmx_8h_source.html#l00183">_DMXScreenInfo::needsSync</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00468">dmxBackendProcessInput()</a>, <a class="el" href="dmxbackend_8c_source.html#l00240">dmxBackendUpdatePosition()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxfont_8c_source.html#l00147">dmxCheckFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxcommon_8c_source.html#l00479">dmxCommonMouOn()</a>, <a class="el" href="dmxcommon_8c_source.html#l00567">dmxCommonSaveState()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00831">dmxDestroyPicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxextension_8c_source.html#l00292">dmxFlushPendingSyncs()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae0a769161d6f8d88067a9cac16f9cf6f"></a><!-- doxytag: member="dmxsync.h::dmxSyncActivate" ref="ae0a769161d6f8d88067a9cac16f9cf6f" args="(const char *interval)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSyncActivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>interval</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSyncActivate </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>interval</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Request the XSync() batching optimization with the specified <em>interval</em> (in mS). If the <em>interval</em> is 0, 100mS is used. If the <em>interval</em> is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).</p>
+<p>Note that the parameter to this routine is a string, since it will usually be called from <a class="el" href="dmxinit_8c.html#a6ed0a235a6d852bfe0cc0250159a5daf">ddxProcessArgument</a> in <em><a class="el" href="dmxinit_8c.html">dmxinit.c</a></em> </p>
 
-<p>
-Request the XSync() batching optimization with the specified <em>interval</em> (in mS). If the <em>interval</em> is 0, 100mS is used. If the <em>interval</em> is less than 0, then the XSync() batching optimization is not requested (e.g., so the -syncbatch -1 command line option can turn off the default 100mS XSync() batching).<p>
-Note that the parameter to this routine is a string, since it will usually be called from <a class="el" href="dmxinit_8c.html#a40">ddxProcessArgument</a> in #dmxinit.c     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxsync.h::dmxSyncInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00878">ddxProcessArgument()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0b349896e58d4291d712e31121fdc0ac"></a><!-- doxytag: member="dmxsync.h::dmxSyncInit" ref="a0b349896e58d4291d712e31121fdc0ac" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSyncInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSyncInit </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize the XSync() batching optimization, but only if <a class="el" href="dmxsync_8h.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate</a> was last called with a non-negative value. </p>
 
-<p>
-Initialize the XSync() batching optimization, but only if <a class="el" href="dmxsync_8h.html#a0">dmxSyncActivate</a> was last called with a non-negative value.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmxlog_8h_source.html#l00044">dmxInfo</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxsync_8c_source.html#l00096">dmxSyncBlockHandler()</a>, <a class="el" href="dmxsync_8c_source.html#l00059">dmxSyncInterval</a>, and <a class="el" href="dmxsync_8c_source.html#l00102">dmxSyncWakeupHandler()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html
new file mode 100644
index 000000000..427a32677
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxsync_8h_source.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxsync.h</h1><a href="dmxsync_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _DMXSYNC_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _DMXSYNC_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#ae0a769161d6f8d88067a9cac16f9cf6f">dmxSyncActivate</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *interval);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#a0b349896e58d4291d712e31121fdc0ac">dmxSyncInit</a>(<span class="keywordtype">void</span>);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync</a>(<a class="code" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *dmxScreen, Bool now);
+<a name="l00043"></a>00043 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html
index a0f20c462..5394adea1 100644
--- a/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8c.html
@@ -6,137 +6,132 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxvisual.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxvisual_8h-source.html">dmxvisual.h</a>"</code><br>
-<code>#include "scrnintstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Visual *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8c.html#a0">dmxLookupVisual</a> (ScreenPtr pScreen, VisualPtr pVisual)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Visual *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8c.html#a1">dmxLookupVisualFromID</a> (ScreenPtr pScreen, VisualID vid)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Colormap&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8c.html#a2">dmxColormapFromDefaultVisual</a> (ScreenPtr pScreen, Visual *visual)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxvisual.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxvisual_8h_source.html">dmxvisual.h</a>&quot;</code><br/>
+<code>#include &quot;scrnintstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Visual *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8c.html#a5adae45cafd52da17108cbfcdbd5d53c">dmxLookupVisual</a> (ScreenPtr pScreen, VisualPtr pVisual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Visual *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8c.html#a1abfce5d0ad66062cc75a5293c514499">dmxLookupVisualFromID</a> (ScreenPtr pScreen, VisualID vid)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Colormap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8c.html#aca13684e9357c96035388a924d8af570">dmxColormapFromDefaultVisual</a> (ScreenPtr pScreen, Visual *visual)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for visuals.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxvisual.c::dmxColormapFromDefaultVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for visuals. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aca13684e9357c96035388a924d8af570"></a><!-- doxytag: member="dmxvisual.c::dmxColormapFromDefaultVisual" ref="aca13684e9357c96035388a924d8af570" args="(ScreenPtr pScreen, Visual *visual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Colormap dmxColormapFromDefaultVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Colormap dmxColormapFromDefaultVisual </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Visual *&nbsp;</td>
-          <td class="mdname" nowrap> <em>visual</em></td>
+          <td class="paramtype">Visual *&nbsp;</td>
+          <td class="paramname"> <em>visual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the colormap for the <em>visual</em>. </p>
 
-<p>
-Return the colormap for the <em>visual</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxvisual.c::dmxLookupVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5adae45cafd52da17108cbfcdbd5d53c"></a><!-- doxytag: member="dmxvisual.c::dmxLookupVisual" ref="a5adae45cafd52da17108cbfcdbd5d53c" args="(ScreenPtr pScreen, VisualPtr pVisual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Visual* dmxLookupVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Visual* dmxLookupVisual </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>VisualPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pVisual</em></td>
+          <td class="paramtype">VisualPtr&nbsp;</td>
+          <td class="paramname"> <em>pVisual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the visual that matched <em>pVisual</em>. </p>
 
-<p>
-Return the visual that matched <em>pVisual</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxvisual.c::dmxLookupVisualFromID" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, and <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1abfce5d0ad66062cc75a5293c514499"></a><!-- doxytag: member="dmxvisual.c::dmxLookupVisualFromID" ref="a1abfce5d0ad66062cc75a5293c514499" args="(ScreenPtr pScreen, VisualID vid)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Visual* dmxLookupVisualFromID </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Visual* dmxLookupVisualFromID </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>VisualID&nbsp;</td>
-          <td class="mdname" nowrap> <em>vid</em></td>
+          <td class="paramtype">VisualID&nbsp;</td>
+          <td class="paramname"> <em>vid</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the visual that matched the <em>vid</em>. </p>
 
-<p>
-Return the visual that matched the <em>vid</em>.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html
deleted file mode 100644
index cda02947e..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxvisual_8h-source.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxvisual.h</h1><a href="dmxvisual_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXVISUAL_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXVISUAL_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "scrnintstr.h"</span>
-00042 
-00043 <span class="keyword">extern</span> Visual   *<a class="code" href="dmxvisual_8c.html#a0">dmxLookupVisual</a>(ScreenPtr pScreen, VisualPtr pVisual);
-00044 <span class="keyword">extern</span> Visual   *<a class="code" href="dmxvisual_8c.html#a1">dmxLookupVisualFromID</a>(ScreenPtr pScreen, VisualID vid);
-00045 <span class="keyword">extern</span> Colormap  <a class="code" href="dmxvisual_8c.html#a2">dmxColormapFromDefaultVisual</a>(ScreenPtr pScreen,
-00046                                               Visual *visual);
-00047 
-00048 <span class="preprocessor">#endif </span><span class="comment">/* DMXVISUAL_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html
index d56bb1c9a..6300da7e7 100644
--- a/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8h.html
@@ -6,138 +6,133 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxvisual.h File Reference</h1><code>#include "scrnintstr.h"</code><br>
-
-<p>
-<a href="dmxvisual_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Visual *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8h.html#a0">dmxLookupVisual</a> (ScreenPtr pScreen, VisualPtr pVisual)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Visual *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8h.html#a1">dmxLookupVisualFromID</a> (ScreenPtr pScreen, VisualID vid)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Colormap&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxvisual_8h.html#a2">dmxColormapFromDefaultVisual</a> (ScreenPtr pScreen, Visual *visual)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxvisual.h File Reference</h1><code>#include &quot;scrnintstr.h&quot;</code><br/>
 
+<p><a href="dmxvisual_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Visual *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8h.html#a5adae45cafd52da17108cbfcdbd5d53c">dmxLookupVisual</a> (ScreenPtr pScreen, VisualPtr pVisual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Visual *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8h.html#a1abfce5d0ad66062cc75a5293c514499">dmxLookupVisualFromID</a> (ScreenPtr pScreen, VisualID vid)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Colormap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxvisual_8h.html#aca13684e9357c96035388a924d8af570">dmxColormapFromDefaultVisual</a> (ScreenPtr pScreen, Visual *visual)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for visual support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxvisual_8c.html">dmxvisual.c</a></dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="dmxvisual.h::dmxColormapFromDefaultVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for visual support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxvisual_8c.html">dmxvisual.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="aca13684e9357c96035388a924d8af570"></a><!-- doxytag: member="dmxvisual.h::dmxColormapFromDefaultVisual" ref="aca13684e9357c96035388a924d8af570" args="(ScreenPtr pScreen, Visual *visual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Colormap dmxColormapFromDefaultVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Colormap dmxColormapFromDefaultVisual </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Visual *&nbsp;</td>
-          <td class="mdname" nowrap> <em>visual</em></td>
+          <td class="paramtype">Visual *&nbsp;</td>
+          <td class="paramname"> <em>visual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the colormap for the <em>visual</em>. </p>
 
-<p>
-Return the colormap for the <em>visual</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="dmxvisual.h::dmxLookupVisual" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00118">_DMXScreenInfo::beDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00117">_DMXScreenInfo::beNumDefColormaps</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5adae45cafd52da17108cbfcdbd5d53c"></a><!-- doxytag: member="dmxvisual.h::dmxLookupVisual" ref="a5adae45cafd52da17108cbfcdbd5d53c" args="(ScreenPtr pScreen, VisualPtr pVisual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Visual* dmxLookupVisual </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Visual* dmxLookupVisual </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>VisualPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pVisual</em></td>
+          <td class="paramtype">VisualPtr&nbsp;</td>
+          <td class="paramname"> <em>pVisual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the visual that matched <em>pVisual</em>. </p>
 
-<p>
-Return the visual that matched <em>pVisual</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxvisual.h::dmxLookupVisualFromID" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00113">_DMXScreenInfo::beNumVisuals</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, and <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1abfce5d0ad66062cc75a5293c514499"></a><!-- doxytag: member="dmxvisual.h::dmxLookupVisualFromID" ref="a1abfce5d0ad66062cc75a5293c514499" args="(ScreenPtr pScreen, VisualID vid)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Visual* dmxLookupVisualFromID </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">Visual* dmxLookupVisualFromID </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>VisualID&nbsp;</td>
-          <td class="mdname" nowrap> <em>vid</em></td>
+          <td class="paramtype">VisualID&nbsp;</td>
+          <td class="paramname"> <em>vid</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Return the visual that matched the <em>vid</em>. </p>
 
-<p>
-Return the visual that matched the <em>vid</em>.     </td>
-  </tr>
-</table>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html
new file mode 100644
index 000000000..a9801de68
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxvisual_8h_source.html
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxvisual.h</h1><a href="dmxvisual_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXVISUAL_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXVISUAL_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;scrnintstr.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00042"></a>00042 <span class="keyword">extern</span> Visual   *<a class="code" href="dmxvisual_8c.html#a5adae45cafd52da17108cbfcdbd5d53c">dmxLookupVisual</a>(ScreenPtr pScreen, VisualPtr pVisual);
+<a name="l00043"></a>00043 <span class="keyword">extern</span> Visual   *<a class="code" href="dmxvisual_8c.html#a1abfce5d0ad66062cc75a5293c514499">dmxLookupVisualFromID</a>(ScreenPtr pScreen, VisualID vid);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> Colormap  <a class="code" href="dmxvisual_8c.html#aca13684e9357c96035388a924d8af570">dmxColormapFromDefaultVisual</a>(ScreenPtr pScreen,
+<a name="l00045"></a>00045                                               Visual *visual);
+<a name="l00046"></a>00046 
+<a name="l00047"></a>00047 <span class="preprocessor">#endif </span><span class="comment">/* DMXVISUAL_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html
index ef3509d3c..968515b1e 100644
--- a/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8c.html
@@ -6,851 +6,851 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxwindow.c File Reference</h1><code>#include "<a class="el" href="dmx_8h-source.html">dmx.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxsync_8h-source.html">dmxsync.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxvisual_8h-source.html">dmxvisual.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>"</code><br>
-<code>#include "windowstr.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a3">dmxInitWindow</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a5">dmxResizeScreenWindow</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a6">dmxResizeRootWindow</a> (WindowPtr pRoot, int x, int y, int w, int h)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow</a> (WindowPtr pWindow, Bool doSync)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a10">dmxCreateWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a11">dmxBEDestroyWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a12">dmxDestroyWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a13">dmxPositionWindow</a> (WindowPtr pWindow, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a14">dmxChangeWindowAttributes</a> (WindowPtr pWindow, unsigned long mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a15">dmxRealizeWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a16">dmxUnrealizeWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a17">dmxRestackWindow</a> (WindowPtr pWindow, WindowPtr pOldNextSib)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a19">dmxWindowExposures</a> (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a20">dmxPaintWindowBackground</a> (WindowPtr pWindow, RegionPtr pRegion, int what)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a21">dmxPaintWindowBorder</a> (WindowPtr pWindow, RegionPtr pRegion, int what)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a22">dmxCopyWindow</a> (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a23">dmxResizeWindow</a> (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a24">dmxReparentWindow</a> (WindowPtr pWindow, WindowPtr pPriorParent)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a25">dmxChangeBorderWidth</a> (WindowPtr pWindow, unsigned int width)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxwindow.c File Reference</h1><code>#include &quot;<a class="el" href="dmx_8h_source.html">dmx.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxsync_8h_source.html">dmxsync.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxvisual_8h_source.html">dmxvisual.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&quot;</code><br/>
+<code>#include &quot;windowstr.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#aa3d29fd7e2f88855318fbc5cb739e1b9">dmxDoRestackWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a8d5f02a09348890a468a08464becbac3">dmxDoChangeWindowAttributes</a> (WindowPtr pWindow, unsigned long *mask, XSetWindowAttributes *attribs)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#acf115ae2724d655dd75267f8b96f1986">dmxDoSetShape</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ad1c1a5296c1ef99d4dd829108903b21f">dmxInitWindow</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a5296d023014ce3d69c04557431785923">dmxCreateRootWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#af96b8583264e78a4c693c6f7ee887067">dmxResizeScreenWindow</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a817739d4921329f1cf71f2af6fcacfc2">dmxResizeRootWindow</a> (WindowPtr pRoot, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ab8f054330062393aa409a31ec692cf0d">dmxGetDefaultWindowAttributes</a> (WindowPtr pWindow, Colormap *cmap, Visual **visual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a85749ac991a90590437409977222d827">dmxCreateNonRootWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow</a> (WindowPtr pWindow, Bool doSync)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#aebb0ce7ac51645832a20c7d6a7d21d9c">dmxCreateWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a978ad158f0c814ca10dc965c5f7b74c2">dmxBEDestroyWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a25a0aafd36f68137e67a3e6d95b78f53">dmxDestroyWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#adba873c51adf03b8af700c67fc6fba9b">dmxPositionWindow</a> (WindowPtr pWindow, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ae6f0ba304627ea760df9e9c53f7bbae6">dmxChangeWindowAttributes</a> (WindowPtr pWindow, unsigned long mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ac75f5d6332a78eeac4e0e185cf326045">dmxRealizeWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#aeab9f468cc2c9374658213ee90a234a0">dmxUnrealizeWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a21e147f295faee8e53eb162071dc66ad">dmxRestackWindow</a> (WindowPtr pWindow, WindowPtr pOldNextSib)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a2d44bd3ba7edbd43508cca91982ce572">dmxWindowExposurePredicate</a> (Display *dpy, XEvent *ev, XPointer ptr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a02a6991e5248012e287fe4be3a985926">dmxWindowExposures</a> (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ad78bdba42db62285cf174f072a63a81a">dmxCopyWindow</a> (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ac3811e381fef200b5cd3207478df66e1">dmxResizeWindow</a> (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#ab07d7010858aa078f26396f420fdea8c">dmxReparentWindow</a> (WindowPtr pWindow, WindowPtr pPriorParent)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a5d63a05eab33981615afdf523a44c697">dmxChangeBorderWidth</a> (WindowPtr pWindow, unsigned int width)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8c.html#a591148aca36f482e01bd25de677b9689">dmxSetShape</a> (WindowPtr pWindow)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file provides support for window-related functions. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a978ad158f0c814ca10dc965c5f7b74c2"></a><!-- doxytag: member="dmxwindow.c::dmxBEDestroyWindow" ref="a978ad158f0c814ca10dc965c5f7b74c2" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEDestroyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy <em>pWindow</em> on the back-end server. </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8c.html#a26">dmxSetShape</a> (WindowPtr pWindow)</td></tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file provides support for window-related functions.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11" doxytag="dmxwindow.c::dmxBEDestroyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEDestroyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxwindow.c::dmxChangeBorderWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a5d63a05eab33981615afdf523a44c697"></a><!-- doxytag: member="dmxwindow.c::dmxChangeBorderWidth" ref="a5d63a05eab33981615afdf523a44c697" args="(WindowPtr pWindow, unsigned int width)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeBorderWidth </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxChangeBorderWidth </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>width</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change border width for <em>pWindow</em> to <em>width</em> pixels.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxwindow.c::dmxChangeWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change border width for <em>pWindow</em> to <em>width</em> pixels. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae6f0ba304627ea760df9e9c53f7bbae6"></a><!-- doxytag: member="dmxwindow.c::dmxChangeWindowAttributes" ref="ae6f0ba304627ea760df9e9c53f7bbae6" args="(WindowPtr pWindow, unsigned long mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxChangeWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">Bool dmxChangeWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the window attributes of <em>pWindow</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxwindow.c::dmxCopyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the window attributes of <em>pWindow</em>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad78bdba42db62285cf174f072a63a81a"></a><!-- doxytag: member="dmxwindow.c::dmxCopyWindow" ref="ad78bdba42db62285cf174f072a63a81a" args="(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxCopyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointRec&nbsp;</td>
-          <td class="mdname" nowrap> <em>ptOldOrg</em>, </td>
+          <td class="paramtype">DDXPointRec&nbsp;</td>
+          <td class="paramname"> <em>ptOldOrg</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>prgnSrc</em></td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>prgnSrc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Move <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="dmxwindow.c::dmxCreateAndRealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Move <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00060">DMX_UPDATE_COPY</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afefa2121a2898700d285e77730a52c4d"></a><!-- doxytag: member="dmxwindow.c::dmxCreateAndRealizeWindow" ref="afefa2121a2898700d285e77730a52c4d" args="(WindowPtr pWindow, Bool doSync)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCreateAndRealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxCreateAndRealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>doSync</em></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>doSync</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function handles lazy window creation and realization. Window creation is handled by <a class="el" href="dmxwindow_8c.html#a8">dmxCreateNonRootWindow()</a>. It also handles any stacking changes that have occured since the window was originally created by calling <a class="el" href="dmxwindow_8c.html#a0">dmxDoRestackWindow()</a>. If the window is shaped, the shape is set on the back-end server by calling <a class="el" href="dmxwindow_8c.html#a2">dmxDoSetShape()</a>, and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling <a class="el" href="dmxpict_8c.html#a18">dmxCreatePictureList()</a>. If <em>doSync</em> is TRUE, then <a class="el" href="dmxsync_8c.html#a9">dmxSync()</a> is called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="dmxwindow.c::dmxCreateWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>This function handles lazy window creation and realization. Window creation is handled by <a class="el" href="dmxwindow_8c.html#a85749ac991a90590437409977222d827">dmxCreateNonRootWindow()</a>. It also handles any stacking changes that have occured since the window was originally created by calling <a class="el" href="dmxwindow_8c.html#aa3d29fd7e2f88855318fbc5cb739e1b9">dmxDoRestackWindow()</a>. If the window is shaped, the shape is set on the back-end server by calling <a class="el" href="dmxwindow_8c.html#acf115ae2724d655dd75267f8b96f1986">dmxDoSetShape()</a>, and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling <a class="el" href="dmxpict_8c.html#a8c52091268b0f77d74d3a097b396abcf">dmxCreatePictureList()</a>. If <em>doSync</em> is TRUE, then <a class="el" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync()</a> is called. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00740">dmxCreatePictureList()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00053">_dmxWinPriv::hasPict</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l00285">dmxForceWindowCreation()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a85749ac991a90590437409977222d827"></a><!-- doxytag: member="dmxwindow.c::dmxCreateNonRootWindow" ref="a85749ac991a90590437409977222d827" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static Window dmxCreateNonRootWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by <a class="el" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="dmxwindow.c::dmxDestroyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00049">_dmxWinPriv::cmap</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, <a class="el" href="dmxwindow_8h_source.html#l00050">_dmxWinPriv::visual</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5296d023014ce3d69c04557431785923"></a><!-- doxytag: member="dmxwindow.c::dmxCreateRootWindow" ref="a5296d023014ce3d69c04557431785923" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Window dmxCreateRootWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pWindow</em> on the back-end server. If any RENDER pictures were created, destroy them as well.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxwindow.c::dmxInitWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aebb0ce7ac51645832a20c7d6a7d21d9c"></a><!-- doxytag: member="dmxwindow.c::dmxCreateWindow" ref="aebb0ce7ac51645832a20c7d6a7d21d9c" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxCreateWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by <a class="el" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow()</a>. </p>
 
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00049">_dmxWinPriv::cmap</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00100">dmxLazyWindowCreation</a>, <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>, <a class="el" href="dmxwindow_8h_source.html#l00053">_dmxWinPriv::hasPict</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00141">_DMXScreenInfo::rootWin</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmxwindow_8h_source.html#l00050">_dmxWinPriv::visual</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25a0aafd36f68137e67a3e6d95b78f53"></a><!-- doxytag: member="dmxwindow.c::dmxDestroyWindow" ref="a25a0aafd36f68137e67a3e6d95b78f53" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxDestroyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the private area for the window functions.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxwindow.c::dmxPaintWindowBackground" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy <em>pWindow</em> on the back-end server. If any RENDER pictures were created, destroy them as well. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00815">dmxDestroyPictureList()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8d5f02a09348890a468a08464becbac3"></a><!-- doxytag: member="dmxwindow.c::dmxDoChangeWindowAttributes" ref="a8d5f02a09348890a468a08464becbac3" args="(WindowPtr pWindow, unsigned long *mask, XSetWindowAttributes *attribs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPaintWindowBackground </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">static void dmxDoChangeWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRegion</em>, </td>
+          <td class="paramtype">unsigned long *&nbsp;</td>
+          <td class="paramname"> <em>mask</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>what</em></td>
+          <td class="paramtype">XSetWindowAttributes *&nbsp;</td>
+          <td class="paramname"> <em>attribs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxpixmap_8h_source.html#l00064">DMX_GET_PIXMAP_PRIV</a>, and <a class="el" href="dmxpixmap_8h_source.html#l00044">_dmxPixPriv::pixmap</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa3d29fd7e2f88855318fbc5cb739e1b9"></a><!-- doxytag: member="dmxwindow.c::dmxDoRestackWindow" ref="aa3d29fd7e2f88855318fbc5cb739e1b9" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDoRestackWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Paint background of <em>pWindow</em> in <em>pRegion</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxwindow.c::dmxPaintWindowBorder" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acf115ae2724d655dd75267f8b96f1986"></a><!-- doxytag: member="dmxwindow.c::dmxDoSetShape" ref="acf115ae2724d655dd75267f8b96f1986" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void dmxDoSetShape </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab8f054330062393aa409a31ec692cf0d"></a><!-- doxytag: member="dmxwindow.c::dmxGetDefaultWindowAttributes" ref="ab8f054330062393aa409a31ec692cf0d" args="(WindowPtr pWindow, Colormap *cmap, Visual **visual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPaintWindowBorder </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxGetDefaultWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRegion</em>, </td>
+          <td class="paramtype">Colormap *&nbsp;</td>
+          <td class="paramname"> <em>cmap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>what</em></td>
+          <td class="paramtype">Visual **&nbsp;</td>
+          <td class="paramname"> <em>visual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, and <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad1c1a5296c1ef99d4dd829108903b21f"></a><!-- doxytag: member="dmxwindow.c::dmxInitWindow" ref="ad1c1a5296c1ef99d4dd829108903b21f" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxInitWindow </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Paint window border for <em>pWindow</em> in <em>pRegion</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="dmxwindow.c::dmxPositionWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the private area for the window functions. </p>
+
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00073">dmxWinPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adba873c51adf03b8af700c67fc6fba9b"></a><!-- doxytag: member="dmxwindow.c::dmxPositionWindow" ref="adba873c51adf03b8af700c67fc6fba9b" args="(WindowPtr pWindow, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxPositionWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">Bool dmxPositionWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the position of <em>pWindow</em> to be <em>x</em>, <em>y</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxwindow.c::dmxRealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the position of <em>pWindow</em> to be <em>x</em>, <em>y</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac75f5d6332a78eeac4e0e185cf326045"></a><!-- doxytag: member="dmxwindow.c::dmxRealizeWindow" ref="ac75f5d6332a78eeac4e0e185cf326045" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxRealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxRealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Realize <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxwindow.c::dmxReparentWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Realize <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00057">DMX_UPDATE_REALIZE</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab07d7010858aa078f26396f420fdea8c"></a><!-- doxytag: member="dmxwindow.c::dmxReparentWindow" ref="ab07d7010858aa078f26396f420fdea8c" args="(WindowPtr pWindow, WindowPtr pPriorParent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxReparentWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxReparentWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPriorParent</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pPriorParent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reparent <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxwindow.c::dmxResizeRootWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Reparent <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00062">DMX_UPDATE_REPARENT</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a817739d4921329f1cf71f2af6fcacfc2"></a><!-- doxytag: member="dmxwindow.c::dmxResizeRootWindow" ref="a817739d4921329f1cf71f2af6fcacfc2" args="(WindowPtr pRoot, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeRootWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRoot</em>, </td>
+          <td class="memname">void dmxResizeRootWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pRoot</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the location and size of the "root" window. Called from #dmxReconfigureRootWindow().     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxwindow.c::dmxResizeScreenWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the location and size of the "root" window. Called from dmxConfigureRootWindow. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af96b8583264e78a4c693c6f7ee887067"></a><!-- doxytag: member="dmxwindow.c::dmxResizeScreenWindow" ref="af96b8583264e78a4c693c6f7ee887067" args="(ScreenPtr pScreen, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeScreenWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxResizeScreenWindow </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the location and size of the "screen" window. Called from #dmxReconfigureScreenWindow().     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxwindow.c::dmxResizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the location and size of the "screen" window. Called from dmxConfigureScreenWindow(). </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3811e381fef200b5cd3207478df66e1"></a><!-- doxytag: member="dmxwindow.c::dmxResizeWindow" ref="ac3811e381fef200b5cd3207478df66e1" args="(WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxResizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSib</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pSib</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Resize <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxwindow.c::dmxRestackWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Resize <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00061">DMX_UPDATE_RESIZE</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a21e147f295faee8e53eb162071dc66ad"></a><!-- doxytag: member="dmxwindow.c::dmxRestackWindow" ref="a21e147f295faee8e53eb162071dc66ad" args="(WindowPtr pWindow, WindowPtr pOldNextSib)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxRestackWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxRestackWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pOldNextSib</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pOldNextSib</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle window restacking. The actual restacking occurs in <a class="el" href="dmxwindow_8c.html#a0">dmxDoRestackWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxwindow.c::dmxSetShape" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Handle window restacking. The actual restacking occurs in <a class="el" href="dmxwindow_8c.html#aa3d29fd7e2f88855318fbc5cb739e1b9">dmxDoRestackWindow()</a>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00059">DMX_UPDATE_RESTACK</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a591148aca36f482e01bd25de677b9689"></a><!-- doxytag: member="dmxwindow.c::dmxSetShape" ref="a591148aca36f482e01bd25de677b9689" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetShape </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSetShape </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set shape of <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxwindow.c::dmxUnrealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set shape of <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aeab9f468cc2c9374658213ee90a234a0"></a><!-- doxytag: member="dmxwindow.c::dmxUnrealizeWindow" ref="aeab9f468cc2c9374658213ee90a234a0" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxUnrealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxUnrealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Unrealize <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxwindow.c::dmxWindowExposures" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Unrealize <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00058">DMX_UPDATE_UNREALIZE</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d44bd3ba7edbd43508cca91982ce572"></a><!-- doxytag: member="dmxwindow.c::dmxWindowExposurePredicate" ref="a2d44bd3ba7edbd43508cca91982ce572" args="(Display *dpy, XEvent *ev, XPointer ptr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxWindowExposures </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">static Bool dmxWindowExposurePredicate </td>
+          <td>(</td>
+          <td class="paramtype">Display *&nbsp;</td>
+          <td class="paramname"> <em>dpy</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">XEvent *&nbsp;</td>
+          <td class="paramname"> <em>ev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>prgn</em>, </td>
+          <td class="paramtype">XPointer&nbsp;</td>
+          <td class="paramname"> <em>ptr</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a02a6991e5248012e287fe4be3a985926"></a><!-- doxytag: member="dmxwindow.c::dmxWindowExposures" ref="a02a6991e5248012e287fe4be3a985926" args="(WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void dmxWindowExposures </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>other_exposed</em></td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>prgn</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>other_exposed</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle exposures on <em>pWindow</em>. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Handle exposures on <em>pWindow</em>. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8c_source.html#l00750">dmxWindowExposurePredicate()</a>, <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html
deleted file mode 100644
index a1bbda691..000000000
--- a/xorg-server/hw/dmx/doc/html/dmxwindow_8h-source.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxwindow.h</h1><a href="dmxwindow_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef DMXWINDOW_H</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define DMXWINDOW_H</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="preprocessor">#include "windowstr.h"</span>
-00042 
-<a name="l00044"></a><a class="code" href="struct__dmxWinPriv.html">00044</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxWinPriv.html">_dmxWinPriv</a> {
-00045     Window         window;
-00046     Bool           offscreen;
-00047     Bool           mapped;
-00048     Bool           restacked;
-00049     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>  attribMask;
-00050     Colormap       cmap;
-00051     Visual        *visual;
-00052 <span class="preprocessor">#ifdef SHAPE</span>
-00053 <span class="preprocessor"></span>    Bool           isShaped;
-00054 <span class="preprocessor">#endif</span>
-00055 <span class="preprocessor"></span><span class="preprocessor">#ifdef RENDER</span>
-00056 <span class="preprocessor"></span>    Bool           hasPict;
-00057 <span class="preprocessor">#endif</span>
-00058 <span class="preprocessor"></span><span class="preprocessor">#ifdef GLXEXT</span>
-00059 <span class="preprocessor"></span>    <span class="keywordtype">void</span>          *swapGroup;
-00060     <span class="keywordtype">int</span>            barrier;
-00061     void         (*windowDestroyed)(WindowPtr);
-00062     void         (*windowUnmapped)(WindowPtr);
-00063 <span class="preprocessor">#endif</span>
-00064 <span class="preprocessor"></span>} <a class="code" href="struct__dmxWinPriv.html">dmxWinPrivRec</a>, *<a class="code" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>;
-00065 
-00066 
-00067 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a3">dmxInitWindow</a>(ScreenPtr pScreen);
-00068 
-00069 <span class="keyword">extern</span> Window dmxCreateRootWindow(WindowPtr pWindow);
-00070 
-00071 <span class="keyword">extern</span> <span class="keywordtype">void</span> dmxGetDefaultWindowAttributes(WindowPtr pWindow,
-00072                                           Colormap *cmap,
-00073                                           Visual **visual);
-00074 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow</a>(WindowPtr pWindow, Bool doSync);
-00075 
-00076 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a10">dmxCreateWindow</a>(WindowPtr pWindow);
-00077 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a12">dmxDestroyWindow</a>(WindowPtr pWindow);
-00078 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a13">dmxPositionWindow</a>(WindowPtr pWindow, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
-00079 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a14">dmxChangeWindowAttributes</a>(WindowPtr pWindow, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> mask);
-00080 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a15">dmxRealizeWindow</a>(WindowPtr pWindow);
-00081 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a16">dmxUnrealizeWindow</a>(WindowPtr pWindow);
-00082 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a17">dmxRestackWindow</a>(WindowPtr pWindow, WindowPtr pOldNextSib);
-00083 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a19">dmxWindowExposures</a>(WindowPtr pWindow, RegionPtr prgn,
-00084                                RegionPtr other_exposed);
-00085 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a20">dmxPaintWindowBackground</a>(WindowPtr pWindow, RegionPtr pRegion,
-00086                                      <span class="keywordtype">int</span> what);
-00087 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a21">dmxPaintWindowBorder</a>(WindowPtr pWindow, RegionPtr pRegion,
-00088                                  <span class="keywordtype">int</span> what);
-00089 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a22">dmxCopyWindow</a>(WindowPtr pWindow, DDXPointRec ptOldOrg,
-00090                           RegionPtr prgnSrc);
-00091 
-00092 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a23">dmxResizeWindow</a>(WindowPtr pWindow, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y,
-00093                             <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> w, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> h, WindowPtr pSib);
-00094 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a24">dmxReparentWindow</a>(WindowPtr pWindow, WindowPtr pPriorParent);
-00095 
-00096 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a25">dmxChangeBorderWidth</a>(WindowPtr pWindow, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> width);
-00097 
-00098 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a5">dmxResizeScreenWindow</a>(ScreenPtr pScreen,
-00099                                   <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
-00100 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a6">dmxResizeRootWindow</a>(WindowPtr pRoot,
-00101                                 <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
-00102 
-00103 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a11">dmxBEDestroyWindow</a>(WindowPtr pWindow);
-00104 
-00105 <span class="preprocessor">#ifdef SHAPE</span>
-00106 <span class="preprocessor"></span><span class="comment">/* Support for shape extension */</span>
-00107 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a26">dmxSetShape</a>(WindowPtr pWindow);
-00108 <span class="preprocessor">#endif</span>
-00109 <span class="preprocessor"></span>
-<a name="l00111"></a><a class="code" href="dmxwindow_8h.html#a10">00111</a> <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="dmxscrinit_8c.html#a3">dmxWinPrivateIndex</a>;
-00112 
-<a name="l00114"></a><a class="code" href="dmxwindow_8h.html#a0">00114</a> <span class="preprocessor">#define DMX_GET_WINDOW_PRIV(_pWin)                                      \</span>
-00115 <span class="preprocessor">    ((dmxWinPrivPtr)(_pWin)-&gt;devPrivates[dmxWinPrivateIndex].ptr)</span>
-00116 <span class="preprocessor"></span>
-00117 <span class="comment">/* All of these macros are only used in dmxwindow.c */</span>
-00118 <span class="preprocessor">#define DMX_WINDOW_FUNC_PROLOGUE(_pGC)                                  \</span>
-00119 <span class="preprocessor">do {                                                                    \</span>
-00120 <span class="preprocessor">    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \</span>
-00121 <span class="preprocessor">    DMX_UNWRAP(funcs, pGCPriv, (_pGC));                                 \</span>
-00122 <span class="preprocessor">    if (pGCPriv-&gt;ops)                                                   \</span>
-00123 <span class="preprocessor">        DMX_UNWRAP(ops, pGCPriv, (_pGC));                               \</span>
-00124 <span class="preprocessor">} while (0)</span>
-00125 <span class="preprocessor"></span>
-00126 <span class="preprocessor">#define DMX_WINDOW_FUNC_EPILOGUE(_pGC)                                  \</span>
-00127 <span class="preprocessor">do {                                                                    \</span>
-00128 <span class="preprocessor">    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \</span>
-00129 <span class="preprocessor">    DMX_WRAP(funcs, &amp;dmxGCFuncs, pGCPriv, (_pGC));                      \</span>
-00130 <span class="preprocessor">    if (pGCPriv-&gt;ops)                                                   \</span>
-00131 <span class="preprocessor">        DMX_WRAP(ops, &amp;dmxGCOps, pGCPriv, (_pGC));                      \</span>
-00132 <span class="preprocessor">} while (0)</span>
-00133 <span class="preprocessor"></span>
-00134 <span class="preprocessor">#define DMX_WINDOW_X1(_pWin)                                            \</span>
-00135 <span class="preprocessor">    ((_pWin)-&gt;drawable.x - wBorderWidth(_pWin))</span>
-00136 <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_Y1(_pWin)                                            \</span>
-00137 <span class="preprocessor">    ((_pWin)-&gt;drawable.y - wBorderWidth(_pWin))</span>
-00138 <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_X2(_pWin)                                            \</span>
-00139 <span class="preprocessor">    ((_pWin)-&gt;drawable.x + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.width) </span>
-00140 <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_Y2(_pWin)                                            \</span>
-00141 <span class="preprocessor">    ((_pWin)-&gt;drawable.y + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.height) </span>
-00142 <span class="preprocessor"></span>
-00143 <span class="preprocessor">#define DMX_WINDOW_OFFSCREEN(_pWin)                                     \</span>
-00144 <span class="preprocessor">    (DMX_WINDOW_X1(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;width  ||       \</span>
-00145 <span class="preprocessor">     DMX_WINDOW_Y1(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;height ||       \</span>
-00146 <span class="preprocessor">     DMX_WINDOW_X2(_pWin) &lt;= 0                                 ||       \</span>
-00147 <span class="preprocessor">     DMX_WINDOW_Y2(_pWin) &lt;= 0)</span>
-00148 <span class="preprocessor"></span>
-00149 <span class="preprocessor">#endif </span><span class="comment">/* DMXWINDOW_H */</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html
index f80aae3c3..e1d7e2683 100644
--- a/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8h.html
@@ -6,955 +6,935 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxwindow.h File Reference</h1><code>#include "windowstr.h"</code><br>
-
-<p>
-<a href="dmxwindow_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a></td></tr>
-
-<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>#define&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a0">DMX_GET_WINDOW_PRIV</a>(_pWin)&nbsp;&nbsp;&nbsp;((<a class="el" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>)(_pWin)-&gt;devPrivates[<a class="el" href="dmxwindow_8h.html#a10">dmxWinPrivateIndex</a>].ptr)</td></tr>
-
-<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a8">dmxWinPrivRec</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>typedef <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a9">dmxWinPrivPtr</a></td></tr>
-
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a11">dmxInitWindow</a> (ScreenPtr pScreen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a14">dmxCreateAndRealizeWindow</a> (WindowPtr pWindow, Bool doSync)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a15">dmxCreateWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a16">dmxDestroyWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a17">dmxPositionWindow</a> (WindowPtr pWindow, int x, int y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a18">dmxChangeWindowAttributes</a> (WindowPtr pWindow, unsigned long mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a19">dmxRealizeWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a20">dmxUnrealizeWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a21">dmxRestackWindow</a> (WindowPtr pWindow, WindowPtr pOldNextSib)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a22">dmxWindowExposures</a> (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a23">dmxPaintWindowBackground</a> (WindowPtr pWindow, RegionPtr pRegion, int what)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a24">dmxPaintWindowBorder</a> (WindowPtr pWindow, RegionPtr pRegion, int what)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a25">dmxCopyWindow</a> (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a26">dmxResizeWindow</a> (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a27">dmxReparentWindow</a> (WindowPtr pWindow, WindowPtr pPriorParent)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a28">dmxChangeBorderWidth</a> (WindowPtr pWindow, unsigned int width)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a29">dmxResizeScreenWindow</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a30">dmxResizeRootWindow</a> (WindowPtr pRoot, int x, int y, int w, int h)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a31">dmxBEDestroyWindow</a> (WindowPtr pWindow)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a32">dmxSetShape</a> (WindowPtr pWindow)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxwindow.h File Reference</h1><code>#include &quot;windowstr.h&quot;</code><br/>
+
+<p><a href="dmxwindow_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#afbcb941cf0707b8bfbe0ac5889123ea3">DMX_GET_WINDOW_PRIV</a>(_pWin)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a35b887c43ad7855996b9aab8151fc479">DMX_WINDOW_FUNC_PROLOGUE</a>(_pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a9144b8f0cbe6f869da8a9ddcfbaa5f1b">DMX_WINDOW_FUNC_EPILOGUE</a>(_pGC)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a7eb75e49cc319067cfd50841378f8808">DMX_WINDOW_X1</a>(_pWin)&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.x - wBorderWidth(_pWin))</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a744e6f0a3bd069a37c77b8bff83bf491">DMX_WINDOW_Y1</a>(_pWin)&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.y - wBorderWidth(_pWin))</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ad52fe7cfe660be4536aabed92c0108d1">DMX_WINDOW_X2</a>(_pWin)&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.x + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.width)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a2d0ce76b2c1b06889444d93d5368c0ba">DMX_WINDOW_Y2</a>(_pWin)&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.y + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.height)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a9d5f07cf04c9e32d918d57d096769a5d">DMX_WINDOW_OFFSCREEN</a>(_pWin)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a5f9a6e44e1c8fbd89cf1d50b50fee122">dmxWinPrivRec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a3024ab3c0220000ce6ed1e93fd4880cc">dmxWinPrivPtr</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ad1c1a5296c1ef99d4dd829108903b21f">dmxInitWindow</a> (ScreenPtr pScreen)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a5296d023014ce3d69c04557431785923">dmxCreateRootWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ab8f054330062393aa409a31ec692cf0d">dmxGetDefaultWindowAttributes</a> (WindowPtr pWindow, Colormap *cmap, Visual **visual)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow</a> (WindowPtr pWindow, Bool doSync)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#aebb0ce7ac51645832a20c7d6a7d21d9c">dmxCreateWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a25a0aafd36f68137e67a3e6d95b78f53">dmxDestroyWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#adba873c51adf03b8af700c67fc6fba9b">dmxPositionWindow</a> (WindowPtr pWindow, int x, int y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ae6f0ba304627ea760df9e9c53f7bbae6">dmxChangeWindowAttributes</a> (WindowPtr pWindow, unsigned long mask)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ac75f5d6332a78eeac4e0e185cf326045">dmxRealizeWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#aeab9f468cc2c9374658213ee90a234a0">dmxUnrealizeWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a21e147f295faee8e53eb162071dc66ad">dmxRestackWindow</a> (WindowPtr pWindow, WindowPtr pOldNextSib)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a02a6991e5248012e287fe4be3a985926">dmxWindowExposures</a> (WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ad78bdba42db62285cf174f072a63a81a">dmxCopyWindow</a> (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ac3811e381fef200b5cd3207478df66e1">dmxResizeWindow</a> (WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#ab07d7010858aa078f26396f420fdea8c">dmxReparentWindow</a> (WindowPtr pWindow, WindowPtr pPriorParent)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a5d63a05eab33981615afdf523a44c697">dmxChangeBorderWidth</a> (WindowPtr pWindow, unsigned int width)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#af96b8583264e78a4c693c6f7ee887067">dmxResizeScreenWindow</a> (ScreenPtr pScreen, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a817739d4921329f1cf71f2af6fcacfc2">dmxResizeRootWindow</a> (WindowPtr pRoot, int x, int y, int w, int h)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a978ad158f0c814ca10dc965c5f7b74c2">dmxBEDestroyWindow</a> (WindowPtr pWindow)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#a591148aca36f482e01bd25de677b9689">dmxSetShape</a> (WindowPtr pWindow)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevPrivateKey&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxwindow_8h.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface for window support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="afbcb941cf0707b8bfbe0ac5889123ea3"></a><!-- doxytag: member="dmxwindow.h::DMX_GET_WINDOW_PRIV" ref="afbcb941cf0707b8bfbe0ac5889123ea3" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_GET_WINDOW_PRIV</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">((<a class="code" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>) \
+    dixLookupPrivate(&amp;(_pWin)-&gt;devPrivates, <a class="code" href="dmxscrinit_8c.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a>))
+</pre></div><p>Get window private pointer. </p>
 
-<tr><td colspan=2><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxwindow_8h.html#a10">dmxWinPrivateIndex</a></td></tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxextension_8c_source.html#l00285">dmxForceWindowCreation()</a>, <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface for window support. <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a></dd></dl>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0" doxytag="dmxwindow.h::DMX_GET_WINDOW_PRIV" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> #define DMX_GET_WINDOW_PRIV</td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">_pWin&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;((<a class="el" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>)(_pWin)-&gt;devPrivates[<a class="el" href="dmxwindow_8h.html#a10">dmxWinPrivateIndex</a>].ptr)
+</div>
+</div>
+<a class="anchor" id="a9144b8f0cbe6f869da8a9ddcfbaa5f1b"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_FUNC_EPILOGUE" ref="a9144b8f0cbe6f869da8a9ddcfbaa5f1b" args="(_pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_FUNC_EPILOGUE</td>
+          <td>(</td>
+          <td class="paramtype">_pGC&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get window private pointer.     </td>
-  </tr>
-</table>
-<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a9" doxytag="dmxwindow.h::dmxWinPrivPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a> * <a class="el" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
+    <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a> pGCPriv = <a class="code" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">DMX_GET_GC_PRIV</a>(_pGC);                       \
+    <a class="code" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">DMX_WRAP</a>(funcs, &amp;<a class="code" href="dmxgc_8c.html#a3c6b012a9ca843b7f1083a151030c400">dmxGCFuncs</a>, pGCPriv, (_pGC));                      \
+    <span class="keywordflow">if</span> (pGCPriv-&gt;<a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a>)                                                   \
+        <a class="code" href="dmx_8h.html#a67000d9b6ab4428d002523c0ef981ed0">DMX_WRAP</a>(ops, &amp;<a class="code" href="dmxgc_8c.html#a4688e83670c13b303cba5309eaf23424">dmxGCOps</a>, pGCPriv, (_pGC));                      \
+} <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a35b887c43ad7855996b9aab8151fc479"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_FUNC_PROLOGUE" ref="a35b887c43ad7855996b9aab8151fc479" args="(_pGC)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_FUNC_PROLOGUE</td>
+          <td>(</td>
+          <td class="paramtype">_pGC&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Window private area.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxwindow.h::dmxWinPrivRec" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                                    \
+    <a class="code" href="struct__dmxGCPriv.html">dmxGCPrivPtr</a> pGCPriv = <a class="code" href="dmxgc_8h.html#a42556da1890b53da10806fbab8174549">DMX_GET_GC_PRIV</a>(_pGC);                       \
+    <a class="code" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">DMX_UNWRAP</a>(funcs, pGCPriv, (_pGC));                                 \
+    <span class="keywordflow">if</span> (pGCPriv-&gt;<a class="code" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a>)                                                   \
+        <a class="code" href="dmx_8h.html#a94c3604e80b511877468dea0d8da7051">DMX_UNWRAP</a>(ops, pGCPriv, (_pGC));                               \
+} <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a9d5f07cf04c9e32d918d57d096769a5d"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_OFFSCREEN" ref="a9d5f07cf04c9e32d918d57d096769a5d" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_OFFSCREEN</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="dmxwindow_8h.html#a7eb75e49cc319067cfd50841378f8808">DMX_WINDOW_X1</a>(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;width  ||   \
+     <a class="code" href="dmxwindow_8h.html#a744e6f0a3bd069a37c77b8bff83bf491">DMX_WINDOW_Y1</a>(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;height ||       \
+     <a class="code" href="dmxwindow_8h.html#ad52fe7cfe660be4536aabed92c0108d1">DMX_WINDOW_X2</a>(_pWin) &lt;= 0                                 ||       \
+     <a class="code" href="dmxwindow_8h.html#a2d0ce76b2c1b06889444d93d5368c0ba">DMX_WINDOW_Y2</a>(_pWin) &lt;= 0)
+</pre></div>
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7eb75e49cc319067cfd50841378f8808"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_X1" ref="a7eb75e49cc319067cfd50841378f8808" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_X1</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.x - wBorderWidth(_pWin))</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad52fe7cfe660be4536aabed92c0108d1"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_X2" ref="ad52fe7cfe660be4536aabed92c0108d1" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_X2</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.x + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.width)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a744e6f0a3bd069a37c77b8bff83bf491"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_Y1" ref="a744e6f0a3bd069a37c77b8bff83bf491" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_Y1</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.y - wBorderWidth(_pWin))</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2d0ce76b2c1b06889444d93d5368c0ba"></a><!-- doxytag: member="dmxwindow.h::DMX_WINDOW_Y2" ref="a2d0ce76b2c1b06889444d93d5368c0ba" args="(_pWin)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define DMX_WINDOW_Y2</td>
+          <td>(</td>
+          <td class="paramtype">_pWin&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;((_pWin)-&gt;drawable.y + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.height)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a3024ab3c0220000ce6ed1e93fd4880cc"></a><!-- doxytag: member="dmxwindow.h::dmxWinPrivPtr" ref="a3024ab3c0220000ce6ed1e93fd4880cc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>  <a class="el" href="struct__dmxWinPriv.html">dmxWinPrivRec</a>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a> * <a class="el" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Window private area.     </td>
-  </tr>
-</table>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a31" doxytag="dmxwindow.h::dmxBEDestroyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5f9a6e44e1c8fbd89cf1d50b50fee122"></a><!-- doxytag: member="dmxwindow.h::dmxWinPrivRec" ref="a5f9a6e44e1c8fbd89cf1d50b50fee122" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxBEDestroyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">typedef struct <a class="el" href="struct__dmxWinPriv.html">_dmxWinPriv</a>  <a class="el" href="struct__dmxWinPriv.html">dmxWinPrivRec</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Window private area. </p>
 
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a978ad158f0c814ca10dc965c5f7b74c2"></a><!-- doxytag: member="dmxwindow.h::dmxBEDestroyWindow" ref="a978ad158f0c814ca10dc965c5f7b74c2" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxBEDestroyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="dmxwindow.h::dmxChangeBorderWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01521">dmxBEDestroyWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5d63a05eab33981615afdf523a44c697"></a><!-- doxytag: member="dmxwindow.h::dmxChangeBorderWidth" ref="a5d63a05eab33981615afdf523a44c697" args="(WindowPtr pWindow, unsigned int width)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxChangeBorderWidth </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxChangeBorderWidth </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>width</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change border width for <em>pWindow</em> to <em>width</em> pixels.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="dmxwindow.h::dmxChangeWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change border width for <em>pWindow</em> to <em>width</em> pixels. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae6f0ba304627ea760df9e9c53f7bbae6"></a><!-- doxytag: member="dmxwindow.h::dmxChangeWindowAttributes" ref="ae6f0ba304627ea760df9e9c53f7bbae6" args="(WindowPtr pWindow, unsigned long mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxChangeWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">Bool dmxChangeWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the window attributes of <em>pWindow</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="dmxwindow.h::dmxCopyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the window attributes of <em>pWindow</em>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad78bdba42db62285cf174f072a63a81a"></a><!-- doxytag: member="dmxwindow.h::dmxCopyWindow" ref="ad78bdba42db62285cf174f072a63a81a" args="(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCopyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxCopyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DDXPointRec&nbsp;</td>
-          <td class="mdname" nowrap> <em>ptOldOrg</em>, </td>
+          <td class="paramtype">DDXPointRec&nbsp;</td>
+          <td class="paramname"> <em>ptOldOrg</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>prgnSrc</em></td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>prgnSrc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Move <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="dmxwindow.h::dmxCreateAndRealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Move <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00060">DMX_UPDATE_COPY</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afefa2121a2898700d285e77730a52c4d"></a><!-- doxytag: member="dmxwindow.h::dmxCreateAndRealizeWindow" ref="afefa2121a2898700d285e77730a52c4d" args="(WindowPtr pWindow, Bool doSync)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxCreateAndRealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxCreateAndRealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>Bool&nbsp;</td>
-          <td class="mdname" nowrap> <em>doSync</em></td>
+          <td class="paramtype">Bool&nbsp;</td>
+          <td class="paramname"> <em>doSync</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This function handles lazy window creation and realization. Window creation is handled by <a class="el" href="dmxwindow_8c.html#a8">dmxCreateNonRootWindow()</a>. It also handles any stacking changes that have occured since the window was originally created by calling <a class="el" href="dmxwindow_8c.html#a0">dmxDoRestackWindow()</a>. If the window is shaped, the shape is set on the back-end server by calling <a class="el" href="dmxwindow_8c.html#a2">dmxDoSetShape()</a>, and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling <a class="el" href="dmxpict_8c.html#a18">dmxCreatePictureList()</a>. If <em>doSync</em> is TRUE, then <a class="el" href="dmxsync_8c.html#a9">dmxSync()</a> is called.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="dmxwindow.h::dmxCreateWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxCreateWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+</div>
+<div class="memdoc">
+<p>This function handles lazy window creation and realization. Window creation is handled by <a class="el" href="dmxwindow_8c.html#a85749ac991a90590437409977222d827">dmxCreateNonRootWindow()</a>. It also handles any stacking changes that have occured since the window was originally created by calling <a class="el" href="dmxwindow_8c.html#aa3d29fd7e2f88855318fbc5cb739e1b9">dmxDoRestackWindow()</a>. If the window is shaped, the shape is set on the back-end server by calling <a class="el" href="dmxwindow_8c.html#acf115ae2724d655dd75267f8b96f1986">dmxDoSetShape()</a>, and if the window has pictures (from RENDER) associated with it, those pictures are created on the back-end server by calling <a class="el" href="dmxpict_8c.html#a8c52091268b0f77d74d3a097b396abcf">dmxCreatePictureList()</a>. If <em>doSync</em> is TRUE, then <a class="el" href="dmxsync_8c.html#ab848762f4d2e30d31b87d3e8e10c5967">dmxSync()</a> is called. </p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by <a class="el" href="dmxwindow_8c.html#a9">dmxCreateAndRealizeWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a16" doxytag="dmxwindow.h::dmxDestroyWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxDestroyWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00740">dmxCreatePictureList()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00053">_dmxWinPriv::hasPict</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy <em>pWindow</em> on the back-end server. If any RENDER pictures were created, destroy them as well.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="dmxwindow.h::dmxInitWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool dmxInitWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pScreen</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l00285">dmxForceWindowCreation()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>.</p>
 
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the private area for the window functions.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="dmxwindow.h::dmxPaintWindowBackground" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a5296d023014ce3d69c04557431785923"></a><!-- doxytag: member="dmxwindow.h::dmxCreateRootWindow" ref="a5296d023014ce3d69c04557431785923" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPaintWindowBackground </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
+          <td class="memname">Window dmxCreateRootWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRegion</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00115">_DMXScreenInfo::beDefVisualIndex</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmx_8h_source.html#l00114">_DMXScreenInfo::beVisuals</a>, <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aebb0ce7ac51645832a20c7d6a7d21d9c"></a><!-- doxytag: member="dmxwindow.h::dmxCreateWindow" ref="aebb0ce7ac51645832a20c7d6a7d21d9c" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">Bool dmxCreateWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>what</em></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, then the actual creation and realization of the window is handled by <a class="el" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow()</a>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00048">_dmxWinPriv::attribMask</a>, <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00049">_dmxWinPriv::cmap</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>, <a class="el" href="dmxinit_8c_source.html#l00100">dmxLazyWindowCreation</a>, <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>, <a class="el" href="dmxwindow_8h_source.html#l00053">_dmxWinPriv::hasPict</a>, <a class="el" href="dmx_8h_source.html#l00095">_DMXScreenInfo::index</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, <a class="el" href="dmx_8h_source.html#l00145">_DMXScreenInfo::rootHeight</a>, <a class="el" href="dmx_8h_source.html#l00144">_DMXScreenInfo::rootWidth</a>, <a class="el" href="dmx_8h_source.html#l00141">_DMXScreenInfo::rootWin</a>, <a class="el" href="dmx_8h_source.html#l00142">_DMXScreenInfo::rootX</a>, <a class="el" href="dmx_8h_source.html#l00143">_DMXScreenInfo::rootY</a>, <a class="el" href="dmx_8h_source.html#l00129">_DMXScreenInfo::scrnHeight</a>, <a class="el" href="dmx_8h_source.html#l00128">_DMXScreenInfo::scrnWidth</a>, <a class="el" href="dmx_8h_source.html#l00126">_DMXScreenInfo::scrnX</a>, <a class="el" href="dmx_8h_source.html#l00127">_DMXScreenInfo::scrnY</a>, <a class="el" href="dmxwindow_8h_source.html#l00050">_dmxWinPriv::visual</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25a0aafd36f68137e67a3e6d95b78f53"></a><!-- doxytag: member="dmxwindow.h::dmxDestroyWindow" ref="a25a0aafd36f68137e67a3e6d95b78f53" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">Bool dmxDestroyWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Paint background of <em>pWindow</em> in <em>pRegion</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="dmxwindow.h::dmxPaintWindowBorder" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Destroy <em>pWindow</em> on the back-end server. If any RENDER pictures were created, destroy them as well. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00815">dmxDestroyPictureList()</a>, <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00396">dmxDestroyWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab8f054330062393aa409a31ec692cf0d"></a><!-- doxytag: member="dmxwindow.h::dmxGetDefaultWindowAttributes" ref="ab8f054330062393aa409a31ec692cf0d" args="(WindowPtr pWindow, Colormap *cmap, Visual **visual)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxPaintWindowBorder </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxGetDefaultWindowAttributes </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRegion</em>, </td>
+          <td class="paramtype">Colormap *&nbsp;</td>
+          <td class="paramname"> <em>cmap</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>what</em></td>
+          <td class="paramtype">Visual **&nbsp;</td>
+          <td class="paramname"> <em>visual</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="dmxcmap_8h_source.html#l00044">_dmxColormapPriv::cmap</a>, <a class="el" href="dmxcmap_8h_source.html#l00066">DMX_GET_COLORMAP_PRIV</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, and <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad1c1a5296c1ef99d4dd829108903b21f"></a><!-- doxytag: member="dmxwindow.h::dmxInitWindow" ref="ad1c1a5296c1ef99d4dd829108903b21f" args="(ScreenPtr pScreen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool dmxInitWindow </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Paint window border for <em>pWindow</em> in <em>pRegion</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="dmxwindow.h::dmxPositionWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize the private area for the window functions. </p>
+
+<p>References <a class="el" href="dmxscrinit_8c_source.html#l00073">dmxWinPrivateKey</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adba873c51adf03b8af700c67fc6fba9b"></a><!-- doxytag: member="dmxwindow.h::dmxPositionWindow" ref="adba873c51adf03b8af700c67fc6fba9b" args="(WindowPtr pWindow, int x, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxPositionWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">Bool dmxPositionWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the position of <em>pWindow</em> to be <em>x</em>, <em>y</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="dmxwindow.h::dmxRealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the position of <em>pWindow</em> to be <em>x</em>, <em>y</em>. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac75f5d6332a78eeac4e0e185cf326045"></a><!-- doxytag: member="dmxwindow.h::dmxRealizeWindow" ref="ac75f5d6332a78eeac4e0e185cf326045" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxRealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxRealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Realize <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="dmxwindow.h::dmxReparentWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Realize <em>pWindow</em> on the back-end server. If the lazy window creation optimization is enabled, the window is only realized when it at least partially overlaps the screen. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00057">DMX_UPDATE_REALIZE</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab07d7010858aa078f26396f420fdea8c"></a><!-- doxytag: member="dmxwindow.h::dmxReparentWindow" ref="ab07d7010858aa078f26396f420fdea8c" args="(WindowPtr pWindow, WindowPtr pPriorParent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxReparentWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxReparentWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pPriorParent</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pPriorParent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reparent <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="dmxwindow.h::dmxResizeRootWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Reparent <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00062">DMX_UPDATE_REPARENT</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a817739d4921329f1cf71f2af6fcacfc2"></a><!-- doxytag: member="dmxwindow.h::dmxResizeRootWindow" ref="a817739d4921329f1cf71f2af6fcacfc2" args="(WindowPtr pRoot, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeRootWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pRoot</em>, </td>
+          <td class="memname">void dmxResizeRootWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pRoot</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the location and size of the "root" window. Called from #dmxReconfigureRootWindow().     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="dmxwindow.h::dmxResizeScreenWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the location and size of the "root" window. Called from dmxConfigureRootWindow. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af96b8583264e78a4c693c6f7ee887067"></a><!-- doxytag: member="dmxwindow.h::dmxResizeScreenWindow" ref="af96b8583264e78a4c693c6f7ee887067" args="(ScreenPtr pScreen, int x, int y, int w, int h)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeScreenWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ScreenPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pScreen</em>, </td>
+          <td class="memname">void dmxResizeScreenWindow </td>
+          <td>(</td>
+          <td class="paramtype">ScreenPtr&nbsp;</td>
+          <td class="paramname"> <em>pScreen</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>h</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the location and size of the "screen" window. Called from #dmxReconfigureScreenWindow().     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="dmxwindow.h::dmxResizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Change the location and size of the "screen" window. Called from dmxConfigureScreenWindow(). </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmx_8h_source.html#l00125">_DMXScreenInfo::scrnWin</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac3811e381fef200b5cd3207478df66e1"></a><!-- doxytag: member="dmxwindow.h::dmxResizeWindow" ref="ac3811e381fef200b5cd3207478df66e1" args="(WindowPtr pWindow, int x, int y, unsigned int w, unsigned int h, WindowPtr pSib)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxResizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxResizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>w</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>h</em>, </td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>h</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pSib</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pSib</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Resize <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="dmxwindow.h::dmxRestackWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Resize <em>pWindow</em> on the back-end server. Determine whether or not it is on or offscreen, and realize it if it is newly on screen and the lazy window creation optimization is enabled. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00061">DMX_UPDATE_RESIZE</a>, <a class="el" href="dmxwindow_8h_source.html#l00134">DMX_WINDOW_OFFSCREEN</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a21e147f295faee8e53eb162071dc66ad"></a><!-- doxytag: member="dmxwindow.h::dmxRestackWindow" ref="a21e147f295faee8e53eb162071dc66ad" args="(WindowPtr pWindow, WindowPtr pOldNextSib)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxRestackWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxRestackWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pOldNextSib</em></td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pOldNextSib</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle window restacking. The actual restacking occurs in <a class="el" href="dmxwindow_8c.html#a0">dmxDoRestackWindow()</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="dmxwindow.h::dmxSetShape" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Handle window restacking. The actual restacking occurs in <a class="el" href="dmxwindow_8c.html#aa3d29fd7e2f88855318fbc5cb739e1b9">dmxDoRestackWindow()</a>. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00059">DMX_UPDATE_RESTACK</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00047">_dmxWinPriv::restacked</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a591148aca36f482e01bd25de677b9689"></a><!-- doxytag: member="dmxwindow.h::dmxSetShape" ref="a591148aca36f482e01bd25de677b9689" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxSetShape </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void dmxSetShape </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set shape of <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="dmxwindow.h::dmxUnrealizeWindow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set shape of <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8h_source.html#l00051">_dmxWinPriv::isShaped</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aeab9f468cc2c9374658213ee90a234a0"></a><!-- doxytag: member="dmxwindow.h::dmxUnrealizeWindow" ref="aeab9f468cc2c9374658213ee90a234a0" args="(WindowPtr pWindow)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool dmxUnrealizeWindow </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pWindow</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">Bool dmxUnrealizeWindow </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Unrealize <em>pWindow</em> on the back-end server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="dmxwindow.h::dmxWindowExposures" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Unrealize <em>pWindow</em> on the back-end server. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmxinput_8h_source.html#l00058">DMX_UPDATE_UNREALIZE</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxwindow_8h_source.html#l00046">_dmxWinPriv::mapped</a>, <a class="el" href="dmxwindow_8h_source.html#l00045">_dmxWinPriv::offscreen</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a02a6991e5248012e287fe4be3a985926"></a><!-- doxytag: member="dmxwindow.h::dmxWindowExposures" ref="a02a6991e5248012e287fe4be3a985926" args="(WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void dmxWindowExposures </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">WindowPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pWindow</em>, </td>
+          <td class="memname">void dmxWindowExposures </td>
+          <td>(</td>
+          <td class="paramtype">WindowPtr&nbsp;</td>
+          <td class="paramname"> <em>pWindow</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>prgn</em>, </td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>prgn</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>RegionPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>other_exposed</em></td>
+          <td class="paramtype">RegionPtr&nbsp;</td>
+          <td class="paramname"> <em>other_exposed</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Handle exposures on <em>pWindow</em>. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here.     </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a10" doxytag="dmxwindow.h::dmxWinPrivateIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="dmxwindow_8h.html#a10">dmxWinPrivateIndex</a>
+</div>
+<div class="memdoc">
+<p>Handle exposures on <em>pWindow</em>. Since window exposures are handled in DMX, the events that are generated by the back-end server are redundant, so we eat them here. </p>
+
+<p>References <a class="el" href="dmx_8h_source.html#l00099">_DMXScreenInfo::beDisplay</a>, <a class="el" href="dmxwindow_8h_source.html#l00105">DMX_GET_WINDOW_PRIV</a>, <a class="el" href="dmx_8h_source.html#l00327">DMX_UNWRAP</a>, <a class="el" href="dmx_8h_source.html#l00320">DMX_WRAP</a>, <a class="el" href="dmxinit_8c_source.html#l00084">dmxScreens</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, <a class="el" href="dmxwindow_8c_source.html#l00750">dmxWindowExposurePredicate()</a>, <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>, and <a class="el" href="dmxwindow_8h_source.html#l00044">_dmxWinPriv::window</a>.</p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="af6748237525fb596a210d3b3614312ba"></a><!-- doxytag: member="dmxwindow.h::dmxWinPrivateKey" ref="af6748237525fb596a210d3b3614312ba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevPrivateKey <a class="el" href="dmxwindow_8h.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Private index for Windows     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Private index. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a> </dd>
+<dd>
+<a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a></dd></dl>
+<p>Private index for Windows </p>
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00063">dmxInitWindow()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html b/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html
new file mode 100644
index 000000000..d04650c6c
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/dmxwindow_8h_source.html
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>dmxwindow.h</h1><a href="dmxwindow_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Kevin E. Martin &lt;kem@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef DMXWINDOW_H</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define DMXWINDOW_H</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="preprocessor">#include &quot;windowstr.h&quot;</span>
+<a name="l00041"></a>00041 
+<a name="l00043"></a><a class="code" href="struct__dmxWinPriv.html">00043</a> <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__dmxWinPriv.html">_dmxWinPriv</a> {
+<a name="l00044"></a><a class="code" href="struct__dmxWinPriv.html#a9e9f2544f80c5f6988afbc36be92f71f">00044</a>     Window         <a class="code" href="struct__dmxWinPriv.html#a9e9f2544f80c5f6988afbc36be92f71f">window</a>;
+<a name="l00045"></a><a class="code" href="struct__dmxWinPriv.html#a6c19fce485c4b7c630e5af24ac8d2b64">00045</a>     Bool           <a class="code" href="struct__dmxWinPriv.html#a6c19fce485c4b7c630e5af24ac8d2b64">offscreen</a>;
+<a name="l00046"></a><a class="code" href="struct__dmxWinPriv.html#a71a163660368e9309d1369164246946f">00046</a>     Bool           <a class="code" href="struct__dmxWinPriv.html#a71a163660368e9309d1369164246946f">mapped</a>;
+<a name="l00047"></a><a class="code" href="struct__dmxWinPriv.html#a408078f183c5a02daa555c9df1f310f2">00047</a>     Bool           <a class="code" href="struct__dmxWinPriv.html#a408078f183c5a02daa555c9df1f310f2">restacked</a>;
+<a name="l00048"></a><a class="code" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">00048</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>  <a class="code" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">attribMask</a>;
+<a name="l00049"></a><a class="code" href="struct__dmxWinPriv.html#a852246cf86eff5c476e79915828a976f">00049</a>     Colormap       <a class="code" href="struct__dmxWinPriv.html#a852246cf86eff5c476e79915828a976f">cmap</a>;
+<a name="l00050"></a><a class="code" href="struct__dmxWinPriv.html#a19177a0167fccfd592c7f45c929c2be9">00050</a>     Visual        *<a class="code" href="struct__dmxWinPriv.html#a19177a0167fccfd592c7f45c929c2be9">visual</a>;
+<a name="l00051"></a><a class="code" href="struct__dmxWinPriv.html#af0c3737de0bf15b112b7d9aba3774196">00051</a>     Bool           <a class="code" href="struct__dmxWinPriv.html#af0c3737de0bf15b112b7d9aba3774196">isShaped</a>;
+<a name="l00052"></a>00052 <span class="preprocessor">#ifdef RENDER</span>
+<a name="l00053"></a><a class="code" href="struct__dmxWinPriv.html#aada5c9737655b65fcd384446a5bb8906">00053</a> <span class="preprocessor"></span>    Bool           <a class="code" href="struct__dmxWinPriv.html#aada5c9737655b65fcd384446a5bb8906">hasPict</a>;
+<a name="l00054"></a>00054 <span class="preprocessor">#endif</span>
+<a name="l00055"></a>00055 <span class="preprocessor"></span><span class="preprocessor">#ifdef GLXEXT</span>
+<a name="l00056"></a>00056 <span class="preprocessor"></span>    <span class="keywordtype">void</span>          *swapGroup;
+<a name="l00057"></a>00057     <span class="keywordtype">int</span>            barrier;
+<a name="l00058"></a>00058     void         (*windowDestroyed)(WindowPtr);
+<a name="l00059"></a>00059     void         (*windowUnmapped)(WindowPtr);
+<a name="l00060"></a>00060 <span class="preprocessor">#endif</span>
+<a name="l00061"></a>00061 <span class="preprocessor"></span>} <a class="code" href="struct__dmxWinPriv.html">dmxWinPrivRec</a>, *<a class="code" href="struct__dmxWinPriv.html">dmxWinPrivPtr</a>;
+<a name="l00062"></a>00062 
+<a name="l00063"></a>00063 
+<a name="l00064"></a>00064 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#ad1c1a5296c1ef99d4dd829108903b21f">dmxInitWindow</a>(ScreenPtr pScreen);
+<a name="l00065"></a>00065 
+<a name="l00066"></a>00066 <span class="keyword">extern</span> Window <a class="code" href="dmxwindow_8c.html#a5296d023014ce3d69c04557431785923">dmxCreateRootWindow</a>(WindowPtr pWindow);
+<a name="l00067"></a>00067 
+<a name="l00068"></a>00068 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#ab8f054330062393aa409a31ec692cf0d">dmxGetDefaultWindowAttributes</a>(WindowPtr pWindow,
+<a name="l00069"></a>00069                                           Colormap *cmap,
+<a name="l00070"></a>00070                                           Visual **visual);
+<a name="l00071"></a>00071 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#afefa2121a2898700d285e77730a52c4d">dmxCreateAndRealizeWindow</a>(WindowPtr pWindow, Bool doSync);
+<a name="l00072"></a>00072 
+<a name="l00073"></a>00073 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#aebb0ce7ac51645832a20c7d6a7d21d9c">dmxCreateWindow</a>(WindowPtr pWindow);
+<a name="l00074"></a>00074 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a25a0aafd36f68137e67a3e6d95b78f53">dmxDestroyWindow</a>(WindowPtr pWindow);
+<a name="l00075"></a>00075 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#adba873c51adf03b8af700c67fc6fba9b">dmxPositionWindow</a>(WindowPtr pWindow, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y);
+<a name="l00076"></a>00076 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#ae6f0ba304627ea760df9e9c53f7bbae6">dmxChangeWindowAttributes</a>(WindowPtr pWindow, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> mask);
+<a name="l00077"></a>00077 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#ac75f5d6332a78eeac4e0e185cf326045">dmxRealizeWindow</a>(WindowPtr pWindow);
+<a name="l00078"></a>00078 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#aeab9f468cc2c9374658213ee90a234a0">dmxUnrealizeWindow</a>(WindowPtr pWindow);
+<a name="l00079"></a>00079 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a21e147f295faee8e53eb162071dc66ad">dmxRestackWindow</a>(WindowPtr pWindow, WindowPtr pOldNextSib);
+<a name="l00080"></a>00080 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a02a6991e5248012e287fe4be3a985926">dmxWindowExposures</a>(WindowPtr pWindow, RegionPtr prgn,
+<a name="l00081"></a>00081                                RegionPtr other_exposed);
+<a name="l00082"></a>00082 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#ad78bdba42db62285cf174f072a63a81a">dmxCopyWindow</a>(WindowPtr pWindow, DDXPointRec ptOldOrg,
+<a name="l00083"></a>00083                           RegionPtr prgnSrc);
+<a name="l00084"></a>00084 
+<a name="l00085"></a>00085 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#ac3811e381fef200b5cd3207478df66e1">dmxResizeWindow</a>(WindowPtr pWindow, <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y,
+<a name="l00086"></a>00086                             <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> w, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> h, WindowPtr pSib);
+<a name="l00087"></a>00087 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#ab07d7010858aa078f26396f420fdea8c">dmxReparentWindow</a>(WindowPtr pWindow, WindowPtr pPriorParent);
+<a name="l00088"></a>00088 
+<a name="l00089"></a>00089 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a5d63a05eab33981615afdf523a44c697">dmxChangeBorderWidth</a>(WindowPtr pWindow, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> width);
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#af96b8583264e78a4c693c6f7ee887067">dmxResizeScreenWindow</a>(ScreenPtr pScreen,
+<a name="l00092"></a>00092                                   <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
+<a name="l00093"></a>00093 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a817739d4921329f1cf71f2af6fcacfc2">dmxResizeRootWindow</a>(WindowPtr pRoot,
+<a name="l00094"></a>00094                                 <span class="keywordtype">int</span> x, <span class="keywordtype">int</span> y, <span class="keywordtype">int</span> w, <span class="keywordtype">int</span> h);
+<a name="l00095"></a>00095 
+<a name="l00096"></a>00096 <span class="keyword">extern</span> Bool <a class="code" href="dmxwindow_8c.html#a978ad158f0c814ca10dc965c5f7b74c2">dmxBEDestroyWindow</a>(WindowPtr pWindow);
+<a name="l00097"></a>00097 
+<a name="l00098"></a>00098 <span class="comment">/* Support for shape extension */</span>
+<a name="l00099"></a>00099 <span class="keyword">extern</span> <span class="keywordtype">void</span> <a class="code" href="dmxwindow_8c.html#a591148aca36f482e01bd25de677b9689">dmxSetShape</a>(WindowPtr pWindow);
+<a name="l00100"></a>00100 
+<a name="l00102"></a>00102 <span class="keyword">extern</span> DevPrivateKey <a class="code" href="dmxscrinit_8c.html#af6748237525fb596a210d3b3614312ba">dmxWinPrivateKey</a>;
+<a name="l00103"></a>00103 
+<a name="l00105"></a><a class="code" href="dmxwindow_8h.html#afbcb941cf0707b8bfbe0ac5889123ea3">00105</a> <span class="preprocessor">#define DMX_GET_WINDOW_PRIV(_pWin) ((dmxWinPrivPtr) \</span>
+<a name="l00106"></a>00106 <span class="preprocessor">    dixLookupPrivate(&amp;(_pWin)-&gt;devPrivates, dmxWinPrivateKey))</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108 <span class="comment">/* All of these macros are only used in dmxwindow.c */</span>
+<a name="l00109"></a><a class="code" href="dmxwindow_8h.html#a35b887c43ad7855996b9aab8151fc479">00109</a> <span class="preprocessor">#define DMX_WINDOW_FUNC_PROLOGUE(_pGC)                                  \</span>
+<a name="l00110"></a>00110 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00111"></a>00111 <span class="preprocessor">    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \</span>
+<a name="l00112"></a>00112 <span class="preprocessor">    DMX_UNWRAP(funcs, pGCPriv, (_pGC));                                 \</span>
+<a name="l00113"></a>00113 <span class="preprocessor">    if (pGCPriv-&gt;ops)                                                   \</span>
+<a name="l00114"></a>00114 <span class="preprocessor">        DMX_UNWRAP(ops, pGCPriv, (_pGC));                               \</span>
+<a name="l00115"></a>00115 <span class="preprocessor">} while (0)</span>
+<a name="l00116"></a>00116 <span class="preprocessor"></span>
+<a name="l00117"></a><a class="code" href="dmxwindow_8h.html#a9144b8f0cbe6f869da8a9ddcfbaa5f1b">00117</a> <span class="preprocessor">#define DMX_WINDOW_FUNC_EPILOGUE(_pGC)                                  \</span>
+<a name="l00118"></a>00118 <span class="preprocessor">do {                                                                    \</span>
+<a name="l00119"></a>00119 <span class="preprocessor">    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(_pGC);                       \</span>
+<a name="l00120"></a>00120 <span class="preprocessor">    DMX_WRAP(funcs, &amp;dmxGCFuncs, pGCPriv, (_pGC));                      \</span>
+<a name="l00121"></a>00121 <span class="preprocessor">    if (pGCPriv-&gt;ops)                                                   \</span>
+<a name="l00122"></a>00122 <span class="preprocessor">        DMX_WRAP(ops, &amp;dmxGCOps, pGCPriv, (_pGC));                      \</span>
+<a name="l00123"></a>00123 <span class="preprocessor">} while (0)</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>
+<a name="l00125"></a><a class="code" href="dmxwindow_8h.html#a7eb75e49cc319067cfd50841378f8808">00125</a> <span class="preprocessor">#define DMX_WINDOW_X1(_pWin)                                            \</span>
+<a name="l00126"></a>00126 <span class="preprocessor">    ((_pWin)-&gt;drawable.x - wBorderWidth(_pWin))</span>
+<a name="l00127"></a><a class="code" href="dmxwindow_8h.html#a744e6f0a3bd069a37c77b8bff83bf491">00127</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_Y1(_pWin)                                            \</span>
+<a name="l00128"></a>00128 <span class="preprocessor">    ((_pWin)-&gt;drawable.y - wBorderWidth(_pWin))</span>
+<a name="l00129"></a><a class="code" href="dmxwindow_8h.html#ad52fe7cfe660be4536aabed92c0108d1">00129</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_X2(_pWin)                                            \</span>
+<a name="l00130"></a>00130 <span class="preprocessor">    ((_pWin)-&gt;drawable.x + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.width) </span>
+<a name="l00131"></a><a class="code" href="dmxwindow_8h.html#a2d0ce76b2c1b06889444d93d5368c0ba">00131</a> <span class="preprocessor"></span><span class="preprocessor">#define DMX_WINDOW_Y2(_pWin)                                            \</span>
+<a name="l00132"></a>00132 <span class="preprocessor">    ((_pWin)-&gt;drawable.y + wBorderWidth(_pWin) + (_pWin)-&gt;drawable.height) </span>
+<a name="l00133"></a>00133 <span class="preprocessor"></span>
+<a name="l00134"></a><a class="code" href="dmxwindow_8h.html#a9d5f07cf04c9e32d918d57d096769a5d">00134</a> <span class="preprocessor">#define DMX_WINDOW_OFFSCREEN(_pWin)                                     \</span>
+<a name="l00135"></a>00135 <span class="preprocessor">    (DMX_WINDOW_X1(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;width  ||       \</span>
+<a name="l00136"></a>00136 <span class="preprocessor">     DMX_WINDOW_Y1(_pWin) &gt;= (_pWin)-&gt;drawable.pScreen-&gt;height ||       \</span>
+<a name="l00137"></a>00137 <span class="preprocessor">     DMX_WINDOW_X2(_pWin) &lt;= 0                                 ||       \</span>
+<a name="l00138"></a>00138 <span class="preprocessor">     DMX_WINDOW_Y2(_pWin) &lt;= 0)</span>
+<a name="l00139"></a>00139 <span class="preprocessor"></span>
+<a name="l00140"></a>00140 <span class="preprocessor">#endif </span><span class="comment">/* DMXWINDOW_H */</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html b/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html
index bd64864a1..eebbd60c6 100644
--- a/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxxinput_8c.html
@@ -6,382 +6,314 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxxinput.c File Reference</h1><code>#include "X.h"</code><br>
-<code>#include "Xproto.h"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "XI.h"</code><br>
-<code>#include "XIproto.h"</code><br>
-<code>#include "XIstubs.h"</code><br>
-<code>#include "mipointer.h"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "exevents.h"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a1">ChangeKeyboardDevice</a> (DeviceIntPtr old_dev, DeviceIntPtr new_dev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a2">ChangePointerDevice</a> (DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a3">CloseInputDevice</a> (DeviceIntPtr d, ClientPtr client)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a4">AddOtherInputDevices</a> (void)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a5">OpenInputDevice</a> (DeviceIntPtr dev, ClientPtr client, int *status)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a6">SetDeviceMode</a> (ClientPtr client, DeviceIntPtr dev, int mode)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a7">SetDeviceValuators</a> (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="dmxxinput_8c.html#a8">ChangeDeviceControl</a> (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)</td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxxinput.c File Reference</h1><code>#include &lt;X11/X.h&gt;</code><br/>
+<code>#include &lt;X11/Xproto.h&gt;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/extensions/XI.h&gt;</code><br/>
+<code>#include &lt;X11/extensions/XIproto.h&gt;</code><br/>
+<code>#include &quot;XIstubs.h&quot;</code><br/>
+<code>#include &quot;mipointer.h&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;exevents.h&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#a7aecd63bbe0dfcfad039b983627cfbac">ChangeKeyboardDevice</a> (DeviceIntPtr old_dev, DeviceIntPtr new_dev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#a51cdc3b8533939658513fdd098f8f947">ChangePointerDevice</a> (DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#a828e60f670f26cad7feaec774526b620">CloseInputDevice</a> (DeviceIntPtr d, ClientPtr client)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#a639d800ee4951307dd70a302c2d68cb9">AddOtherInputDevices</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#aeaa7a5809ae2f38894cae169e25f397d">OpenInputDevice</a> (DeviceIntPtr dev, ClientPtr client, int *status)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#aa4b20aa4795f3a94339e1748d5a4d1fb">SetDeviceMode</a> (ClientPtr client, DeviceIntPtr dev, int mode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#a1175b57fa9f8cba2b233ffb9e81ed066">SetDeviceValuators</a> (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dmxxinput_8c.html#ae8839ac736a195a19dd4b60653b5507b">ChangeDeviceControl</a> (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements support required by the XINPUT extension.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a4" doxytag="dmxxinput.c::AddOtherInputDevices" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This file implements support required by the XINPUT extension. </p>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a639d800ee4951307dd70a302c2d68cb9"></a><!-- doxytag: member="dmxxinput.c::AddOtherInputDevices" ref="a639d800ee4951307dd70a302c2d68cb9" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void AddOtherInputDevices </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void AddOtherInputDevices </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>This is not required by the XINPUT model that DMX uses. </p>
 
-<p>
-This is not required by the XINPUT model that DMX uses.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="dmxxinput.c::ChangeDeviceControl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ae8839ac736a195a19dd4b60653b5507b"></a><!-- doxytag: member="dmxxinput.c::ChangeDeviceControl" ref="ae8839ac736a195a19dd4b60653b5507b" args="(ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ChangeDeviceControl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ClientPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>client</em>, </td>
+          <td class="memname">int ChangeDeviceControl </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>dev</em>, </td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>xDeviceCtl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>control</em></td>
+          <td class="paramtype">xDeviceCtl *&nbsp;</td>
+          <td class="paramname"> <em>control</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Change device control. This is not implemented. </p>
 
-<p>
-Change device control. This is not implemented.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="dmxxinput.c::ChangeKeyboardDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a7aecd63bbe0dfcfad039b983627cfbac"></a><!-- doxytag: member="dmxxinput.c::ChangeKeyboardDevice" ref="a7aecd63bbe0dfcfad039b983627cfbac" args="(DeviceIntPtr old_dev, DeviceIntPtr new_dev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ChangeKeyboardDevice </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>old_dev</em>, </td>
+          <td class="memname">int ChangeKeyboardDevice </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>old_dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>new_dev</em></td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>new_dev</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Change the core keyboard from <em>old_dev</em> to <em>new_dev</em>. Currently this is not implemented. </p>
 
-<p>
-Change the core keyboard from <em>old_dev</em> to <em>new_dev</em>. Currently this is not implemented.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="dmxxinput.c::ChangePointerDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCorePointer</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinputinit_8h_source.html#l00255">_DMXLocalInputInfo::savedSendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a51cdc3b8533939658513fdd098f8f947"></a><!-- doxytag: member="dmxxinput.c::ChangePointerDevice" ref="a51cdc3b8533939658513fdd098f8f947" args="(DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ChangePointerDevice </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>old_dev</em>, </td>
+          <td class="memname">int ChangePointerDevice </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>old_dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>new_dev</em>, </td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>new_dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned char&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramtype">unsigned char&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned char&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramtype">unsigned char&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Change the core pointer from <em>old_dev</em> to <em>new_dev</em>. </p>
 
-<p>
-Change the core pointer from <em>old_dev</em> to <em>new_dev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="dmxxinput.c::CloseInputDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8c_source.html#l00081">dmxLocalCorePointer</a>, <a class="el" href="dmxinputinit_8h_source.html#l00230">_DMXLocalInputInfo::isCore</a>, <a class="el" href="dmxinputinit_8h_source.html#l00254">_DMXLocalInputInfo::savedMotionEvents</a>, <a class="el" href="struct__DMXLocalInputInfo.html#a27f8606aec1028f80bd9b21c421e78fe">_DMXLocalInputInfo::savedMotionProc</a>, <a class="el" href="dmxinputinit_8h_source.html#l00255">_DMXLocalInputInfo::savedSendsCore</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00231">_DMXLocalInputInfo::sendsCore</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a828e60f670f26cad7feaec774526b620"></a><!-- doxytag: member="dmxxinput.c::CloseInputDevice" ref="a828e60f670f26cad7feaec774526b620" args="(DeviceIntPtr d, ClientPtr client)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void CloseInputDevice </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>d</em>, </td>
+          <td class="memname">void CloseInputDevice </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>d</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ClientPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>client</em></td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Close the input device. This is not required by the XINPUT model that DMX uses. </p>
 
-<p>
-Close the input device. This is not required by the XINPUT model that DMX uses.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="dmxxinput.c::OpenInputDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="aeaa7a5809ae2f38894cae169e25f397d"></a><!-- doxytag: member="dmxxinput.c::OpenInputDevice" ref="aeaa7a5809ae2f38894cae169e25f397d" args="(DeviceIntPtr dev, ClientPtr client, int *status)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void OpenInputDevice </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>dev</em>, </td>
+          <td class="memname">void OpenInputDevice </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>ClientPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>client</em>, </td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>status</em></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>status</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Open an input device. This is not required by the XINPUT model that DMX uses. </p>
 
-<p>
-Open an input device. This is not required by the XINPUT model that DMX uses.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="dmxxinput.c::SetDeviceMode" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="aa4b20aa4795f3a94339e1748d5a4d1fb"></a><!-- doxytag: member="dmxxinput.c::SetDeviceMode" ref="aa4b20aa4795f3a94339e1748d5a4d1fb" args="(ClientPtr client, DeviceIntPtr dev, int mode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int SetDeviceMode </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ClientPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>client</em>, </td>
+          <td class="memname">int SetDeviceMode </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>dev</em>, </td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>mode</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set device mode to <em>mode</em>. This is not implemented. </p>
 
-<p>
-Set device mode to <em>mode</em>. This is not implemented.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="dmxxinput.c::SetDeviceValuators" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a1175b57fa9f8cba2b233ffb9e81ed066"></a><!-- doxytag: member="dmxxinput.c::SetDeviceValuators" ref="a1175b57fa9f8cba2b233ffb9e81ed066" args="(ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int SetDeviceValuators </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">ClientPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>client</em>, </td>
+          <td class="memname">int SetDeviceValuators </td>
+          <td>(</td>
+          <td class="paramtype">ClientPtr&nbsp;</td>
+          <td class="paramname"> <em>client</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>DeviceIntPtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>dev</em>, </td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>dev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>valuators</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>valuators</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>first_valuator</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>first_valuator</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>num_valuators</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>num_valuators</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set device valuators. This is not implemented. </p>
 
-<p>
-Set device valuators. This is not implemented.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/files.html b/xorg-server/hw/dmx/doc/html/files.html
index 339ba7a98..23ec3c20a 100644
--- a/xorg-server/hw/dmx/doc/html/files.html
+++ b/xorg-server/hw/dmx/doc/html/files.html
@@ -6,106 +6,122 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>Distributed Multihead X File List</h1>Here is a list of all documented files with brief descriptions:<table>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="ChkNotMaskEv_8c.html">ChkNotMaskEv.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="ChkNotMaskEv_8h.html">ChkNotMaskEv.h</a> <a href="ChkNotMaskEv_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html">programs/Xserver/Xext/dmx.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="lib_2dmx_2dmx_8c.html">lib/dmx/dmx.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmx_8h.html">dmx.h</a> <a href="dmx_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><b>dmx_glxvisuals.h</b> <a href="dmx__glxvisuals_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="ChkNotMaskEv_8h.html">ChkNotMaskEv.h</a> <a href="ChkNotMaskEv_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmx-config_8h.html">dmx-config.h</a> <a href="dmx-config_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmx_8c.html">dmx.c</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmx_8h.html">dmx.h</a> <a href="dmx_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmx__glxvisuals_8c.html">dmx_glxvisuals.c</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmx__glxvisuals_8h.html">dmx_glxvisuals.h</a> <a href="dmx__glxvisuals_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxarg_8c.html">dmxarg.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxarg_8h.html">dmxarg.h</a> <a href="dmxarg_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxarg_8h.html">dmxarg.h</a> <a href="dmxarg_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxbackend_8h.html">dmxbackend.h</a> <a href="dmxbackend_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxbackend_8h.html">dmxbackend.h</a> <a href="dmxbackend_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxcb_8c.html">dmxcb.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxcb_8h.html">dmxcb.h</a> <a href="dmxcb_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxclient_8h.html">dmxclient.h</a> <a href="dmxclient_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxcb_8h.html">dmxcb.h</a> <a href="dmxcb_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxclient_8h.html">dmxclient.h</a> <a href="dmxclient_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxcmap_8c.html">dmxcmap.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxcmap_8h.html">dmxcmap.h</a> <a href="dmxcmap_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxcmap_8h.html">dmxcmap.h</a> <a href="dmxcmap_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxcommon_8h.html">dmxcommon.h</a> <a href="dmxcommon_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxcommon_8h.html">dmxcommon.h</a> <a href="dmxcommon_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxcompat_8c.html">dmxcompat.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxcompat_8h.html">dmxcompat.h</a> <a href="dmxcompat_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxcompat_8h.html">dmxcompat.h</a> <a href="dmxcompat_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxconfig_8h.html">dmxconfig.h</a> <a href="dmxconfig_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxconfig_8h.html">dmxconfig.h</a> <a href="dmxconfig_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxconsole_8c.html">dmxconsole.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxconsole_8h.html">dmxconsole.h</a> <a href="dmxconsole_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxconsole_8h.html">dmxconsole.h</a> <a href="dmxconsole_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxcursor_8c.html">dmxcursor.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxcursor_8h.html">dmxcursor.h</a> <a href="dmxcursor_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxcursor_8h.html">dmxcursor.h</a> <a href="dmxcursor_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxdetach_8c.html">dmxdetach.c</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxdpms_8c.html">dmxdpms.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxdpms_8h.html">dmxdpms.h</a> <a href="dmxdpms_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxdpms_8h.html">dmxdpms.h</a> <a href="dmxdpms_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxdummy_8c.html">dmxdummy.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxdummy_8h.html">dmxdummy.h</a> <a href="dmxdummy_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxeq_8c.html">dmxeq.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxeq_8h.html">dmxeq.h</a> <a href="dmxeq_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxdummy_8h.html">dmxdummy.h</a> <a href="dmxdummy_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxevents_8c.html">dmxevents.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxevents_8h.html">dmxevents.h</a> <a href="dmxevents_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxext_8h.html">dmxext.h</a> <a href="dmxext_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxevents_8h.html">dmxevents.h</a> <a href="dmxevents_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxextension_8c.html">dmxextension.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxextension_8h.html">dmxextension.h</a> <a href="dmxextension_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxextension_8h.html">dmxextension.h</a> <a href="dmxextension_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxfont_8c.html">dmxfont.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxfont_8h.html">dmxfont.h</a> <a href="dmxfont_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxfont_8h.html">dmxfont.h</a> <a href="dmxfont_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxgc_8c.html">dmxgc.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxgc_8h.html">dmxgc.h</a> <a href="dmxgc_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxgc_8h.html">dmxgc.h</a> <a href="dmxgc_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxgcops_8c.html">dmxgcops.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxgcops_8h.html">dmxgcops.h</a> <a href="dmxgcops_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxgcops_8h.html">dmxgcops.h</a> <a href="dmxgcops_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxinit_8c.html">dmxinit.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxinit_8h.html">dmxinit.h</a> <a href="dmxinit_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxinit_8h.html">dmxinit.h</a> <a href="dmxinit_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxinput_8c.html">dmxinput.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxinput_8h.html">dmxinput.h</a> <a href="dmxinput_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxinput_8h.html">dmxinput.h</a> <a href="dmxinput_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxinputinit_8c.html">dmxinputinit.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxinputinit_8h.html">dmxinputinit.h</a> <a href="dmxinputinit_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxinputinit_8h.html">dmxinputinit.h</a> <a href="dmxinputinit_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxlog_8c.html">dmxlog.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxlog_8h.html">dmxlog.h</a> <a href="dmxlog_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxlog_8h.html">dmxlog.h</a> <a href="dmxlog_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxmap_8c.html">dmxmap.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxmap_8h.html">dmxmap.h</a> <a href="dmxmap_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxmap_8h.html">dmxmap.h</a> <a href="dmxmap_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxmotion_8c.html">dmxmotion.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxmotion_8h.html">dmxmotion.h</a> <a href="dmxmotion_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxmotion_8h.html">dmxmotion.h</a> <a href="dmxmotion_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxparse_8c.html">dmxparse.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxparse_8h.html">dmxparse.h</a> <a href="dmxparse_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxparse_8h.html">dmxparse.h</a> <a href="dmxparse_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxpict_8c.html">dmxpict.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxpict_8h.html">dmxpict.h</a> <a href="dmxpict_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxpict_8h.html">dmxpict.h</a> <a href="dmxpict_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxpixmap_8c.html">dmxpixmap.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxpixmap_8h.html">dmxpixmap.h</a> <a href="dmxpixmap_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxpixmap_8h.html">dmxpixmap.h</a> <a href="dmxpixmap_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxprint_8c.html">dmxprint.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxprint_8h.html">dmxprint.h</a> <a href="dmxprint_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxprint_8h.html">dmxprint.h</a> <a href="dmxprint_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxprop_8c.html">dmxprop.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxprop_8h.html">dmxprop.h</a> <a href="dmxprop_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxproto_8h.html">dmxproto.h</a> <a href="dmxproto_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxprop_8h.html">dmxprop.h</a> <a href="dmxprop_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxscrinit_8c.html">dmxscrinit.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxscrinit_8h.html">dmxscrinit.h</a> <a href="dmxscrinit_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxscrinit_8h.html">dmxscrinit.h</a> <a href="dmxscrinit_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxshadow_8c.html">dmxshadow.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxshadow_8h.html">dmxshadow.h</a> <a href="dmxshadow_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxshadow_8h.html">dmxshadow.h</a> <a href="dmxshadow_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxsigio_8c.html">dmxsigio.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxsigio_8h.html">dmxsigio.h</a> <a href="dmxsigio_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxsigio_8h.html">dmxsigio.h</a> <a href="dmxsigio_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxstat_8c.html">dmxstat.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxstat_8h.html">dmxstat.h</a> <a href="dmxstat_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxstat_8h.html">dmxstat.h</a> <a href="dmxstat_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxsync_8c.html">dmxsync.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxsync_8h.html">dmxsync.h</a> <a href="dmxsync_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxsync_8h.html">dmxsync.h</a> <a href="dmxsync_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxtodmx_8c.html">dmxtodmx.c</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxvisual_8c.html">dmxvisual.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxvisual_8h.html">dmxvisual.h</a> <a href="dmxvisual_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxvisual_8h.html">dmxvisual.h</a> <a href="dmxvisual_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxwindow_8c.html">dmxwindow.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="dmxwindow_8h.html">dmxwindow.h</a> <a href="dmxwindow_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="dmxwindow_8h.html">dmxwindow.h</a> <a href="dmxwindow_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="dmxxinput_8c.html">dmxxinput.c</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="lnx-keyboard_8c.html">lnx-keyboard.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="lnx-keyboard_8h.html">lnx-keyboard.h</a> <a href="lnx-keyboard_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="lnx-keyboard_8h.html">lnx-keyboard.h</a> <a href="lnx-keyboard_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="lnx-ms_8c.html">lnx-ms.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="lnx-ms_8h.html">lnx-ms.h</a> <a href="lnx-ms_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="lnx-ms_8h.html">lnx-ms.h</a> <a href="lnx-ms_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="lnx-ps2_8c.html">lnx-ps2.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="lnx-ps2_8h.html">lnx-ps2.h</a> <a href="lnx-ps2_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="lnx-ps2_8h.html">lnx-ps2.h</a> <a href="lnx-ps2_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="usb-common_8c.html">usb-common.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="usb-common_8h.html">usb-common.h</a> <a href="usb-common_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="usb-common_8h.html">usb-common.h</a> <a href="usb-common_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="usb-keyboard_8c.html">usb-keyboard.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="usb-keyboard_8h.html">usb-keyboard.h</a> <a href="usb-keyboard_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="usb-keyboard_8h.html">usb-keyboard.h</a> <a href="usb-keyboard_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="usb-mouse_8c.html">usb-mouse.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="usb-mouse_8h.html">usb-mouse.h</a> <a href="usb-mouse_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="usb-mouse_8h.html">usb-mouse.h</a> <a href="usb-mouse_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="usb-other_8c.html">usb-other.c</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="usb-other_8h.html">usb-other.h</a> <a href="usb-other_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="usb-private_8h.html">usb-private.h</a> <a href="usb-private_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="usb-other_8h.html">usb-other.h</a> <a href="usb-other_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="usb-private_8h.html">usb-private.h</a> <a href="usb-private_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="vdltodmx_8c.html">vdltodmx.c</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="xdmxconfig_8c.html">xdmxconfig.c</a></td><td class="indexvalue"></td></tr>
 </table>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/functions.html b/xorg-server/hw/dmx/doc/html/functions.html
index 766de0f8f..be7974c89 100644
--- a/xorg-server/hw/dmx/doc/html/functions.html
+++ b/xorg-server/hw/dmx/doc/html/functions.html
@@ -6,223 +6,80 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_k">k</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="functions.html"><span>All</span></a></li>
+      <li><a href="functions_vars.html"><span>Variables</span></a></li>
+      <li><a href="functions_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="functions.html#index_a"><span>a</span></a></li>
+      <li><a href="functions_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="functions_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="functions_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="functions_0x65.html#index_e"><span>e</span></a></li>
+      <li><a href="functions_0x66.html#index_f"><span>f</span></a></li>
+      <li><a href="functions_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="functions_0x68.html#index_h"><span>h</span></a></li>
+      <li><a href="functions_0x69.html#index_i"><span>i</span></a></li>
+      <li><a href="functions_0x6b.html#index_k"><span>k</span></a></li>
+      <li><a href="functions_0x6c.html#index_l"><span>l</span></a></li>
+      <li><a href="functions_0x6d.html#index_m"><span>m</span></a></li>
+      <li><a href="functions_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="functions_0x6f.html#index_o"><span>o</span></a></li>
+      <li><a href="functions_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="functions_0x72.html#index_r"><span>r</span></a></li>
+      <li><a href="functions_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="functions_0x74.html#index_t"><span>t</span></a></li>
+      <li><a href="functions_0x75.html#index_u"><span>u</span></a></li>
+      <li><a href="functions_0x76.html#index_v"><span>v</span></a></li>
+      <li><a href="functions_0x77.html#index_w"><span>w</span></a></li>
+      <li><a href="functions_0x78.html#index_x"><span>x</span></a></li>
+      <li><a href="functions_0x79.html#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+Here is a list of all struct and union fields with links to the structures/unions they belong to:
 
-<p>
-
-<p>
-Here is a list of all documented struct and union fields with links to the struct/union documentation for each field:<h3><a class="anchor" name="index_a">- a -</a></h3><ul>
+<h3><a class="anchor" id="index_a">- a -</a></h3><ul>
 <li>absmap
-: <a class="el" href="struct__myPrivate.html#o61">_myPrivate</a><li>argc
-: <a class="el" href="struct__dmxArg.html#o0">_dmxArg</a><li>argm
-: <a class="el" href="struct__dmxArg.html#o1">_dmxArg</a><li>argv
-: <a class="el" href="struct__dmxArg.html#o2">_dmxArg</a></ul>
-<h3><a class="anchor" name="index_b">- b -</a></h3><ul>
-<li>beBlackPixel
-: <a class="el" href="struct__DMXScreenInfo.html#o18">_DMXScreenInfo</a><li>beBPP
-: <a class="el" href="struct__DMXScreenInfo.html#o6">_DMXScreenInfo</a><li>beDefColormaps
-: <a class="el" href="struct__DMXScreenInfo.html#o17">_DMXScreenInfo</a><li>beDefVisualIndex
-: <a class="el" href="struct__DMXScreenInfo.html#o15">_DMXScreenInfo</a><li>beDepth
-: <a class="el" href="struct__DMXScreenInfo.html#o5">_DMXScreenInfo</a><li>beDepths
-: <a class="el" href="struct__DMXScreenInfo.html#o10">_DMXScreenInfo</a><li>beDisplay
-: <a class="el" href="struct__DMXScreenInfo.html#o2">_DMXScreenInfo</a><li>beHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o4">_DMXScreenInfo</a><li>belFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o25">_DMXLocalInitInfo</a><li>beNumDefColormaps
-: <a class="el" href="struct__DMXScreenInfo.html#o16">_DMXScreenInfo</a><li>beNumDepths
-: <a class="el" href="struct__DMXScreenInfo.html#o9">_DMXScreenInfo</a><li>beNumPixmapFormats
-: <a class="el" href="struct__DMXScreenInfo.html#o11">_DMXScreenInfo</a><li>beNumVisuals
-: <a class="el" href="struct__DMXScreenInfo.html#o13">_DMXScreenInfo</a><li>bePixmapFormats
-: <a class="el" href="struct__DMXScreenInfo.html#o12">_DMXScreenInfo</a><li>beVisuals
-: <a class="el" href="struct__DMXScreenInfo.html#o14">_DMXScreenInfo</a><li>beWhitePixel
-: <a class="el" href="struct__DMXScreenInfo.html#o19">_DMXScreenInfo</a><li>beWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o3">_DMXScreenInfo</a><li>beXDPI
-: <a class="el" href="struct__DMXScreenInfo.html#o7">_DMXScreenInfo</a><li>beYDPI
-: <a class="el" href="struct__DMXScreenInfo.html#o8">_DMXScreenInfo</a><li>binding
-: <a class="el" href="struct__DMXLocalInputInfo.html#o3">_DMXLocalInputInfo</a><li>buttonClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o9">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_c">- c -</a></h3><ul>
-<li>CloseScreen
-: <a class="el" href="struct__DMXScreenInfo.html#o59">_DMXScreenInfo</a><li>collect_events
-: <a class="el" href="struct__DMXLocalInputInfo.html#o16">_DMXLocalInputInfo</a><li>console
-: <a class="el" href="struct__DMXInputInfo.html#o6">_DMXInputInfo</a><li>core
-: <a class="el" href="struct__DMXInputInfo.html#o5">_DMXInputInfo</a><li>create_private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o4">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_d">- d -</a></h3><ul>
-<li>destroy_private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o5">_DMXLocalInputInfo</a><li>detached
-: <a class="el" href="struct__DMXInputInfo.html#o2">_DMXInputInfo</a><li>deviceId
-: <a class="el" href="struct__DMXLocalInputInfo.html#o41">_DMXLocalInputInfo</a><li>deviceName
-: <a class="el" href="struct__DMXLocalInputInfo.html#o42">_DMXLocalInputInfo</a><li>devs
-: <a class="el" href="struct__DMXInputInfo.html#o17">_DMXInputInfo</a><li>dmxInput
-: <a class="el" href="struct__myPrivate.html#o62">_myPrivate</a><li>dpmsCapable
-: <a class="el" href="struct__DMXScreenInfo.html#o52">_DMXScreenInfo</a><li>dpmsEnabled
-: <a class="el" href="struct__DMXScreenInfo.html#o53">_DMXScreenInfo</a><li>dpmsOff
-: <a class="el" href="struct__DMXScreenInfo.html#o56">_DMXScreenInfo</a><li>dpmsStandby
-: <a class="el" href="struct__DMXScreenInfo.html#o54">_DMXScreenInfo</a><li>dpmsSuspend
-: <a class="el" href="struct__DMXScreenInfo.html#o55">_DMXScreenInfo</a><li>duration
-: <a class="el" href="struct__myPrivate.html#o50">_myPrivate</a></ul>
-<h3><a class="anchor" name="index_e">- e -</a></h3><ul>
-<li>event
-: <a class="el" href="struct__Event.html#o0">_Event</a><li>events
-: <a class="el" href="struct__EventQueue.html#o4">_EventQueue</a><li>extType
-: <a class="el" href="struct__DMXLocalInputInfo.html#o2">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_f">- f -</a></h3><ul>
-<li>fd
-: <a class="el" href="struct__myPrivate.html#o37">_myPrivate</a><li>focusClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o20">_DMXLocalInitInfo</a><li>force
-: <a class="el" href="struct__DMXLocalInitInfo.html#o8">_DMXLocalInitInfo</a><li>freemap
-: <a class="el" href="struct__DMXLocalInitInfo.html#o3">_DMXLocalInitInfo</a><li>freename
-: <a class="el" href="struct__DMXInputInfo.html#o1">_DMXInputInfo</a><li>freenames
-: <a class="el" href="struct__DMXLocalInitInfo.html#o7">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_g">- g -</a></h3><ul>
-<li>geometry
-: <a class="el" href="struct__DMXInputInfo.html#o20">_DMXInputInfo</a><li>get_info
-: <a class="el" href="struct__DMXLocalInputInfo.html#o9">_DMXLocalInputInfo</a><li>glyphSets
-: <a class="el" href="struct__dmxGlyphPriv.html#o0">_dmxGlyphPriv</a></ul>
-<h3><a class="anchor" name="index_h">- h -</a></h3><ul>
-<li>head
-: <a class="el" href="struct__DMXLocalInputInfo.html#o32">_DMXLocalInputInfo</a>, <a class="el" href="struct__EventQueue.html#o0">_EventQueue</a><li>history
-: <a class="el" href="struct__DMXLocalInputInfo.html#o34">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_i">- i -</a></h3><ul>
-<li>index
-: <a class="el" href="struct__DMXScreenInfo.html#o1">_DMXScreenInfo</a><li>init
-: <a class="el" href="struct__DMXLocalInputInfo.html#o6">_DMXLocalInputInfo</a><li>inputIdx
-: <a class="el" href="struct__DMXLocalInputInfo.html#o29">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o3">_DMXInputInfo</a><li>intFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o26">_DMXLocalInitInfo</a><li>isCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o24">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_k">- k -</a></h3><ul>
-<li>kbdFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o22">_DMXLocalInitInfo</a><li>kbdState
-: <a class="el" href="struct__myPrivate.html#o43">_myPrivate</a><li>kBell
-: <a class="el" href="struct__DMXLocalInputInfo.html#o22">_DMXLocalInputInfo</a><li>kctrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o26">_DMXLocalInputInfo</a><li>kCtrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o21">_DMXLocalInputInfo</a><li>keyboard
-: <a class="el" href="struct__DMXLocalInitInfo.html#o0">_DMXLocalInitInfo</a><li>keyClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o1">_DMXLocalInitInfo</a><li>keycodes
-: <a class="el" href="struct__DMXInputInfo.html#o18">_DMXInputInfo</a><li>keySyms
-: <a class="el" href="struct__DMXLocalInitInfo.html#o2">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_l">- l -</a></h3><ul>
-<li>lastEventTime
-: <a class="el" href="struct__EventQueue.html#o2">_EventQueue</a><li>lastMotion
-: <a class="el" href="struct__EventQueue.html#o3">_EventQueue</a><li>lastY
-: <a class="el" href="struct__DMXLocalInputInfo.html#o31">_DMXLocalInputInfo</a><li>latereinit
-: <a class="el" href="struct__DMXLocalInputInfo.html#o8">_DMXLocalInputInfo</a><li>ledFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o24">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_m">- m -</a></h3><ul>
-<li>map
-: <a class="el" href="struct__DMXLocalInputInfo.html#o39">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXLocalInitInfo.html#o11">_DMXLocalInitInfo</a><li>mapOptimize
-: <a class="el" href="struct__DMXLocalInputInfo.html#o40">_DMXLocalInputInfo</a><li>mask
-: <a class="el" href="struct__myPrivate.html#o56">_myPrivate</a><li>maxres
-: <a class="el" href="struct__DMXLocalInitInfo.html#o19">_DMXLocalInitInfo</a><li>maxSymbols
-: <a class="el" href="struct__DMXLocalInitInfo.html#o28">_DMXLocalInitInfo</a><li>maxSymbolsSupported
-: <a class="el" href="struct__DMXLocalInitInfo.html#o29">_DMXLocalInitInfo</a><li>maxval
-: <a class="el" href="struct__DMXLocalInitInfo.html#o16">_DMXLocalInitInfo</a><li>mCtrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o20">_DMXLocalInputInfo</a><li>mctrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o27">_DMXLocalInputInfo</a><li>minres
-: <a class="el" href="struct__DMXLocalInitInfo.html#o18">_DMXLocalInitInfo</a><li>minval
-: <a class="el" href="struct__DMXLocalInitInfo.html#o15">_DMXLocalInitInfo</a><li>modMap
-: <a class="el" href="struct__DMXLocalInitInfo.html#o4">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_n">- n -</a></h3><ul>
-<li>name
-: <a class="el" href="struct__DMXLocalInputInfo.html#o0">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o0">_DMXInputInfo</a>, <a class="el" href="struct__DMXScreenInfo.html#o0">_DMXScreenInfo</a><li>names
-: <a class="el" href="struct__DMXLocalInitInfo.html#o6">_DMXLocalInitInfo</a><li>needsSync
-: <a class="el" href="struct__DMXScreenInfo.html#o58">_DMXScreenInfo</a><li>next
-: <a class="el" href="struct__DMXScreenInfo.html#o28">_DMXScreenInfo</a><li>numAbsAxes
-: <a class="el" href="struct__DMXLocalInitInfo.html#o14">_DMXLocalInitInfo</a><li>numButtons
-: <a class="el" href="struct__DMXLocalInitInfo.html#o10">_DMXLocalInitInfo</a><li>numDevs
-: <a class="el" href="struct__DMXInputInfo.html#o16">_DMXInputInfo</a><li>numLeds
-: <a class="el" href="struct__myPrivate.html#o59">_myPrivate</a><li>numRelAxes
-: <a class="el" href="struct__DMXLocalInitInfo.html#o13">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_o">- o -</a></h3><ul>
-<li>off
-: <a class="el" href="struct__DMXLocalInputInfo.html#o11">_DMXLocalInputInfo</a><li>on
-: <a class="el" href="struct__DMXLocalInputInfo.html#o10">_DMXLocalInputInfo</a><li>over
-: <a class="el" href="struct__DMXScreenInfo.html#o29">_DMXScreenInfo</a></ul>
-<h3><a class="anchor" name="index_p">- p -</a></h3><ul>
-<li>pDequeueScreen
-: <a class="el" href="struct__EventQueue.html#o8">_EventQueue</a><li>pDevice
-: <a class="el" href="struct__myPrivate.html#o55">_myPrivate</a>, <a class="el" href="struct__DMXLocalInputInfo.html#o28">_DMXLocalInputInfo</a><li>pEnqueueScreen
-: <a class="el" href="struct__EventQueue.html#o7">_EventQueue</a><li>pict
-: <a class="el" href="struct__dmxPictPriv.html#o0">_dmxPictPriv</a><li>pitch
-: <a class="el" href="struct__myPrivate.html#o49">_myPrivate</a><li>pPtr
-: <a class="el" href="struct__EventQueue.html#o6">_EventQueue</a><li>private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o23">_DMXLocalInputInfo</a><li>process_input
-: <a class="el" href="struct__DMXLocalInputInfo.html#o17">_DMXLocalInputInfo</a><li>proximityClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o21">_DMXLocalInitInfo</a><li>pScreen
-: <a class="el" href="struct__Event.html#o1">_Event</a><li>ptrFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o23">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_r">- r -</a></h3><ul>
-<li>reinit
-: <a class="el" href="struct__DMXLocalInputInfo.html#o7">_DMXLocalInputInfo</a><li>relmap
-: <a class="el" href="struct__myPrivate.html#o60">_myPrivate</a><li>remote
-: <a class="el" href="struct__DMXEventMap.html#o0">_DMXEventMap</a><li>res
-: <a class="el" href="struct__DMXLocalInitInfo.html#o17">_DMXLocalInitInfo</a><li>rootHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o34">_DMXScreenInfo</a><li>rootWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o33">_DMXScreenInfo</a><li>rootWin
-: <a class="el" href="struct__DMXScreenInfo.html#o30">_DMXScreenInfo</a><li>rootX
-: <a class="el" href="struct__DMXScreenInfo.html#o31">_DMXScreenInfo</a><li>rootXOrigin
-: <a class="el" href="struct__DMXScreenInfo.html#o35">_DMXScreenInfo</a><li>rootY
-: <a class="el" href="struct__DMXScreenInfo.html#o32">_DMXScreenInfo</a><li>rootYOrigin
-: <a class="el" href="struct__DMXScreenInfo.html#o36">_DMXScreenInfo</a></ul>
-<h3><a class="anchor" name="index_s">- s -</a></h3><ul>
-<li>savedMask
-: <a class="el" href="struct__dmxPictPriv.html#o1">_dmxPictPriv</a><li>savedMotionEvents
-: <a class="el" href="struct__DMXLocalInputInfo.html#o37">_DMXLocalInputInfo</a><li>savedSendsCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o38">_DMXLocalInputInfo</a><li>savedTimeout
-: <a class="el" href="struct__DMXScreenInfo.html#o51">_DMXScreenInfo</a><li>scrnDefDrawables
-: <a class="el" href="struct__DMXScreenInfo.html#o27">_DMXScreenInfo</a><li>scrnHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o24">_DMXScreenInfo</a><li>scrnIdx
-: <a class="el" href="struct__DMXInputInfo.html#o4">_DMXInputInfo</a><li>scrnWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o23">_DMXScreenInfo</a><li>scrnWin
-: <a class="el" href="struct__DMXScreenInfo.html#o20">_DMXScreenInfo</a><li>scrnX
-: <a class="el" href="struct__DMXScreenInfo.html#o21">_DMXScreenInfo</a><li>scrnXSign
-: <a class="el" href="struct__DMXScreenInfo.html#o25">_DMXScreenInfo</a><li>scrnY
-: <a class="el" href="struct__DMXScreenInfo.html#o22">_DMXScreenInfo</a><li>scrnYSign
-: <a class="el" href="struct__DMXScreenInfo.html#o26">_DMXScreenInfo</a><li>sendsCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o25">_DMXLocalInputInfo</a><li>server
-: <a class="el" href="struct__DMXEventMap.html#o1">_DMXEventMap</a><li>shadow
-: <a class="el" href="struct__DMXScreenInfo.html#o37">_DMXScreenInfo</a><li>shadowFBImage
-: <a class="el" href="struct__DMXScreenInfo.html#o39">_DMXScreenInfo</a><li>shadowGC
-: <a class="el" href="struct__DMXScreenInfo.html#o38">_DMXScreenInfo</a><li>shared
-: <a class="el" href="struct__DMXScreenInfo.html#o40">_DMXScreenInfo</a><li>sigioAdded
-: <a class="el" href="struct__DMXInputInfo.html#o13">_DMXInputInfo</a><li>sigioFd
-: <a class="el" href="struct__DMXInputInfo.html#o12">_DMXInputInfo</a><li>sigioFdCount
-: <a class="el" href="struct__DMXInputInfo.html#o11">_DMXInputInfo</a><li>sigioState
-: <a class="el" href="struct__DMXInputInfo.html#o10">_DMXInputInfo</a><li>stat
-: <a class="el" href="struct__DMXScreenInfo.html#o57">_DMXScreenInfo</a><li>strFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o27">_DMXLocalInitInfo</a><li>symbols
-: <a class="el" href="struct__DMXLocalInitInfo.html#o30">_DMXLocalInitInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o19">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_t">- t -</a></h3><ul>
-<li>tail
-: <a class="el" href="struct__DMXLocalInputInfo.html#o33">_DMXLocalInputInfo</a>, <a class="el" href="struct__EventQueue.html#o1">_EventQueue</a><li>type
-: <a class="el" href="struct__DMXLocalInputInfo.html#o1">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_u">- u -</a></h3><ul>
-<li>update_info
-: <a class="el" href="struct__DMXLocalInputInfo.html#o19">_DMXLocalInputInfo</a><li>update_position
-: <a class="el" href="struct__DMXLocalInputInfo.html#o12">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_v">- v -</a></h3><ul>
-<li>valuator
-: <a class="el" href="struct__Event.html#o2">_Event</a><li>valuatorClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o12">_DMXLocalInitInfo</a><li>valuators
-: <a class="el" href="struct__DMXLocalInputInfo.html#o35">_DMXLocalInputInfo</a><li>vt_post_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o14">_DMXLocalInputInfo</a><li>vt_pre_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o13">_DMXLocalInputInfo</a><li>vt_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o15">_DMXLocalInputInfo</a><li>vt_switch_pending
-: <a class="el" href="struct__DMXInputInfo.html#o14">_DMXInputInfo</a><li>vt_switched
-: <a class="el" href="struct__DMXInputInfo.html#o15">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_w">- w -</a></h3><ul>
-<li>where
-: <a class="el" href="struct__DMXScreenInfo.html#o47">_DMXScreenInfo</a><li>whereRefScreen
-: <a class="el" href="struct__DMXScreenInfo.html#o50">_DMXScreenInfo</a><li>whereX
-: <a class="el" href="struct__DMXScreenInfo.html#o48">_DMXScreenInfo</a><li>whereY
-: <a class="el" href="struct__DMXScreenInfo.html#o49">_DMXScreenInfo</a><li>windows
-: <a class="el" href="struct__DMXInputInfo.html#o7">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_x">- x -</a></h3><ul>
-<li>xkb
-: <a class="el" href="struct__DMXLocalInitInfo.html#o5">_DMXLocalInitInfo</a></ul>
+: <a class="el" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">_myPrivate</a>
+</li>
+<li>argc
+: <a class="el" href="struct__dmxArg.html#aca6cdc10b22ae5fa4b790c0758eb70c9">_dmxArg</a>
+, <a class="el" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">_DMXConfigParam</a>
+</li>
+<li>argm
+: <a class="el" href="struct__dmxArg.html#aa9baf81a4fabcd2d3f6bbbecd0ebd748">_dmxArg</a>
+</li>
+<li>argv
+: <a class="el" href="struct__dmxArg.html#aade18557285f464ec800a9ed1fc6c3f5">_dmxArg</a>
+, <a class="el" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">_DMXConfigParam</a>
+</li>
+<li>attribMask
+: <a class="el" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">_dmxWinPriv</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/functions_vars.html b/xorg-server/hw/dmx/doc/html/functions_vars.html
index 71c36065d..92fe40193 100644
--- a/xorg-server/hw/dmx/doc/html/functions_vars.html
+++ b/xorg-server/hw/dmx/doc/html/functions_vars.html
@@ -6,223 +6,80 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_k">k</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="functions.html"><span>All</span></a></li>
+      <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+      <li><a href="functions_eval.html"><span>Enumerator</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="functions_vars.html#index_a"><span>a</span></a></li>
+      <li><a href="functions_vars_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="functions_vars_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="functions_vars_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="functions_vars_0x65.html#index_e"><span>e</span></a></li>
+      <li><a href="functions_vars_0x66.html#index_f"><span>f</span></a></li>
+      <li><a href="functions_vars_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="functions_vars_0x68.html#index_h"><span>h</span></a></li>
+      <li><a href="functions_vars_0x69.html#index_i"><span>i</span></a></li>
+      <li><a href="functions_vars_0x6b.html#index_k"><span>k</span></a></li>
+      <li><a href="functions_vars_0x6c.html#index_l"><span>l</span></a></li>
+      <li><a href="functions_vars_0x6d.html#index_m"><span>m</span></a></li>
+      <li><a href="functions_vars_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="functions_vars_0x6f.html#index_o"><span>o</span></a></li>
+      <li><a href="functions_vars_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="functions_vars_0x72.html#index_r"><span>r</span></a></li>
+      <li><a href="functions_vars_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="functions_vars_0x74.html#index_t"><span>t</span></a></li>
+      <li><a href="functions_vars_0x75.html#index_u"><span>u</span></a></li>
+      <li><a href="functions_vars_0x76.html#index_v"><span>v</span></a></li>
+      <li><a href="functions_vars_0x77.html#index_w"><span>w</span></a></li>
+      <li><a href="functions_vars_0x78.html#index_x"><span>x</span></a></li>
+      <li><a href="functions_vars_0x79.html#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-
-<p>
-<h3><a class="anchor" name="index_a">- a -</a></h3><ul>
+<h3><a class="anchor" id="index_a">- a -</a></h3><ul>
 <li>absmap
-: <a class="el" href="struct__myPrivate.html#o61">_myPrivate</a><li>argc
-: <a class="el" href="struct__dmxArg.html#o0">_dmxArg</a><li>argm
-: <a class="el" href="struct__dmxArg.html#o1">_dmxArg</a><li>argv
-: <a class="el" href="struct__dmxArg.html#o2">_dmxArg</a></ul>
-<h3><a class="anchor" name="index_b">- b -</a></h3><ul>
-<li>beBlackPixel
-: <a class="el" href="struct__DMXScreenInfo.html#o18">_DMXScreenInfo</a><li>beBPP
-: <a class="el" href="struct__DMXScreenInfo.html#o6">_DMXScreenInfo</a><li>beDefColormaps
-: <a class="el" href="struct__DMXScreenInfo.html#o17">_DMXScreenInfo</a><li>beDefVisualIndex
-: <a class="el" href="struct__DMXScreenInfo.html#o15">_DMXScreenInfo</a><li>beDepth
-: <a class="el" href="struct__DMXScreenInfo.html#o5">_DMXScreenInfo</a><li>beDepths
-: <a class="el" href="struct__DMXScreenInfo.html#o10">_DMXScreenInfo</a><li>beDisplay
-: <a class="el" href="struct__DMXScreenInfo.html#o2">_DMXScreenInfo</a><li>beHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o4">_DMXScreenInfo</a><li>belFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o25">_DMXLocalInitInfo</a><li>beNumDefColormaps
-: <a class="el" href="struct__DMXScreenInfo.html#o16">_DMXScreenInfo</a><li>beNumDepths
-: <a class="el" href="struct__DMXScreenInfo.html#o9">_DMXScreenInfo</a><li>beNumPixmapFormats
-: <a class="el" href="struct__DMXScreenInfo.html#o11">_DMXScreenInfo</a><li>beNumVisuals
-: <a class="el" href="struct__DMXScreenInfo.html#o13">_DMXScreenInfo</a><li>bePixmapFormats
-: <a class="el" href="struct__DMXScreenInfo.html#o12">_DMXScreenInfo</a><li>beVisuals
-: <a class="el" href="struct__DMXScreenInfo.html#o14">_DMXScreenInfo</a><li>beWhitePixel
-: <a class="el" href="struct__DMXScreenInfo.html#o19">_DMXScreenInfo</a><li>beWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o3">_DMXScreenInfo</a><li>beXDPI
-: <a class="el" href="struct__DMXScreenInfo.html#o7">_DMXScreenInfo</a><li>beYDPI
-: <a class="el" href="struct__DMXScreenInfo.html#o8">_DMXScreenInfo</a><li>binding
-: <a class="el" href="struct__DMXLocalInputInfo.html#o3">_DMXLocalInputInfo</a><li>buttonClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o9">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_c">- c -</a></h3><ul>
-<li>CloseScreen
-: <a class="el" href="struct__DMXScreenInfo.html#o59">_DMXScreenInfo</a><li>collect_events
-: <a class="el" href="struct__DMXLocalInputInfo.html#o16">_DMXLocalInputInfo</a><li>console
-: <a class="el" href="struct__DMXInputInfo.html#o6">_DMXInputInfo</a><li>core
-: <a class="el" href="struct__DMXInputInfo.html#o5">_DMXInputInfo</a><li>create_private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o4">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_d">- d -</a></h3><ul>
-<li>destroy_private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o5">_DMXLocalInputInfo</a><li>detached
-: <a class="el" href="struct__DMXInputInfo.html#o2">_DMXInputInfo</a><li>deviceId
-: <a class="el" href="struct__DMXLocalInputInfo.html#o41">_DMXLocalInputInfo</a><li>deviceName
-: <a class="el" href="struct__DMXLocalInputInfo.html#o42">_DMXLocalInputInfo</a><li>devs
-: <a class="el" href="struct__DMXInputInfo.html#o17">_DMXInputInfo</a><li>dmxInput
-: <a class="el" href="struct__myPrivate.html#o62">_myPrivate</a><li>dpmsCapable
-: <a class="el" href="struct__DMXScreenInfo.html#o52">_DMXScreenInfo</a><li>dpmsEnabled
-: <a class="el" href="struct__DMXScreenInfo.html#o53">_DMXScreenInfo</a><li>dpmsOff
-: <a class="el" href="struct__DMXScreenInfo.html#o56">_DMXScreenInfo</a><li>dpmsStandby
-: <a class="el" href="struct__DMXScreenInfo.html#o54">_DMXScreenInfo</a><li>dpmsSuspend
-: <a class="el" href="struct__DMXScreenInfo.html#o55">_DMXScreenInfo</a><li>duration
-: <a class="el" href="struct__myPrivate.html#o50">_myPrivate</a></ul>
-<h3><a class="anchor" name="index_e">- e -</a></h3><ul>
-<li>event
-: <a class="el" href="struct__Event.html#o0">_Event</a><li>events
-: <a class="el" href="struct__EventQueue.html#o4">_EventQueue</a><li>extType
-: <a class="el" href="struct__DMXLocalInputInfo.html#o2">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_f">- f -</a></h3><ul>
-<li>fd
-: <a class="el" href="struct__myPrivate.html#o37">_myPrivate</a><li>focusClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o20">_DMXLocalInitInfo</a><li>force
-: <a class="el" href="struct__DMXLocalInitInfo.html#o8">_DMXLocalInitInfo</a><li>freemap
-: <a class="el" href="struct__DMXLocalInitInfo.html#o3">_DMXLocalInitInfo</a><li>freename
-: <a class="el" href="struct__DMXInputInfo.html#o1">_DMXInputInfo</a><li>freenames
-: <a class="el" href="struct__DMXLocalInitInfo.html#o7">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_g">- g -</a></h3><ul>
-<li>geometry
-: <a class="el" href="struct__DMXInputInfo.html#o20">_DMXInputInfo</a><li>get_info
-: <a class="el" href="struct__DMXLocalInputInfo.html#o9">_DMXLocalInputInfo</a><li>glyphSets
-: <a class="el" href="struct__dmxGlyphPriv.html#o0">_dmxGlyphPriv</a></ul>
-<h3><a class="anchor" name="index_h">- h -</a></h3><ul>
-<li>head
-: <a class="el" href="struct__DMXLocalInputInfo.html#o32">_DMXLocalInputInfo</a>, <a class="el" href="struct__EventQueue.html#o0">_EventQueue</a><li>history
-: <a class="el" href="struct__DMXLocalInputInfo.html#o34">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_i">- i -</a></h3><ul>
-<li>index
-: <a class="el" href="struct__DMXScreenInfo.html#o1">_DMXScreenInfo</a><li>init
-: <a class="el" href="struct__DMXLocalInputInfo.html#o6">_DMXLocalInputInfo</a><li>inputIdx
-: <a class="el" href="struct__DMXLocalInputInfo.html#o29">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o3">_DMXInputInfo</a><li>intFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o26">_DMXLocalInitInfo</a><li>isCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o24">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_k">- k -</a></h3><ul>
-<li>kbdFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o22">_DMXLocalInitInfo</a><li>kbdState
-: <a class="el" href="struct__myPrivate.html#o43">_myPrivate</a><li>kBell
-: <a class="el" href="struct__DMXLocalInputInfo.html#o22">_DMXLocalInputInfo</a><li>kctrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o26">_DMXLocalInputInfo</a><li>kCtrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o21">_DMXLocalInputInfo</a><li>keyboard
-: <a class="el" href="struct__DMXLocalInitInfo.html#o0">_DMXLocalInitInfo</a><li>keyClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o1">_DMXLocalInitInfo</a><li>keycodes
-: <a class="el" href="struct__DMXInputInfo.html#o18">_DMXInputInfo</a><li>keySyms
-: <a class="el" href="struct__DMXLocalInitInfo.html#o2">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_l">- l -</a></h3><ul>
-<li>lastEventTime
-: <a class="el" href="struct__EventQueue.html#o2">_EventQueue</a><li>lastMotion
-: <a class="el" href="struct__EventQueue.html#o3">_EventQueue</a><li>lastY
-: <a class="el" href="struct__DMXLocalInputInfo.html#o31">_DMXLocalInputInfo</a><li>latereinit
-: <a class="el" href="struct__DMXLocalInputInfo.html#o8">_DMXLocalInputInfo</a><li>ledFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o24">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_m">- m -</a></h3><ul>
-<li>map
-: <a class="el" href="struct__DMXLocalInputInfo.html#o39">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXLocalInitInfo.html#o11">_DMXLocalInitInfo</a><li>mapOptimize
-: <a class="el" href="struct__DMXLocalInputInfo.html#o40">_DMXLocalInputInfo</a><li>mask
-: <a class="el" href="struct__myPrivate.html#o56">_myPrivate</a><li>maxres
-: <a class="el" href="struct__DMXLocalInitInfo.html#o19">_DMXLocalInitInfo</a><li>maxSymbols
-: <a class="el" href="struct__DMXLocalInitInfo.html#o28">_DMXLocalInitInfo</a><li>maxSymbolsSupported
-: <a class="el" href="struct__DMXLocalInitInfo.html#o29">_DMXLocalInitInfo</a><li>maxval
-: <a class="el" href="struct__DMXLocalInitInfo.html#o16">_DMXLocalInitInfo</a><li>mCtrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o20">_DMXLocalInputInfo</a><li>mctrl
-: <a class="el" href="struct__DMXLocalInputInfo.html#o27">_DMXLocalInputInfo</a><li>minres
-: <a class="el" href="struct__DMXLocalInitInfo.html#o18">_DMXLocalInitInfo</a><li>minval
-: <a class="el" href="struct__DMXLocalInitInfo.html#o15">_DMXLocalInitInfo</a><li>modMap
-: <a class="el" href="struct__DMXLocalInitInfo.html#o4">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_n">- n -</a></h3><ul>
-<li>name
-: <a class="el" href="struct__DMXLocalInputInfo.html#o0">_DMXLocalInputInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o0">_DMXInputInfo</a>, <a class="el" href="struct__DMXScreenInfo.html#o0">_DMXScreenInfo</a><li>names
-: <a class="el" href="struct__DMXLocalInitInfo.html#o6">_DMXLocalInitInfo</a><li>needsSync
-: <a class="el" href="struct__DMXScreenInfo.html#o58">_DMXScreenInfo</a><li>next
-: <a class="el" href="struct__DMXScreenInfo.html#o28">_DMXScreenInfo</a><li>numAbsAxes
-: <a class="el" href="struct__DMXLocalInitInfo.html#o14">_DMXLocalInitInfo</a><li>numButtons
-: <a class="el" href="struct__DMXLocalInitInfo.html#o10">_DMXLocalInitInfo</a><li>numDevs
-: <a class="el" href="struct__DMXInputInfo.html#o16">_DMXInputInfo</a><li>numLeds
-: <a class="el" href="struct__myPrivate.html#o59">_myPrivate</a><li>numRelAxes
-: <a class="el" href="struct__DMXLocalInitInfo.html#o13">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_o">- o -</a></h3><ul>
-<li>off
-: <a class="el" href="struct__DMXLocalInputInfo.html#o11">_DMXLocalInputInfo</a><li>on
-: <a class="el" href="struct__DMXLocalInputInfo.html#o10">_DMXLocalInputInfo</a><li>over
-: <a class="el" href="struct__DMXScreenInfo.html#o29">_DMXScreenInfo</a></ul>
-<h3><a class="anchor" name="index_p">- p -</a></h3><ul>
-<li>pDequeueScreen
-: <a class="el" href="struct__EventQueue.html#o8">_EventQueue</a><li>pDevice
-: <a class="el" href="struct__myPrivate.html#o55">_myPrivate</a>, <a class="el" href="struct__DMXLocalInputInfo.html#o28">_DMXLocalInputInfo</a><li>pEnqueueScreen
-: <a class="el" href="struct__EventQueue.html#o7">_EventQueue</a><li>pict
-: <a class="el" href="struct__dmxPictPriv.html#o0">_dmxPictPriv</a><li>pitch
-: <a class="el" href="struct__myPrivate.html#o49">_myPrivate</a><li>pPtr
-: <a class="el" href="struct__EventQueue.html#o6">_EventQueue</a><li>private
-: <a class="el" href="struct__DMXLocalInputInfo.html#o23">_DMXLocalInputInfo</a><li>process_input
-: <a class="el" href="struct__DMXLocalInputInfo.html#o17">_DMXLocalInputInfo</a><li>proximityClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o21">_DMXLocalInitInfo</a><li>pScreen
-: <a class="el" href="struct__Event.html#o1">_Event</a><li>ptrFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o23">_DMXLocalInitInfo</a></ul>
-<h3><a class="anchor" name="index_r">- r -</a></h3><ul>
-<li>reinit
-: <a class="el" href="struct__DMXLocalInputInfo.html#o7">_DMXLocalInputInfo</a><li>relmap
-: <a class="el" href="struct__myPrivate.html#o60">_myPrivate</a><li>remote
-: <a class="el" href="struct__DMXEventMap.html#o0">_DMXEventMap</a><li>res
-: <a class="el" href="struct__DMXLocalInitInfo.html#o17">_DMXLocalInitInfo</a><li>rootHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o34">_DMXScreenInfo</a><li>rootWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o33">_DMXScreenInfo</a><li>rootWin
-: <a class="el" href="struct__DMXScreenInfo.html#o30">_DMXScreenInfo</a><li>rootX
-: <a class="el" href="struct__DMXScreenInfo.html#o31">_DMXScreenInfo</a><li>rootXOrigin
-: <a class="el" href="struct__DMXScreenInfo.html#o35">_DMXScreenInfo</a><li>rootY
-: <a class="el" href="struct__DMXScreenInfo.html#o32">_DMXScreenInfo</a><li>rootYOrigin
-: <a class="el" href="struct__DMXScreenInfo.html#o36">_DMXScreenInfo</a></ul>
-<h3><a class="anchor" name="index_s">- s -</a></h3><ul>
-<li>savedMask
-: <a class="el" href="struct__dmxPictPriv.html#o1">_dmxPictPriv</a><li>savedMotionEvents
-: <a class="el" href="struct__DMXLocalInputInfo.html#o37">_DMXLocalInputInfo</a><li>savedSendsCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o38">_DMXLocalInputInfo</a><li>savedTimeout
-: <a class="el" href="struct__DMXScreenInfo.html#o51">_DMXScreenInfo</a><li>scrnDefDrawables
-: <a class="el" href="struct__DMXScreenInfo.html#o27">_DMXScreenInfo</a><li>scrnHeight
-: <a class="el" href="struct__DMXScreenInfo.html#o24">_DMXScreenInfo</a><li>scrnIdx
-: <a class="el" href="struct__DMXInputInfo.html#o4">_DMXInputInfo</a><li>scrnWidth
-: <a class="el" href="struct__DMXScreenInfo.html#o23">_DMXScreenInfo</a><li>scrnWin
-: <a class="el" href="struct__DMXScreenInfo.html#o20">_DMXScreenInfo</a><li>scrnX
-: <a class="el" href="struct__DMXScreenInfo.html#o21">_DMXScreenInfo</a><li>scrnXSign
-: <a class="el" href="struct__DMXScreenInfo.html#o25">_DMXScreenInfo</a><li>scrnY
-: <a class="el" href="struct__DMXScreenInfo.html#o22">_DMXScreenInfo</a><li>scrnYSign
-: <a class="el" href="struct__DMXScreenInfo.html#o26">_DMXScreenInfo</a><li>sendsCore
-: <a class="el" href="struct__DMXLocalInputInfo.html#o25">_DMXLocalInputInfo</a><li>server
-: <a class="el" href="struct__DMXEventMap.html#o1">_DMXEventMap</a><li>shadow
-: <a class="el" href="struct__DMXScreenInfo.html#o37">_DMXScreenInfo</a><li>shadowFBImage
-: <a class="el" href="struct__DMXScreenInfo.html#o39">_DMXScreenInfo</a><li>shadowGC
-: <a class="el" href="struct__DMXScreenInfo.html#o38">_DMXScreenInfo</a><li>shared
-: <a class="el" href="struct__DMXScreenInfo.html#o40">_DMXScreenInfo</a><li>sigioAdded
-: <a class="el" href="struct__DMXInputInfo.html#o13">_DMXInputInfo</a><li>sigioFd
-: <a class="el" href="struct__DMXInputInfo.html#o12">_DMXInputInfo</a><li>sigioFdCount
-: <a class="el" href="struct__DMXInputInfo.html#o11">_DMXInputInfo</a><li>sigioState
-: <a class="el" href="struct__DMXInputInfo.html#o10">_DMXInputInfo</a><li>stat
-: <a class="el" href="struct__DMXScreenInfo.html#o57">_DMXScreenInfo</a><li>strFeedbackClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o27">_DMXLocalInitInfo</a><li>symbols
-: <a class="el" href="struct__DMXLocalInitInfo.html#o30">_DMXLocalInitInfo</a>, <a class="el" href="struct__DMXInputInfo.html#o19">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_t">- t -</a></h3><ul>
-<li>tail
-: <a class="el" href="struct__DMXLocalInputInfo.html#o33">_DMXLocalInputInfo</a>, <a class="el" href="struct__EventQueue.html#o1">_EventQueue</a><li>type
-: <a class="el" href="struct__DMXLocalInputInfo.html#o1">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_u">- u -</a></h3><ul>
-<li>update_info
-: <a class="el" href="struct__DMXLocalInputInfo.html#o19">_DMXLocalInputInfo</a><li>update_position
-: <a class="el" href="struct__DMXLocalInputInfo.html#o12">_DMXLocalInputInfo</a></ul>
-<h3><a class="anchor" name="index_v">- v -</a></h3><ul>
-<li>valuator
-: <a class="el" href="struct__Event.html#o2">_Event</a><li>valuatorClass
-: <a class="el" href="struct__DMXLocalInitInfo.html#o12">_DMXLocalInitInfo</a><li>valuators
-: <a class="el" href="struct__DMXLocalInputInfo.html#o35">_DMXLocalInputInfo</a><li>vt_post_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o14">_DMXLocalInputInfo</a><li>vt_pre_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o13">_DMXLocalInputInfo</a><li>vt_switch
-: <a class="el" href="struct__DMXLocalInputInfo.html#o15">_DMXLocalInputInfo</a><li>vt_switch_pending
-: <a class="el" href="struct__DMXInputInfo.html#o14">_DMXInputInfo</a><li>vt_switched
-: <a class="el" href="struct__DMXInputInfo.html#o15">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_w">- w -</a></h3><ul>
-<li>where
-: <a class="el" href="struct__DMXScreenInfo.html#o47">_DMXScreenInfo</a><li>whereRefScreen
-: <a class="el" href="struct__DMXScreenInfo.html#o50">_DMXScreenInfo</a><li>whereX
-: <a class="el" href="struct__DMXScreenInfo.html#o48">_DMXScreenInfo</a><li>whereY
-: <a class="el" href="struct__DMXScreenInfo.html#o49">_DMXScreenInfo</a><li>windows
-: <a class="el" href="struct__DMXInputInfo.html#o7">_DMXInputInfo</a></ul>
-<h3><a class="anchor" name="index_x">- x -</a></h3><ul>
-<li>xkb
-: <a class="el" href="struct__DMXLocalInitInfo.html#o5">_DMXLocalInitInfo</a></ul>
+: <a class="el" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">_myPrivate</a>
+</li>
+<li>argc
+: <a class="el" href="struct__dmxArg.html#aca6cdc10b22ae5fa4b790c0758eb70c9">_dmxArg</a>
+, <a class="el" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">_DMXConfigParam</a>
+</li>
+<li>argm
+: <a class="el" href="struct__dmxArg.html#aa9baf81a4fabcd2d3f6bbbecd0ebd748">_dmxArg</a>
+</li>
+<li>argv
+: <a class="el" href="struct__dmxArg.html#aade18557285f464ec800a9ed1fc6c3f5">_dmxArg</a>
+, <a class="el" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">_DMXConfigParam</a>
+</li>
+<li>attribMask
+: <a class="el" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">_dmxWinPriv</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals.html b/xorg-server/hw/dmx/doc/html/globals.html
index 5a81930af..78b3e0401 100644
--- a/xorg-server/hw/dmx/doc/html/globals.html
+++ b/xorg-server/hw/dmx/doc/html/globals.html
@@ -6,508 +6,96 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_k">k</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_q">q</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_x">x</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x61.html#index_a"><span>a</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x65.html#index_e"><span>e</span></a></li>
+      <li><a href="globals_0x66.html#index_f"><span>f</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x69.html#index_i"><span>i</span></a></li>
+      <li><a href="globals_0x6b.html#index_k"><span>k</span></a></li>
+      <li><a href="globals_0x6c.html#index_l"><span>l</span></a></li>
+      <li><a href="globals_0x6d.html#index_m"><span>m</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x6f.html#index_o"><span>o</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x71.html#index_q"><span>q</span></a></li>
+      <li><a href="globals_0x72.html#index_r"><span>r</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+      <li><a href="globals_0x75.html#index_u"><span>u</span></a></li>
+      <li><a href="globals_0x76.html#index_v"><span>v</span></a></li>
+      <li><a href="globals_0x78.html#index_x"><span>x</span></a></li>
+      <li><a href="globals_0x79.html#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 
-<p>
-
-<p>
-Here is a list of all documented functions, variables, defines, enums, and typedefs with links to the documentation:<h3><a class="anchor" name="index_a">- a -</a></h3><ul>
-<li>AbortDDX()
-: <a class="el" href="dmxinit_8c.html#a36">dmxinit.c</a><li>AbortServer()
-: <a class="el" href="dmxlog_8c.html#a3">dmxlog.c</a><li>AddOtherInputDevices()
-: <a class="el" href="dmxxinput_8c.html#a4">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_c">- c -</a></h3><ul>
-<li>ChangeDeviceControl()
-: <a class="el" href="dmxxinput_8c.html#a8">dmxxinput.c</a><li>ChangeKeyboardDevice()
-: <a class="el" href="dmxxinput_8c.html#a1">dmxxinput.c</a><li>ChangePointerDevice()
-: <a class="el" href="dmxxinput_8c.html#a2">dmxxinput.c</a><li>CloseInputDevice()
-: <a class="el" href="dmxxinput_8c.html#a3">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_d">- d -</a></h3><ul>
-<li>ddxGiveUp()
-: <a class="el" href="dmxinit_8c.html#a37">dmxinit.c</a><li>ddxProcessArgument()
-: <a class="el" href="dmxinit_8c.html#a40">dmxinit.c</a><li>ddxUseMsg()
-: <a class="el" href="dmxinit_8c.html#a41">dmxinit.c</a><li>DMX_ACTIVESIGIO
-: <a class="el" href="dmxinput_8h.html#a31a14">dmxinput.h</a><li>DMX_ATOMNAME
-: <a class="el" href="dmxprop_8c.html#a0">dmxprop.c</a><li>DMX_GET_COLORMAP_PRIV
-: <a class="el" href="dmxcmap_8h.html#a1">dmxcmap.h</a><li>DMX_GET_GC_PRIV
-: <a class="el" href="dmxgc_8h.html#a0">dmxgc.h</a><li>DMX_GET_GLYPH_PRIV
-: <a class="el" href="dmxpict_8h.html#a2">dmxpict.h</a><li>DMX_GET_PICT_PRIV
-: <a class="el" href="dmxpict_8h.html#a0">dmxpict.h</a><li>DMX_GET_PIXMAP_PRIV
-: <a class="el" href="dmxpixmap_8h.html#a0">dmxpixmap.h</a><li>DMX_GET_WINDOW_PRIV
-: <a class="el" href="dmxwindow_8h.html#a0">dmxwindow.h</a><li>DMX_IDENT
-: <a class="el" href="dmxprop_8c.html#a1">dmxprop.c</a><li>DMX_MAX_SIGIO_FDS
-: <a class="el" href="dmxinput_8h.html#a0">dmxinput.h</a><li>DMX_NOSIGIO
-: <a class="el" href="dmxinput_8h.html#a31a12">dmxinput.h</a><li>DMX_SET_COLORMAP_PRIV
-: <a class="el" href="dmxcmap_8h.html#a0">dmxcmap.h</a><li>DMX_SET_GLYPH_PRIV
-: <a class="el" href="dmxpict_8h.html#a1">dmxpict.h</a><li>DMX_STAT_BIN0
-: <a class="el" href="dmxstat_8h.html#a3">dmxstat.h</a><li>DMX_STAT_BINMULT
-: <a class="el" href="dmxstat_8h.html#a4">dmxstat.h</a><li>DMX_STAT_BINS
-: <a class="el" href="dmxstat_8h.html#a2">dmxstat.h</a><li>DMX_STAT_INTERVAL
-: <a class="el" href="dmxstat_8h.html#a1">dmxstat.h</a><li>DMX_STAT_LENGTH
-: <a class="el" href="dmxstat_8h.html#a0">dmxstat.h</a><li>DMX_UNWRAP
-: <a class="el" href="dmx_8h.html#a1">dmx.h</a><li>DMX_UPDATE_COPY
-: <a class="el" href="dmxinput_8h.html#a30a9">dmxinput.h</a><li>DMX_UPDATE_REALIZE
-: <a class="el" href="dmxinput_8h.html#a30a6">dmxinput.h</a><li>DMX_UPDATE_REPARENT
-: <a class="el" href="dmxinput_8h.html#a30a11">dmxinput.h</a><li>DMX_UPDATE_RESIZE
-: <a class="el" href="dmxinput_8h.html#a30a10">dmxinput.h</a><li>DMX_UPDATE_RESTACK
-: <a class="el" href="dmxinput_8h.html#a30a8">dmxinput.h</a><li>DMX_UPDATE_UNREALIZE
-: <a class="el" href="dmxinput_8h.html#a30a7">dmxinput.h</a><li>DMX_USESIGIO
-: <a class="el" href="dmxinput_8h.html#a31a13">dmxinput.h</a><li>DMX_WRAP
-: <a class="el" href="dmx_8h.html#a0">dmx.h</a><li>DMXAddBackendInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a31">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a39">dmxext.h</a><li>DMXAddConsoleInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a32">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a40">dmxext.h</a><li>dmxAddInput()
-: <a class="el" href="dmxextension_8h.html#a12">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a7">dmxextension.c</a><li>DMXAddInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a30">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a37">dmxext.h</a><li>dmxAddRemoveScreens
-: <a class="el" href="dmxinit_8c.html#a17">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a18">dmx.h</a><li>DMXAddScreen()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a21">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a30">dmxext.h</a><li>dmxArgAdd()
-: <a class="el" href="dmxarg_8h.html#a3">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a3">dmxarg.c</a><li>dmxArgC()
-: <a class="el" href="dmxarg_8h.html#a5">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a5">dmxarg.c</a><li>dmxArgCreate()
-: <a class="el" href="dmxarg_8h.html#a1">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a1">dmxarg.c</a><li>dmxArgFree()
-: <a class="el" href="dmxarg_8h.html#a2">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a2">dmxarg.c</a><li>dmxArgParse()
-: <a class="el" href="dmxarg_8h.html#a6">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a6">dmxarg.c</a><li>dmxArgV()
-: <a class="el" href="dmxarg_8h.html#a4">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a4">dmxarg.c</a><li>dmxAttachScreen()
-: <a class="el" href="dmxextension_8h.html#a17">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a18">dmxextension.c</a><li>dmxBackendCollectEvents()
-: <a class="el" href="dmxbackend_8h.html#a6">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a25">dmxbackend.c</a><li>dmxBackendCreatePrivate()
-: <a class="el" href="dmxbackend_8h.html#a0">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a12">dmxbackend.c</a><li>dmxBackendDestroyPrivate()
-: <a class="el" href="dmxbackend_8h.html#a1">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a13">dmxbackend.c</a><li>dmxBackendFunctions()
-: <a class="el" href="dmxbackend_8h.html#a8">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a33">dmxbackend.c</a><li>dmxBackendInit()
-: <a class="el" href="dmxbackend_8h.html#a2">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a30">dmxbackend.c</a><li>dmxBackendKbdGetInfo()
-: <a class="el" href="dmxbackend_8h.html#a5">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a32">dmxbackend.c</a><li>dmxBackendLateReInit()
-: <a class="el" href="dmxbackend_8h.html#a3">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a29">dmxbackend.c</a><li>dmxBackendMouGetInfo()
-: <a class="el" href="dmxbackend_8h.html#a4">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a31">dmxbackend.c</a><li>dmxBackendProcessInput()
-: <a class="el" href="dmxbackend_8h.html#a7">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a26">dmxbackend.c</a><li>dmxBackendUpdatePosition()
-: <a class="el" href="dmxbackend_8h.html#a9">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a24">dmxbackend.c</a><li>dmxBECloseScreen()
-: <a class="el" href="dmxscrinit_8h.html#a3">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a13">dmxscrinit.c</a><li>dmxBECreateColormap()
-: <a class="el" href="dmxcmap_8h.html#a10">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a2">dmxcmap.c</a><li>dmxBECreateCursor()
-: <a class="el" href="dmxcursor_8h.html#a13">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a29">dmxcursor.c</a><li>dmxBECreateGC()
-: <a class="el" href="dmxgc_8h.html#a15">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a3">dmxgc.c</a><li>dmxBECreatePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a8">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a1">dmxpixmap.c</a><li>dmxBEDestroyWindow()
-: <a class="el" href="dmxwindow_8h.html#a31">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a11">dmxwindow.c</a><li>dmxBEFreeColormap()
-: <a class="el" href="dmxcmap_8h.html#a11">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a4">dmxcmap.c</a><li>dmxBEFreeCursor()
-: <a class="el" href="dmxcursor_8h.html#a14">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a31">dmxcursor.c</a><li>dmxBEFreeFont()
-: <a class="el" href="dmxfont_8h.html#a8">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a14">dmxfont.c</a><li>dmxBEFreeGC()
-: <a class="el" href="dmxgc_8h.html#a16">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a8">dmxgc.c</a><li>dmxBEFreeGlyphSet()
-: <a class="el" href="dmxpict_8h.html#a30">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a16">dmxpict.c</a><li>dmxBEFreePicture()
-: <a class="el" href="dmxpict_8h.html#a31">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a20">dmxpict.c</a><li>dmxBEFreePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a9">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a3">dmxpixmap.c</a><li>dmxBELoadFont()
-: <a class="el" href="dmxfont_8h.html#a7">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a12">dmxfont.c</a><li>dmxBEScreenInit()
-: <a class="el" href="dmxscrinit_8h.html#a2">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a11">dmxscrinit.c</a><li>dmxBitmapToRegion()
-: <a class="el" href="dmxpixmap_8h.html#a7">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a5">dmxpixmap.c</a><li>dmxChangeBorderWidth()
-: <a class="el" href="dmxwindow_8h.html#a28">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a25">dmxwindow.c</a><li>dmxChangeClip()
-: <a class="el" href="dmxgc_8h.html#a12">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a10">dmxgc.c</a><li>DMXChangeDesktopAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a27">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a34">dmxext.h</a><li>dmxChangeGC()
-: <a class="el" href="dmxgc_8h.html#a9">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a6">dmxgc.c</a><li>dmxChangePicture()
-: <a class="el" href="dmxpict_8h.html#a18">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a25">dmxpict.c</a><li>dmxChangePictureClip()
-: <a class="el" href="dmxpict_8h.html#a16">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a23">dmxpict.c</a><li>dmxChangePointerControl()
-: <a class="el" href="dmxinputinit_8h.html#a54">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a16">dmxinputinit.c</a><li>DMXChangeScreensAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a20">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a29">dmxext.h</a><li>dmxChangeWindowAttributes()
-: <a class="el" href="dmxwindow_8h.html#a18">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a14">dmxwindow.c</a><li>dmxCheckCursor()
-: <a class="el" href="dmxcursor_8h.html#a10">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a41">dmxcursor.c</a><li>dmxCheckSpecialKeys()
-: <a class="el" href="dmxevents_8h.html#a2">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a28">dmxevents.c</a><li>dmxCloseIndexed()
-: <a class="el" href="dmxpict_8h.html#a24">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a31">dmxpict.c</a><li>dmxCloseScreen()
-: <a class="el" href="dmxscrinit_8c.html#a9">dmxscrinit.c</a><li>dmxColormapFromDefaultVisual()
-: <a class="el" href="dmxvisual_8h.html#a2">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a2">dmxvisual.c</a><li>dmxColormapPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a6">dmxscrinit.c</a>, <a class="el" href="dmxcmap_8h.html#a4">dmxcmap.h</a><li>dmxColormapPrivPtr
-: <a class="el" href="dmxcmap_8h.html#a3">dmxcmap.h</a><li>dmxColormapPrivRec
-: <a class="el" href="dmxcmap_8h.html#a2">dmxcmap.h</a><li>dmxCommonCopyPrivate()
-: <a class="el" href="dmxcommon_8h.html#a27">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a26">dmxcommon.c</a><li>dmxCommonKbdBell()
-: <a class="el" href="dmxcommon_8h.html#a16">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a11">dmxcommon.c</a><li>dmxCommonKbdCtrl()
-: <a class="el" href="dmxcommon_8h.html#a15">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a9">dmxcommon.c</a><li>dmxCommonKbdGetInfo()
-: <a class="el" href="dmxcommon_8h.html#a13">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a13">dmxcommon.c</a><li>dmxCommonKbdGetMap()
-: <a class="el" href="dmxcommon_8h.html#a14">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a12">dmxcommon.c</a><li>dmxCommonKbdOff()
-: <a class="el" href="dmxcommon_8h.html#a18">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a15">dmxcommon.c</a><li>dmxCommonKbdOn()
-: <a class="el" href="dmxcommon_8h.html#a17">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a14">dmxcommon.c</a><li>dmxCommonMouCtrl()
-: <a class="el" href="dmxcommon_8h.html#a20">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a10">dmxcommon.c</a><li>dmxCommonMouGetMap()
-: <a class="el" href="dmxcommon_8h.html#a19">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a19">dmxcommon.c</a><li>dmxCommonMouOff()
-: <a class="el" href="dmxcommon_8h.html#a22">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a24">dmxcommon.c</a><li>dmxCommonMouOn()
-: <a class="el" href="dmxcommon_8h.html#a21">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a23">dmxcommon.c</a><li>dmxCommonOthGetInfo()
-: <a class="el" href="dmxcommon_8h.html#a26">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a18">dmxcommon.c</a><li>dmxCommonOthOff()
-: <a class="el" href="dmxcommon_8h.html#a25">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a17">dmxcommon.c</a><li>dmxCommonOthOn()
-: <a class="el" href="dmxcommon_8h.html#a24">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a16">dmxcommon.c</a><li>dmxCommonRestoreState()
-: <a class="el" href="dmxcommon_8h.html#a29">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a28">dmxcommon.c</a><li>dmxCommonSaveState()
-: <a class="el" href="dmxcommon_8h.html#a28">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a27">dmxcommon.c</a><li>dmxComposite()
-: <a class="el" href="dmxpict_8h.html#a20">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a27">dmxpict.c</a><li>dmxCompositeRects()
-: <a class="el" href="dmxpict_8h.html#a22">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a29">dmxpict.c</a><li>dmxComputeWidthHeight()
-: <a class="el" href="dmxcb_8h.html#a5">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a8">dmxcb.c</a><li>DMXConfigCmd
-: <a class="el" href="dmxconfig_8c.html#a9">dmxconfig.c</a><li>DMXConfigCmdPtr
-: <a class="el" href="dmxconfig_8c.html#a10">dmxconfig.c</a><li>DMXConfigComment
-: <a class="el" href="dmxparse_8h.html#a8">dmxparse.h</a><li>DMXConfigCommentPtr
-: <a class="el" href="dmxparse_8h.html#a9">dmxparse.h</a><li>dmxConfigConfigure()
-: <a class="el" href="dmxconfig_8h.html#a10">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a32">dmxconfig.c</a><li>DMXConfigDisplay
-: <a class="el" href="dmxparse_8h.html#a14">dmxparse.h</a><li>DMXConfigDisplayPtr
-: <a class="el" href="dmxparse_8h.html#a15">dmxparse.h</a><li>DMXConfigEntry
-: <a class="el" href="dmxparse_8h.html#a26">dmxparse.h</a><li>DMXConfigEntryPtr
-: <a class="el" href="dmxparse_8h.html#a27">dmxparse.h</a><li>DMXConfigFullDim
-: <a class="el" href="dmxparse_8h.html#a12">dmxparse.h</a><li>DMXConfigFullDimPtr
-: <a class="el" href="dmxparse_8h.html#a13">dmxparse.h</a><li>DMXConfigList
-: <a class="el" href="dmxconfig_8c.html#a7">dmxconfig.c</a><li>DMXConfigListPtr
-: <a class="el" href="dmxconfig_8c.html#a8">dmxconfig.c</a><li>dmxConfigLog()
-: <a class="el" href="dmxparse_8h.html#a38">dmxparse.h</a>, <a class="el" href="dmxparse_8c.html#a0">dmxparse.c</a><li>DMXConfigNumber
-: <a class="el" href="dmxparse_8h.html#a4">dmxparse.h</a><li>DMXConfigNumberPtr
-: <a class="el" href="dmxparse_8h.html#a5">dmxparse.h</a><li>DMXConfigOption
-: <a class="el" href="dmxparse_8h.html#a18">dmxparse.h</a><li>DMXConfigOptionPtr
-: <a class="el" href="dmxparse_8h.html#a19">dmxparse.h</a><li>DMXConfigPair
-: <a class="el" href="dmxparse_8h.html#a6">dmxparse.h</a><li>DMXConfigPairPtr
-: <a class="el" href="dmxparse_8h.html#a7">dmxparse.h</a><li>DMXConfigParam
-: <a class="el" href="dmxparse_8h.html#a20">dmxparse.h</a><li>DMXConfigParamPtr
-: <a class="el" href="dmxparse_8h.html#a21">dmxparse.h</a><li>DMXConfigPartDim
-: <a class="el" href="dmxparse_8h.html#a10">dmxparse.h</a><li>DMXConfigPartDimPtr
-: <a class="el" href="dmxparse_8h.html#a11">dmxparse.h</a><li>dmxConfigPrint()
-: <a class="el" href="dmxprint_8h.html#a0">dmxprint.h</a>, <a class="el" href="dmxprint_8c.html#a25">dmxprint.c</a><li>dmxConfigSetMaxScreens()
-: <a class="el" href="dmxconfig_8h.html#a11">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a33">dmxconfig.c</a><li>dmxConfigStoreConfig()
-: <a class="el" href="dmxconfig_8h.html#a9">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a19">dmxconfig.c</a><li>dmxConfigStoreDisplay()
-: <a class="el" href="dmxconfig_8h.html#a5">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a15">dmxconfig.c</a><li>dmxConfigStoreFile()
-: <a class="el" href="dmxconfig_8h.html#a8">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a18">dmxconfig.c</a><li>dmxConfigStoreInput()
-: <a class="el" href="dmxconfig_8h.html#a6">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a16">dmxconfig.c</a><li>dmxConfigStoreXInput()
-: <a class="el" href="dmxconfig_8h.html#a7">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a17">dmxconfig.c</a><li>DMXConfigString
-: <a class="el" href="dmxparse_8h.html#a2">dmxparse.h</a><li>DMXConfigStringPtr
-: <a class="el" href="dmxparse_8h.html#a3">dmxparse.h</a><li>DMXConfigSub
-: <a class="el" href="dmxparse_8h.html#a22">dmxparse.h</a><li>DMXConfigSubPtr
-: <a class="el" href="dmxparse_8h.html#a23">dmxparse.h</a><li>DMXConfigToken
-: <a class="el" href="dmxparse_8h.html#a0">dmxparse.h</a><li>DMXConfigTokenPtr
-: <a class="el" href="dmxparse_8h.html#a1">dmxparse.h</a><li>DMXConfigVirtual
-: <a class="el" href="dmxparse_8h.html#a24">dmxparse.h</a><li>dmxConfigVirtualPrint()
-: <a class="el" href="dmxprint_8h.html#a1">dmxprint.h</a>, <a class="el" href="dmxprint_8c.html#a26">dmxprint.c</a><li>DMXConfigVirtualPtr
-: <a class="el" href="dmxparse_8h.html#a25">dmxparse.h</a><li>DMXConfigWall
-: <a class="el" href="dmxparse_8h.html#a16">dmxparse.h</a><li>DMXConfigWallPtr
-: <a class="el" href="dmxparse_8h.html#a17">dmxparse.h</a><li>dmxConnectionBlockCallback()
-: <a class="el" href="dmxcb_8h.html#a6">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a9">dmxcb.c</a><li>dmxConsoleCapture()
-: <a class="el" href="dmxconsole_8h.html#a10">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a47">dmxconsole.c</a><li>dmxConsoleCollectEvents()
-: <a class="el" href="dmxconsole_8h.html#a6">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a36">dmxconsole.c</a><li>dmxConsoleCreatePrivate()
-: <a class="el" href="dmxconsole_8h.html#a0">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a25">dmxconsole.c</a><li>dmxConsoleDestroyPrivate()
-: <a class="el" href="dmxconsole_8h.html#a1">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a26">dmxconsole.c</a><li>dmxConsoleFunctions()
-: <a class="el" href="dmxconsole_8h.html#a7">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a45">dmxconsole.c</a><li>dmxConsoleInit()
-: <a class="el" href="dmxconsole_8h.html#a2">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a42">dmxconsole.c</a><li>dmxConsoleKbdGetInfo()
-: <a class="el" href="dmxconsole_8h.html#a5">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a44">dmxconsole.c</a><li>dmxConsoleMouGetInfo()
-: <a class="el" href="dmxconsole_8h.html#a4">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a43">dmxconsole.c</a><li>dmxConsoleReInit()
-: <a class="el" href="dmxconsole_8h.html#a3">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a41">dmxconsole.c</a><li>dmxConsoleUncapture()
-: <a class="el" href="dmxconsole_8h.html#a11">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a48">dmxconsole.c</a><li>dmxConsoleUpdateInfo()
-: <a class="el" href="dmxconsole_8h.html#a12">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a32">dmxconsole.c</a><li>dmxConsoleUpdatePosition()
-: <a class="el" href="dmxconsole_8h.html#a8">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a35">dmxconsole.c</a><li>dmxCopyArea()
-: <a class="el" href="dmxgcops_8h.html#a3">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a5">dmxgcops.c</a><li>dmxCopyClip()
-: <a class="el" href="dmxgc_8h.html#a14">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a12">dmxgc.c</a><li>dmxCopyGC()
-: <a class="el" href="dmxgc_8h.html#a10">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a7">dmxgc.c</a><li>dmxCopyPlane()
-: <a class="el" href="dmxgcops_8h.html#a4">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a6">dmxgcops.c</a><li>dmxCopyWindow()
-: <a class="el" href="dmxwindow_8h.html#a25">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a22">dmxwindow.c</a><li>dmxCreateAndRealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a14">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a9">dmxwindow.c</a><li>dmxCreateColormap()
-: <a class="el" href="dmxcmap_8h.html#a5">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a3">dmxcmap.c</a><li>dmxCreateDefColormap()
-: <a class="el" href="dmxcmap_8h.html#a9">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a8">dmxcmap.c</a><li>dmxCreateGC()
-: <a class="el" href="dmxgc_8h.html#a7">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a4">dmxgc.c</a><li>dmxCreatePicture()
-: <a class="el" href="dmxpict_8h.html#a14">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a19">dmxpict.c</a><li>dmxCreatePictureList()
-: <a class="el" href="dmxpict_8h.html#a12">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a18">dmxpict.c</a><li>dmxCreatePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a5">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a2">dmxpixmap.c</a><li>dmxCreateWindow()
-: <a class="el" href="dmxwindow_8h.html#a15">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a10">dmxwindow.c</a><li>dmxCursorNoMulti()
-: <a class="el" href="dmxcursor_8h.html#a8">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a12">dmxcursor.c</a><li>dmxCursorPrivPtr
-: <a class="el" href="dmxcursor_8h.html#a2">dmxcursor.h</a><li>dmxCursorPrivRec
-: <a class="el" href="dmxcursor_8h.html#a1">dmxcursor.h</a><li>dmxDebug
-: <a class="el" href="dmxlog_8h.html#a18a0">dmxlog.h</a><li>dmxDepth
-: <a class="el" href="dmxinit_8c.html#a13">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a14">dmx.h</a><li>dmxDestroyClip()
-: <a class="el" href="dmxgc_8h.html#a13">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a11">dmxgc.c</a><li>dmxDestroyColormap()
-: <a class="el" href="dmxcmap_8h.html#a6">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a5">dmxcmap.c</a><li>dmxDestroyGC()
-: <a class="el" href="dmxgc_8h.html#a11">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a9">dmxgc.c</a><li>dmxDestroyPicture()
-: <a class="el" href="dmxpict_8h.html#a15">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a22">dmxpict.c</a><li>dmxDestroyPictureClip()
-: <a class="el" href="dmxpict_8h.html#a17">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a24">dmxpict.c</a><li>dmxDestroyPictureList()
-: <a class="el" href="dmxpict_8h.html#a13">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a21">dmxpict.c</a><li>dmxDestroyPixmap()
-: <a class="el" href="dmxpixmap_8h.html#a6">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a4">dmxpixmap.c</a><li>dmxDestroyWindow()
-: <a class="el" href="dmxwindow_8h.html#a16">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a12">dmxwindow.c</a><li>dmxDetachScreen()
-: <a class="el" href="dmxextension_8h.html#a18">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a23">dmxextension.c</a><li>dmxDPMSInit()
-: <a class="el" href="dmxdpms_8h.html#a0">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a3">dmxdpms.c</a><li>dmxDPMSTerm()
-: <a class="el" href="dmxdpms_8h.html#a1">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a4">dmxdpms.c</a><li>dmxDPMSWakeup()
-: <a class="el" href="dmxdpms_8h.html#a2">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a5">dmxdpms.c</a><li>dmxDummyKbdGetInfo()
-: <a class="el" href="dmxdummy_8h.html#a1">dmxdummy.h</a>, <a class="el" href="dmxdummy_8c.html#a0">dmxdummy.c</a><li>dmxDummyMouGetInfo()
-: <a class="el" href="dmxdummy_8h.html#a0">dmxdummy.h</a>, <a class="el" href="dmxdummy_8c.html#a1">dmxdummy.c</a><li>dmxEnqueue()
-: <a class="el" href="dmxevents_8h.html#a1">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a27">dmxevents.c</a><li>dmxeqEnqueue()
-: <a class="el" href="dmxeq_8c.html#a13">dmxeq.c</a>, <a class="el" href="dmxinput_8h.html#a24">dmxinput.h</a><li>dmxeqProcessInputEvents()
-: <a class="el" href="dmxeq_8h.html#a1">dmxeq.h</a>, <a class="el" href="dmxeq_8c.html#a16">dmxeq.c</a><li>dmxeqSwitchScreen()
-: <a class="el" href="dmxeq_8c.html#a14">dmxeq.c</a>, <a class="el" href="dmxinput_8h.html#a25">dmxinput.h</a><li>dmxError
-: <a class="el" href="dmxlog_8h.html#a18a3">dmxlog.h</a><li>dmxErrorOccurred
-: <a class="el" href="dmxinit_8c.html#a7">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a9">dmx.h</a><li>DMXEventMap
-: <a class="el" href="dmxinputinit_8h.html#a34">dmxinputinit.h</a><li>dmxEventName()
-: <a class="el" href="dmxlog_8h.html#a9">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a17">dmxlog.c</a><li>DMXExtensionInit()
-: <a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html#a3">programs/Xserver/Xext/dmx.c</a><li>dmxFatal
-: <a class="el" href="dmxlog_8h.html#a18a4">dmxlog.h</a><li>dmxFillPolygon()
-: <a class="el" href="dmxgcops_8h.html#a10">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a12">dmxgcops.c</a><li>dmxFillSpans()
-: <a class="el" href="dmxgcops_8h.html#a0">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a2">dmxgcops.c</a><li>dmxFindPointerScreen()
-: <a class="el" href="dmxcommon_8h.html#a23">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a25">dmxcommon.c</a><li>dmxFlushPendingSyncs()
-: <a class="el" href="dmxextension_8h.html#a6">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a11">dmxextension.c</a><li>dmxFontPath
-: <a class="el" href="dmxinit_8c.html#a8">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a16">dmx.h</a><li>dmxFontPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a4">dmxscrinit.c</a>, <a class="el" href="dmxfont_8h.html#a2">dmxfont.h</a><li>dmxFontPrivPtr
-: <a class="el" href="dmxfont_8h.html#a1">dmxfont.h</a><li>dmxFontPrivRec
-: <a class="el" href="dmxfont_8h.html#a0">dmxfont.h</a><li>DMXForceWindowCreation()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a13">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a26">dmxext.h</a><li>dmxForceWindowCreation()
-: <a class="el" href="dmxextension_8h.html#a5">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a10">dmxextension.c</a><li>dmxGCPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a2">dmxscrinit.c</a>, <a class="el" href="dmxgc_8h.html#a5">dmxgc.h</a><li>dmxGCPrivPtr
-: <a class="el" href="dmxgc_8h.html#a4">dmxgc.h</a><li>dmxGCPrivRec
-: <a class="el" href="dmxgc_8h.html#a3">dmxgc.h</a><li>DMXGetDesktopAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a24">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a33">dmxext.h</a><li>dmxGetGlobalPosition()
-: <a class="el" href="dmxevents_8c.html#a21">dmxevents.c</a>, <a class="el" href="dmxinput_8h.html#a26">dmxinput.h</a><li>dmxGetImage()
-: <a class="el" href="dmxgcops_8h.html#a20">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a22">dmxgcops.c</a><li>dmxGetInputAttributes()
-: <a class="el" href="dmxextension_8h.html#a11">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a5">dmxextension.c</a><li>DMXGetInputAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a29">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a36">dmxext.h</a><li>DMXGetInputCount()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a28">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a35">dmxext.h</a><li>dmxGetInputCount()
-: <a class="el" href="dmxextension_8h.html#a10">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a4">dmxextension.c</a><li>dmxGetLogLevel()
-: <a class="el" href="dmxlog_8h.html#a6">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a2">dmxlog.c</a><li>dmxGetNumScreens()
-: <a class="el" href="dmxextension_8h.html#a4">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a9">dmxextension.c</a><li>DMXGetScreenAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a15">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a28">dmxext.h</a><li>dmxGetScreenAttributes()
-: <a class="el" href="dmxextension_8h.html#a7">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a1">dmxextension.c</a><li>DMXGetScreenCount()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a14">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a27">dmxext.h</a><li>dmxGetSpans()
-: <a class="el" href="dmxgcops_8h.html#a21">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a23">dmxgcops.c</a><li>DMXGetWindowAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a23">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a32">dmxext.h</a><li>dmxGetWindowAttributes()
-: <a class="el" href="dmxextension_8h.html#a8">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a2">dmxextension.c</a><li>dmxGlobalHeight
-: <a class="el" href="dmxcb_8h.html#a1">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a6">dmxcb.c</a><li>dmxGlobalWidth
-: <a class="el" href="dmxcb_8h.html#a0">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a5">dmxcb.c</a><li>dmxGlyphPrivPtr
-: <a class="el" href="dmxpict_8h.html#a6">dmxpict.h</a><li>dmxGlyphPrivRec
-: <a class="el" href="dmxpict_8h.html#a5">dmxpict.h</a><li>dmxGlyphs()
-: <a class="el" href="dmxpict_8h.html#a21">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a28">dmxpict.c</a><li>dmxGlyphSetPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a8">dmxscrinit.c</a>, <a class="el" href="dmxpict_8h.html#a8">dmxpict.h</a><li>dmxHideCursor()
-: <a class="el" href="dmxcursor_8h.html#a12">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a40">dmxcursor.c</a><li>dmxIgnoreBadFontPaths
-: <a class="el" href="dmxinit_8c.html#a16">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a17">dmx.h</a><li>dmxImageGlyphBlt()
-: <a class="el" href="dmxgcops_8h.html#a17">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a19">dmxgcops.c</a><li>dmxImageText16()
-: <a class="el" href="dmxgcops_8h.html#a16">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a18">dmxgcops.c</a><li>dmxImageText8()
-: <a class="el" href="dmxgcops_8h.html#a15">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a17">dmxgcops.c</a><li>dmxInfo
-: <a class="el" href="dmxlog_8h.html#a18a1">dmxlog.h</a><li>dmxInitFonts()
-: <a class="el" href="dmxfont_8h.html#a3">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a10">dmxfont.c</a><li>dmxInitGC()
-: <a class="el" href="dmxgc_8h.html#a6">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a2">dmxgc.c</a><li>dmxInitIndexed()
-: <a class="el" href="dmxpict_8h.html#a23">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a30">dmxpict.c</a><li>dmxInitOrigins()
-: <a class="el" href="dmxcursor_8h.html#a6">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a22">dmxcursor.c</a><li>dmxInitOverlap()
-: <a class="el" href="dmxcursor_8h.html#a7">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a28">dmxcursor.c</a><li>dmxInitPixmap()
-: <a class="el" href="dmxpixmap_8h.html#a4">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a0">dmxpixmap.c</a><li>dmxInitRender()
-: <a class="el" href="dmxpict_8h.html#a9">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a12">dmxpict.c</a><li>dmxInitWindow()
-: <a class="el" href="dmxwindow_8h.html#a11">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a3">dmxwindow.c</a><li>dmxInputCopyLocal()
-: <a class="el" href="dmxinputinit_8h.html#a53">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a33">dmxinputinit.c</a><li>dmxInputDetach()
-: <a class="el" href="dmxinputinit_8h.html#a58">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a43">dmxinputinit.c</a>, <a class="el" href="dmxdetach_8c.html#a0">dmxdetach.c</a><li>dmxInputDetachAll()
-: <a class="el" href="dmxinputinit_8h.html#a59">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a44">dmxinputinit.c</a><li>dmxInputDetachId()
-: <a class="el" href="dmxinputinit_8h.html#a60">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a45">dmxinputinit.c</a><li>DMXInputEnum
-: <a class="el" href="dmxext_8h.html#a41">dmxext.h</a><li>dmxInputFree()
-: <a class="el" href="dmxinputinit_8c.html#a41">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a20">dmxinput.h</a><li>DMXInputInfo
-: <a class="el" href="dmx_8h.html#a2">dmx.h</a><li>dmxInputInit()
-: <a class="el" href="dmxinputinit_8c.html#a39">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a17">dmxinput.h</a><li>dmxInputLateReInit()
-: <a class="el" href="dmxinputinit_8c.html#a38">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a19">dmxinput.h</a><li>dmxInputLogDevices()
-: <a class="el" href="dmxinputinit_8c.html#a42">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a21">dmxinput.h</a><li>dmxInputReInit()
-: <a class="el" href="dmxinputinit_8c.html#a37">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a18">dmxinput.h</a><li>dmxInputs
-: <a class="el" href="dmxinput_8h.html#a5">dmxinput.h</a>, <a class="el" href="dmxinit_8c.html#a4">dmxinit.c</a><li>dmxInstallColormap()
-: <a class="el" href="dmxcmap_8h.html#a7">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a6">dmxcmap.c</a><li>dmxInvalidateGlobalPosition()
-: <a class="el" href="dmxevents_8h.html#a3">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a22">dmxevents.c</a><li>dmxKeyboardBellProc()
-: <a class="el" href="dmxinputinit_8h.html#a56">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a20">dmxinputinit.c</a><li>dmxKeyboardKbdCtrlProc()
-: <a class="el" href="dmxinputinit_8h.html#a55">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a18">dmxinputinit.c</a><li>dmxLastErrorEvent
-: <a class="el" href="dmxinit_8c.html#a6">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a8">dmx.h</a><li>dmxLazyWindowCreation
-: <a class="el" href="dmxinit_8c.html#a11">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a12">dmx.h</a><li>DMXLocalInitInfo
-: <a class="el" href="dmxinputinit_8h.html#a9">dmxinputinit.h</a><li>DMXLocalInitInfoPtr
-: <a class="el" href="dmxinputinit_8h.html#a10">dmxinputinit.h</a><li>DMXLocalInputInfoPtr
-: <a class="el" href="dmxinput_8h.html#a3">dmxinput.h</a><li>DMXLocalInputInfoRec
-: <a class="el" href="dmxinputinit_8h.html#a35">dmxinputinit.h</a><li>dmxLog()
-: <a class="el" href="dmxlog_8h.html#a7">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a7">dmxlog.c</a><li>dmxLogArgs()
-: <a class="el" href="dmxlog_8h.html#a15">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a14">dmxlog.c</a><li>dmxLogCont()
-: <a class="el" href="dmxlog_8h.html#a8">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a8">dmxlog.c</a><li>dmxLogInput()
-: <a class="el" href="dmxlog_8h.html#a13">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a12">dmxlog.c</a><li>dmxLogInputCont()
-: <a class="el" href="dmxlog_8h.html#a14">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a13">dmxlog.c</a><li>dmxLogLevel
-: <a class="el" href="dmxlog_8h.html#a18">dmxlog.h</a><li>dmxLogOutput()
-: <a class="el" href="dmxlog_8h.html#a10">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a9">dmxlog.c</a><li>dmxLogOutputCont()
-: <a class="el" href="dmxlog_8h.html#a11">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a10">dmxlog.c</a><li>dmxLogOutputWarning()
-: <a class="el" href="dmxlog_8h.html#a12">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a11">dmxlog.c</a><li>dmxLogVisual()
-: <a class="el" href="dmxlog_8h.html#a16">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a15">dmxlog.c</a><li>dmxLookupVisual()
-: <a class="el" href="dmxvisual_8h.html#a0">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a0">dmxvisual.c</a><li>dmxLookupVisualFromID()
-: <a class="el" href="dmxvisual_8h.html#a1">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a1">dmxvisual.c</a><li>dmxMapClear()
-: <a class="el" href="dmxmap_8h.html#a1">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a1">dmxmap.c</a><li>dmxMapInsert()
-: <a class="el" href="dmxmap_8h.html#a0">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a0">dmxmap.c</a><li>dmxMapLookup()
-: <a class="el" href="dmxmap_8h.html#a2">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a2">dmxmap.c</a><li>dmxMotion()
-: <a class="el" href="dmxevents_8h.html#a0">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a23">dmxevents.c</a><li>dmxMoveCursor()
-: <a class="el" href="dmxcursor_8h.html#a9">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a38">dmxcursor.c</a><li>dmxNoRender
-: <a class="el" href="dmxinit_8c.html#a14">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a15">dmx.h</a><li>dmxNumInputs
-: <a class="el" href="dmxinput_8h.html#a4">dmxinput.h</a>, <a class="el" href="dmxinit_8c.html#a3">dmxinit.c</a><li>dmxNumScreens
-: <a class="el" href="dmxinit_8c.html#a1">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a5">dmx.h</a><li>dmxOffScreenOpt
-: <a class="el" href="dmxinit_8c.html#a9">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a10">dmx.h</a><li>dmxOnScreen()
-: <a class="el" href="dmxcursor_8h.html#a11">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a23">dmxcursor.c</a><li>dmxPaintWindowBackground()
-: <a class="el" href="dmxwindow_8h.html#a23">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a20">dmxwindow.c</a><li>dmxPaintWindowBorder()
-: <a class="el" href="dmxwindow_8h.html#a24">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a21">dmxwindow.c</a><li>dmxPictPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a7">dmxscrinit.c</a>, <a class="el" href="dmxpict_8h.html#a7">dmxpict.h</a><li>dmxPictPrivPtr
-: <a class="el" href="dmxpict_8h.html#a4">dmxpict.h</a><li>dmxPictPrivRec
-: <a class="el" href="dmxpict_8h.html#a3">dmxpict.h</a><li>dmxPictureInit()
-: <a class="el" href="dmxpict_8h.html#a11">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a14">dmxpict.c</a><li>dmxPixPrivateIndex
-: <a class="el" href="dmxpixmap_8h.html#a3">dmxpixmap.h</a><li>dmxPixPrivPtr
-: <a class="el" href="dmxpixmap_8h.html#a2">dmxpixmap.h</a><li>dmxPixPrivRec
-: <a class="el" href="dmxpixmap_8h.html#a1">dmxpixmap.h</a><li>dmxPointerCursorFuncs
-: <a class="el" href="dmxcursor_8h.html#a3">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a10">dmxcursor.c</a><li>dmxPointerGetMotionBufferSize()
-: <a class="el" href="dmxmotion_8h.html#a0">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a1">dmxmotion.c</a><li>dmxPointerGetMotionEvents()
-: <a class="el" href="dmxmotion_8h.html#a1">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a2">dmxmotion.c</a><li>dmxPointerPutMotionEvent()
-: <a class="el" href="dmxmotion_8h.html#a2">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a3">dmxmotion.c</a><li>dmxPointerSpriteFuncs
-: <a class="el" href="dmxcursor_8h.html#a4">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a11">dmxcursor.c</a><li>dmxPolyArc()
-: <a class="el" href="dmxgcops_8h.html#a9">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a11">dmxgcops.c</a><li>dmxPolyFillArc()
-: <a class="el" href="dmxgcops_8h.html#a12">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a14">dmxgcops.c</a><li>dmxPolyFillRect()
-: <a class="el" href="dmxgcops_8h.html#a11">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a13">dmxgcops.c</a><li>dmxPolyGlyphBlt()
-: <a class="el" href="dmxgcops_8h.html#a18">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a20">dmxgcops.c</a><li>dmxPolylines()
-: <a class="el" href="dmxgcops_8h.html#a6">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a8">dmxgcops.c</a><li>dmxPolyPoint()
-: <a class="el" href="dmxgcops_8h.html#a5">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a7">dmxgcops.c</a><li>dmxPolyRectangle()
-: <a class="el" href="dmxgcops_8h.html#a8">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a10">dmxgcops.c</a><li>dmxPolySegment()
-: <a class="el" href="dmxgcops_8h.html#a7">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a9">dmxgcops.c</a><li>dmxPolyText16()
-: <a class="el" href="dmxgcops_8h.html#a14">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a16">dmxgcops.c</a><li>dmxPolyText8()
-: <a class="el" href="dmxgcops_8h.html#a13">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a15">dmxgcops.c</a><li>dmxPositionWindow()
-: <a class="el" href="dmxwindow_8h.html#a17">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a13">dmxwindow.c</a><li>dmxPropertyDisplay()
-: <a class="el" href="dmxprop_8h.html#a0">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a8">dmxprop.c</a><li>dmxPropertyIterate()
-: <a class="el" href="dmxprop_8c.html#a5">dmxprop.c</a><li>dmxPropertySameDisplay()
-: <a class="el" href="dmxprop_8h.html#a3">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a9">dmxprop.c</a><li>dmxPropertyWindow()
-: <a class="el" href="dmxprop_8h.html#a1">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a10">dmxprop.c</a><li>dmxPushPixels()
-: <a class="el" href="dmxgcops_8h.html#a19">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a21">dmxgcops.c</a><li>dmxPutImage()
-: <a class="el" href="dmxgcops_8h.html#a2">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a4">dmxgcops.c</a><li>DMXQueryExtension()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a10">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a23">dmxext.h</a><li>DMXQueryVersion()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a11">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a24">dmxext.h</a><li>dmxRealizeFont()
-: <a class="el" href="dmxfont_8h.html#a5">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a13">dmxfont.c</a><li>dmxRealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a19">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a15">dmxwindow.c</a><li>DMXRecomputeFlag
-: <a class="el" href="dmxcb_8h.html#a7">dmxcb.h</a><li>dmxReInitOrigins()
-: <a class="el" href="dmxcursor_8h.html#a5">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a21">dmxcursor.c</a><li>dmxRemoveInput()
-: <a class="el" href="dmxextension_8h.html#a13">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a8">dmxextension.c</a><li>DMXRemoveInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a33">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a38">dmxext.h</a><li>DMXRemoveScreen()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a22">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a31">dmxext.h</a><li>dmxReparentWindow()
-: <a class="el" href="dmxwindow_8h.html#a27">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a24">dmxwindow.c</a><li>dmxResetFonts()
-: <a class="el" href="dmxfont_8h.html#a4">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a11">dmxfont.c</a><li>dmxResetRender()
-: <a class="el" href="dmxpict_8h.html#a10">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a13">dmxpict.c</a><li>dmxResizeRootWindow()
-: <a class="el" href="dmxwindow_8h.html#a30">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a6">dmxwindow.c</a><li>dmxResizeScreenWindow()
-: <a class="el" href="dmxwindow_8h.html#a29">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a5">dmxwindow.c</a><li>dmxResizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a26">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a23">dmxwindow.c</a><li>dmxRestackWindow()
-: <a class="el" href="dmxwindow_8h.html#a21">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a17">dmxwindow.c</a><li>DMXScreenInfo
-: <a class="el" href="dmx_8h.html#a4">dmx.h</a><li>dmxScreenInit()
-: <a class="el" href="dmxscrinit_8h.html#a1">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a12">dmxscrinit.c</a><li>dmxScreenPrivateIndex
-: <a class="el" href="dmxscrinit_8h.html#a0">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a5">dmxscrinit.c</a><li>dmxScreens
-: <a class="el" href="dmxinit_8c.html#a2">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a6">dmx.h</a><li>dmxSetLogLevel()
-: <a class="el" href="dmxlog_8h.html#a5">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a1">dmxlog.c</a><li>dmxSetShape()
-: <a class="el" href="dmxwindow_8h.html#a32">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a26">dmxwindow.c</a><li>dmxSetSpans()
-: <a class="el" href="dmxgcops_8h.html#a1">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a3">dmxgcops.c</a><li>dmxSetWidthHeight()
-: <a class="el" href="dmxcb_8h.html#a4">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a7">dmxcb.c</a><li>dmxShadowFB
-: <a class="el" href="dmxinit_8c.html#a5">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a7">dmx.h</a><li>dmxShadowUpdateProc()
-: <a class="el" href="dmxshadow_8h.html#a0">dmxshadow.h</a>, <a class="el" href="dmxshadow_8c.html#a0">dmxshadow.c</a><li>dmxSigioBlock()
-: <a class="el" href="dmxsigio_8h.html#a0">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a5">dmxsigio.c</a><li>dmxSigioDisableInput()
-: <a class="el" href="dmxsigio_8h.html#a3">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a12">dmxsigio.c</a><li>dmxSigioEnableInput()
-: <a class="el" href="dmxsigio_8h.html#a2">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a11">dmxsigio.c</a><li>dmxSigioRegister()
-: <a class="el" href="dmxsigio_8h.html#a4">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a13">dmxsigio.c</a><li>dmxSigioState
-: <a class="el" href="dmxinput_8h.html#a31">dmxinput.h</a><li>dmxSigioUnblock()
-: <a class="el" href="dmxsigio_8h.html#a1">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a6">dmxsigio.c</a><li>dmxSigioUnregister()
-: <a class="el" href="dmxsigio_8h.html#a5">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a14">dmxsigio.c</a><li>dmxStatActivate()
-: <a class="el" href="dmxstat_8h.html#a6">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a6">dmxstat.c</a><li>dmxStatAlloc()
-: <a class="el" href="dmxstat_8h.html#a7">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a7">dmxstat.c</a><li>DMXStatAvg
-: <a class="el" href="dmxstat_8c.html#a0">dmxstat.c</a><li>dmxStatFree()
-: <a class="el" href="dmxstat_8h.html#a8">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a8">dmxstat.c</a><li>DMXStatInfo
-: <a class="el" href="dmx_8h.html#a3">dmx.h</a><li>dmxStatInit()
-: <a class="el" href="dmxstat_8h.html#a9">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a12">dmxstat.c</a><li>dmxStatInterval
-: <a class="el" href="dmxstat_8h.html#a5">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a1">dmxstat.c</a><li>dmxStatSync()
-: <a class="el" href="dmxstat_8h.html#a10">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a10">dmxstat.c</a><li>dmxStoreColors()
-: <a class="el" href="dmxcmap_8h.html#a8">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a7">dmxcmap.c</a><li>dmxSubdividePrimitives
-: <a class="el" href="dmxinit_8c.html#a10">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a11">dmx.h</a><li>dmxSync()
-: <a class="el" href="dmxsync_8h.html#a2">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a9">dmxsync.c</a><li>DMXSync()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a12">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a25">dmxext.h</a><li>dmxSyncActivate()
-: <a class="el" href="dmxsync_8h.html#a0">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a7">dmxsync.c</a><li>dmxSyncInit()
-: <a class="el" href="dmxsync_8h.html#a1">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a8">dmxsync.c</a><li>dmxTrapezoids()
-: <a class="el" href="dmxpict_8h.html#a26">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a33">dmxpict.c</a><li>dmxTriangles()
-: <a class="el" href="dmxpict_8h.html#a27">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a34">dmxpict.c</a><li>dmxTriFan()
-: <a class="el" href="dmxpict_8h.html#a29">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a36">dmxpict.c</a><li>dmxTriStrip()
-: <a class="el" href="dmxpict_8h.html#a28">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a35">dmxpict.c</a><li>dmxUnrealizeFont()
-: <a class="el" href="dmxfont_8h.html#a6">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a15">dmxfont.c</a><li>dmxUnrealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a20">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a16">dmxwindow.c</a><li>dmxUpdateIndexed()
-: <a class="el" href="dmxpict_8h.html#a25">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a32">dmxpict.c</a><li>DMXUpdateType
-: <a class="el" href="dmxinput_8h.html#a30">dmxinput.h</a><li>dmxUpdateWindowInfo()
-: <a class="el" href="dmxinput_8h.html#a22">dmxinput.h</a>, <a class="el" href="dmxinput_8c.html#a3">dmxinput.c</a><li>dmxUseXKB
-: <a class="el" href="dmxinit_8c.html#a12">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a13">dmx.h</a><li>dmxValidateGC()
-: <a class="el" href="dmxgc_8h.html#a8">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a5">dmxgc.c</a><li>dmxValidatePicture()
-: <a class="el" href="dmxpict_8h.html#a19">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a26">dmxpict.c</a><li>dmxVDLRead()
-: <a class="el" href="dmxcompat_8h.html#a0">dmxcompat.h</a>, <a class="el" href="dmxcompat_8c.html#a4">dmxcompat.c</a><li>dmxWarning
-: <a class="el" href="dmxlog_8h.html#a18a2">dmxlog.h</a><li>dmxWindowExposures()
-: <a class="el" href="dmxwindow_8h.html#a22">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a19">dmxwindow.c</a><li>dmxWinPrivateIndex
-: <a class="el" href="dmxwindow_8h.html#a10">dmxwindow.h</a>, <a class="el" href="dmxscrinit_8c.html#a3">dmxscrinit.c</a><li>dmxWinPrivPtr
-: <a class="el" href="dmxwindow_8h.html#a9">dmxwindow.h</a><li>dmxWinPrivRec
-: <a class="el" href="dmxwindow_8h.html#a8">dmxwindow.h</a><li>dmxXInputEventName()
-: <a class="el" href="dmxlog_8h.html#a17">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a16">dmxlog.c</a></ul>
-<h3><a class="anchor" name="index_e">- e -</a></h3><ul>
-<li>EventPtr
-: <a class="el" href="dmxeq_8c.html#a6">dmxeq.c</a><li>EventQueuePtr
-: <a class="el" href="dmxeq_8c.html#a8">dmxeq.c</a><li>EventQueueRec
-: <a class="el" href="dmxeq_8c.html#a7">dmxeq.c</a><li>EventRec
-: <a class="el" href="dmxeq_8c.html#a5">dmxeq.c</a></ul>
-<h3><a class="anchor" name="index_g">- g -</a></h3><ul>
-<li>GEN
-: <a class="el" href="dmxconfig_8c.html#a0">dmxconfig.c</a><li>GetTimeInMillis()
-: <a class="el" href="dmxinit_8c.html#a42">dmxinit.c</a></ul>
-<h3><a class="anchor" name="index_i">- i -</a></h3><ul>
-<li>InitInput()
-: <a class="el" href="dmxinput_8c.html#a1">dmxinput.c</a><li>InitOutput()
-: <a class="el" href="dmxinit_8c.html#a34">dmxinit.c</a></ul>
-<h3><a class="anchor" name="index_k">- k -</a></h3><ul>
-<li>kbdLinuxBell()
-: <a class="el" href="lnx-keyboard_8h.html#a11">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a26">lnx-keyboard.c</a><li>kbdLinuxCreatePrivate()
-: <a class="el" href="lnx-keyboard_8h.html#a0">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a24">lnx-keyboard.c</a><li>kbdLinuxCtrl()
-: <a class="el" href="lnx-keyboard_8h.html#a10">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a27">lnx-keyboard.c</a><li>kbdLinuxDestroyPrivate()
-: <a class="el" href="lnx-keyboard_8h.html#a1">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a25">lnx-keyboard.c</a><li>kbdLinuxGetInfo()
-: <a class="el" href="lnx-keyboard_8h.html#a3">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a47">lnx-keyboard.c</a><li>kbdLinuxInit()
-: <a class="el" href="lnx-keyboard_8h.html#a2">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a38">lnx-keyboard.c</a><li>kbdLinuxOff()
-: <a class="el" href="lnx-keyboard_8h.html#a5">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a44">lnx-keyboard.c</a><li>kbdLinuxOn()
-: <a class="el" href="lnx-keyboard_8h.html#a4">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a43">lnx-keyboard.c</a><li>kbdLinuxRead()
-: <a class="el" href="lnx-keyboard_8c.html#a42">lnx-keyboard.c</a><li>kbdLinuxVTPostSwitch()
-: <a class="el" href="lnx-keyboard_8h.html#a7">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a33">lnx-keyboard.c</a><li>kbdLinuxVTPreSwitch()
-: <a class="el" href="lnx-keyboard_8h.html#a6">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a32">lnx-keyboard.c</a><li>kbdLinuxVTSwitch()
-: <a class="el" href="lnx-keyboard_8c.html#a34">lnx-keyboard.c</a><li>kbdUSBCtrl()
-: <a class="el" href="usb-keyboard_8h.html#a4">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a20">usb-keyboard.c</a><li>kbdUSBGetInfo()
-: <a class="el" href="usb-keyboard_8h.html#a1">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a26">usb-keyboard.c</a><li>kbdUSBInit()
-: <a class="el" href="usb-keyboard_8h.html#a0">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a21">usb-keyboard.c</a><li>kbdUSBOn()
-: <a class="el" href="usb-keyboard_8h.html#a2">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a24">usb-keyboard.c</a><li>kbdUSBRead()
-: <a class="el" href="usb-keyboard_8c.html#a23">usb-keyboard.c</a></ul>
-<h3><a class="anchor" name="index_l">- l -</a></h3><ul>
-<li>LegalModifier()
-: <a class="el" href="dmxinput_8c.html#a0">dmxinput.c</a></ul>
-<h3><a class="anchor" name="index_m">- m -</a></h3><ul>
-<li>mouUSBGetInfo()
-: <a class="el" href="usb-mouse_8h.html#a2">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a16">usb-mouse.c</a><li>mouUSBInit()
-: <a class="el" href="usb-mouse_8h.html#a1">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a13">usb-mouse.c</a><li>mouUSBOn()
-: <a class="el" href="usb-mouse_8h.html#a3">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a14">usb-mouse.c</a><li>mouUSBRead()
-: <a class="el" href="usb-mouse_8c.html#a12">usb-mouse.c</a><li>msLinuxCreatePrivate()
-: <a class="el" href="lnx-ms_8h.html#a0">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a24">lnx-ms.c</a><li>msLinuxDestroyPrivate()
-: <a class="el" href="lnx-ms_8h.html#a1">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a25">lnx-ms.c</a><li>msLinuxGetInfo()
-: <a class="el" href="lnx-ms_8h.html#a4">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a26">lnx-ms.c</a><li>msLinuxInit()
-: <a class="el" href="lnx-ms_8h.html#a3">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a18">lnx-ms.c</a><li>msLinuxOff()
-: <a class="el" href="lnx-ms_8h.html#a6">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a20">lnx-ms.c</a><li>msLinuxOn()
-: <a class="el" href="lnx-ms_8h.html#a5">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a19">lnx-ms.c</a><li>msLinuxRead()
-: <a class="el" href="lnx-ms_8c.html#a17">lnx-ms.c</a><li>msLinuxVTPostSwitch()
-: <a class="el" href="lnx-ms_8h.html#a9">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a23">lnx-ms.c</a><li>msLinuxVTPreSwitch()
-: <a class="el" href="lnx-ms_8h.html#a8">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a22">lnx-ms.c</a><li>myPrivate
-: <a class="el" href="dmxcommon_8c.html#a4">dmxcommon.c</a></ul>
-<h3><a class="anchor" name="index_o">- o -</a></h3><ul>
-<li>OpenInputDevice()
-: <a class="el" href="dmxxinput_8c.html#a5">dmxxinput.c</a><li>OsVendorFatalError()
-: <a class="el" href="dmxinit_8c.html#a39">dmxinit.c</a><li>OsVendorInit()
-: <a class="el" href="dmxinit_8c.html#a38">dmxinit.c</a><li>othUSBGetInfo()
-: <a class="el" href="usb-other_8h.html#a2">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a16">usb-other.c</a><li>othUSBInit()
-: <a class="el" href="usb-other_8h.html#a1">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a14">usb-other.c</a><li>othUSBOn()
-: <a class="el" href="usb-other_8h.html#a3">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a15">usb-other.c</a><li>othUSBRead()
-: <a class="el" href="usb-other_8c.html#a13">usb-other.c</a></ul>
-<h3><a class="anchor" name="index_p">- p -</a></h3><ul>
-<li>ProcessInputEvents()
-: <a class="el" href="dmxinput_8c.html#a2">dmxinput.c</a><li>ps2LinuxCreatePrivate()
-: <a class="el" href="lnx-ps2_8h.html#a0">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a24">lnx-ps2.c</a><li>ps2LinuxDestroyPrivate()
-: <a class="el" href="lnx-ps2_8h.html#a1">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a25">lnx-ps2.c</a><li>ps2LinuxGetInfo()
-: <a class="el" href="lnx-ps2_8h.html#a4">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a26">lnx-ps2.c</a><li>ps2LinuxInit()
-: <a class="el" href="lnx-ps2_8h.html#a3">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a18">lnx-ps2.c</a><li>ps2LinuxOff()
-: <a class="el" href="lnx-ps2_8h.html#a6">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a20">lnx-ps2.c</a><li>ps2LinuxOn()
-: <a class="el" href="lnx-ps2_8h.html#a5">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a19">lnx-ps2.c</a><li>ps2LinuxRead()
-: <a class="el" href="lnx-ps2_8c.html#a17">lnx-ps2.c</a><li>ps2LinuxVTPostSwitch()
-: <a class="el" href="lnx-ps2_8h.html#a9">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a23">lnx-ps2.c</a><li>ps2LinuxVTPreSwitch()
-: <a class="el" href="lnx-ps2_8h.html#a8">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a22">lnx-ps2.c</a></ul>
-<h3><a class="anchor" name="index_q">- q -</a></h3><ul>
-<li>QUEUE_SIZE
-: <a class="el" href="dmxeq_8c.html#a4">dmxeq.c</a></ul>
-<h3><a class="anchor" name="index_s">- s -</a></h3><ul>
-<li>SetDeviceMode()
-: <a class="el" href="dmxxinput_8c.html#a6">dmxxinput.c</a><li>SetDeviceValuators()
-: <a class="el" href="dmxxinput_8c.html#a7">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_u">- u -</a></h3><ul>
-<li>usbCreatePrivate()
-: <a class="el" href="usb-common_8h.html#a3">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a25">usb-common.c</a><li>usbDestroyPrivate()
-: <a class="el" href="usb-common_8h.html#a4">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a26">usb-common.c</a><li>usbInit()
-: <a class="el" href="usb-common_8h.html#a6">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a23">usb-common.c</a><li>usbOff()
-: <a class="el" href="usb-common_8h.html#a7">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a24">usb-common.c</a><li>usbRead()
-: <a class="el" href="usb-common_8c.html#a21">usb-common.c</a></ul>
-<h3><a class="anchor" name="index_x">- x -</a></h3><ul>
-<li>XCheckNotMaskEvent()
-: <a class="el" href="ChkNotMaskEv_8h.html#a0">ChkNotMaskEv.h</a>, <a class="el" href="ChkNotMaskEv_8c.html#a2">ChkNotMaskEv.c</a></ul>
+<h3><a class="anchor" id="index__">- _ -</a></h3><ul>
+<li>_dmxChangePointerControl()
+: <a class="el" href="dmxinputinit_8c.html#a4f65a9b46fe88b8f530752e3b7769424">dmxinputinit.c</a>
+</li>
+<li>_dmxDPMSInit()
+: <a class="el" href="dmxdpms_8c.html#afd14a12acf152c0a881144aff85e584a">dmxdpms.c</a>
+</li>
+<li>_dmxKeyboardBellProc()
+: <a class="el" href="dmxinputinit_8c.html#adcea87288c189798602bd610f87ad785">dmxinputinit.c</a>
+</li>
+<li>_dmxKeyboardKbdCtrlProc()
+: <a class="el" href="dmxinputinit_8c.html#aa785da3b31e5310dd1b1ea13325a83dc">dmxinputinit.c</a>
+</li>
+<li>_dmxMoveCursor()
+: <a class="el" href="dmxcursor_8c.html#aa208a04334d595e3507287bacffdae80">dmxcursor.c</a>
+</li>
+<li>_dmxRealizeCursor()
+: <a class="el" href="dmxcursor_8c.html#ac722828c4781d1a44d8b04955472a134">dmxcursor.c</a>
+</li>
+<li>_dmxSetCursor()
+: <a class="el" href="dmxcursor_8c.html#a6fd26c7c7811ff77fc3c6e84b82d57d5">dmxcursor.c</a>
+</li>
+<li>_dmxUnrealizeCursor()
+: <a class="el" href="dmxcursor_8c.html#aa2ac82b5666d162e873c7f0c88ec96f6">dmxcursor.c</a>
+</li>
+<li>_DMXXineramaActive()
+: <a class="el" href="dmx_8c.html#a9760de3bc5bce0c3fcb7eda8afdafcb7">dmx.c</a>
+</li>
+<li>_Xevent_to_mask
+: <a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">ChkNotMaskEv.c</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_defs.html b/xorg-server/hw/dmx/doc/html/globals_defs.html
index 9fb24cc19..78d797125 100644
--- a/xorg-server/hw/dmx/doc/html/globals_defs.html
+++ b/xorg-server/hw/dmx/doc/html/globals_defs.html
@@ -6,33 +6,72 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals_defs.html#index_a"><span>a</span></a></li>
+      <li><a href="globals_defs_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_defs_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_defs_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_defs_0x65.html#index_e"><span>e</span></a></li>
+      <li><a href="globals_defs_0x66.html#index_f"><span>f</span></a></li>
+      <li><a href="globals_defs_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_defs_0x6c.html#index_l"><span>l</span></a></li>
+      <li><a href="globals_defs_0x6d.html#index_m"><span>m</span></a></li>
+      <li><a href="globals_defs_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_defs_0x6f.html#index_o"><span>o</span></a></li>
+      <li><a href="globals_defs_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_defs_0x72.html#index_r"><span>r</span></a></li>
+      <li><a href="globals_defs_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_defs_0x74.html#index_t"><span>t</span></a></li>
+      <li><a href="globals_defs_0x75.html#index_u"><span>u</span></a></li>
+      <li><a href="globals_defs_0x76.html#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-<ul>
-<li>DMX_ATOMNAME
-: <a class="el" href="dmxprop_8c.html#a0">dmxprop.c</a><li>DMX_GET_COLORMAP_PRIV
-: <a class="el" href="dmxcmap_8h.html#a1">dmxcmap.h</a><li>DMX_GET_GC_PRIV
-: <a class="el" href="dmxgc_8h.html#a0">dmxgc.h</a><li>DMX_GET_GLYPH_PRIV
-: <a class="el" href="dmxpict_8h.html#a2">dmxpict.h</a><li>DMX_GET_PICT_PRIV
-: <a class="el" href="dmxpict_8h.html#a0">dmxpict.h</a><li>DMX_GET_PIXMAP_PRIV
-: <a class="el" href="dmxpixmap_8h.html#a0">dmxpixmap.h</a><li>DMX_GET_WINDOW_PRIV
-: <a class="el" href="dmxwindow_8h.html#a0">dmxwindow.h</a><li>DMX_IDENT
-: <a class="el" href="dmxprop_8c.html#a1">dmxprop.c</a><li>DMX_MAX_SIGIO_FDS
-: <a class="el" href="dmxinput_8h.html#a0">dmxinput.h</a><li>DMX_SET_COLORMAP_PRIV
-: <a class="el" href="dmxcmap_8h.html#a0">dmxcmap.h</a><li>DMX_SET_GLYPH_PRIV
-: <a class="el" href="dmxpict_8h.html#a1">dmxpict.h</a><li>DMX_STAT_BIN0
-: <a class="el" href="dmxstat_8h.html#a3">dmxstat.h</a><li>DMX_STAT_BINMULT
-: <a class="el" href="dmxstat_8h.html#a4">dmxstat.h</a><li>DMX_STAT_BINS
-: <a class="el" href="dmxstat_8h.html#a2">dmxstat.h</a><li>DMX_STAT_INTERVAL
-: <a class="el" href="dmxstat_8h.html#a1">dmxstat.h</a><li>DMX_STAT_LENGTH
-: <a class="el" href="dmxstat_8h.html#a0">dmxstat.h</a><li>DMX_UNWRAP
-: <a class="el" href="dmx_8h.html#a1">dmx.h</a><li>DMX_WRAP
-: <a class="el" href="dmx_8h.html#a0">dmx.h</a><li>GEN
-: <a class="el" href="dmxconfig_8c.html#a0">dmxconfig.c</a><li>QUEUE_SIZE
-: <a class="el" href="dmxeq_8c.html#a4">dmxeq.c</a></ul>
+<h3><a class="anchor" id="index_a">- a -</a></h3><ul>
+<li>ABS_BRAKE
+: <a class="el" href="usb-private_8h.html#a28f782ce9e5d1e3cff987901a7bf6823">usb-private.h</a>
+</li>
+<li>ABS_GAS
+: <a class="el" href="usb-private_8h.html#acf2960996b3a73cfa447e18a655690c5">usb-private.h</a>
+</li>
+<li>ABS_WHEEL
+: <a class="el" href="usb-private_8h.html#abc57d88f908f35bd3c82ba7dff0d97e7">usb-private.h</a>
+</li>
+<li>ADD
+: <a class="el" href="dmxcommon_8c.html#ad9bd99dabcb14e9efe85df040d63c4b3">dmxcommon.c</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_enum.html b/xorg-server/hw/dmx/doc/html/globals_enum.html
index 09cb593d6..98d3be7ef 100644
--- a/xorg-server/hw/dmx/doc/html/globals_enum.html
+++ b/xorg-server/hw/dmx/doc/html/globals_enum.html
@@ -6,18 +6,73 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
-<p>
-<ul>
-<li>DMXInputEnum
-: <a class="el" href="dmxext_8h.html#a41">dmxext.h</a><li>dmxLogLevel
-: <a class="el" href="dmxlog_8h.html#a18">dmxlog.h</a><li>DMXRecomputeFlag
-: <a class="el" href="dmxcb_8h.html#a7">dmxcb.h</a><li>dmxSigioState
-: <a class="el" href="dmxinput_8h.html#a31">dmxinput.h</a><li>DMXUpdateType
-: <a class="el" href="dmxinput_8h.html#a30">dmxinput.h</a></ul>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;<ul>
+<li>DMXBlockType
+: <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">dmxinput.h</a>
+</li>
+<li>DMXConfigType
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">dmxparse.h</a>
+</li>
+<li>DMXFunctionType
+: <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039c">dmxinputinit.h</a>
+</li>
+<li>DMXLocalInputExtType
+: <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">dmxinputinit.h</a>
+</li>
+<li>DMXLocalInputType
+: <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">dmxinputinit.h</a>
+</li>
+<li>dmxLogLevel
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917f">dmxlog.h</a>
+</li>
+<li>DMXMotionType
+: <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349">dmxinputinit.h</a>
+</li>
+<li>DMXRecomputeFlag
+: <a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63ee">dmxcb.h</a>
+</li>
+<li>dmxSigioState
+: <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxinput.h</a>
+</li>
+<li>DMXUpdateType
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8">dmxinput.h</a>
+</li>
+<li>PositionType
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">dmx.h</a>
+</li>
+<li>usbType
+: <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usb-common.h</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_eval.html b/xorg-server/hw/dmx/doc/html/globals_eval.html
index 15700d509..d73c8cf6a 100644
--- a/xorg-server/hw/dmx/doc/html/globals_eval.html
+++ b/xorg-server/hw/dmx/doc/html/globals_eval.html
@@ -6,27 +6,204 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-<ul>
+<h3><a class="anchor" id="index_d">- d -</a></h3><ul>
+<li>DMX_ABSOLUTE
+: <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a3f6f623d8a62c69c55ec94d33d29af06">dmxinputinit.h</a>
+</li>
+<li>DMX_ABSOLUTE_CONFINED
+: <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a0fa251fe246858df55404c1df40b818c">dmxinputinit.h</a>
+</li>
 <li>DMX_ACTIVESIGIO
-: <a class="el" href="dmxinput_8h.html#a31a14">dmxinput.h</a><li>DMX_NOSIGIO
-: <a class="el" href="dmxinput_8h.html#a31a12">dmxinput.h</a><li>DMX_UPDATE_COPY
-: <a class="el" href="dmxinput_8h.html#a30a9">dmxinput.h</a><li>DMX_UPDATE_REALIZE
-: <a class="el" href="dmxinput_8h.html#a30a6">dmxinput.h</a><li>DMX_UPDATE_REPARENT
-: <a class="el" href="dmxinput_8h.html#a30a11">dmxinput.h</a><li>DMX_UPDATE_RESIZE
-: <a class="el" href="dmxinput_8h.html#a30a10">dmxinput.h</a><li>DMX_UPDATE_RESTACK
-: <a class="el" href="dmxinput_8h.html#a30a8">dmxinput.h</a><li>DMX_UPDATE_UNREALIZE
-: <a class="el" href="dmxinput_8h.html#a30a7">dmxinput.h</a><li>DMX_USESIGIO
-: <a class="el" href="dmxinput_8h.html#a31a13">dmxinput.h</a><li>dmxDebug
-: <a class="el" href="dmxlog_8h.html#a18a0">dmxlog.h</a><li>dmxError
-: <a class="el" href="dmxlog_8h.html#a18a3">dmxlog.h</a><li>dmxFatal
-: <a class="el" href="dmxlog_8h.html#a18a4">dmxlog.h</a><li>dmxInfo
-: <a class="el" href="dmxlog_8h.html#a18a1">dmxlog.h</a><li>dmxWarning
-: <a class="el" href="dmxlog_8h.html#a18a2">dmxlog.h</a></ul>
+: <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a7fae538ba04dbc6882d35b2911081d3b">dmxinput.h</a>
+</li>
+<li>DMX_BLOCK
+: <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7a1337585a30b99661498485885b4ff04f">dmxinput.h</a>
+</li>
+<li>DMX_FUNCTION_FINE
+: <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039cacb642cebe9d2e8d1827da4f4f55b019f">dmxinputinit.h</a>
+</li>
+<li>DMX_FUNCTION_GRAB
+: <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca262bb5d411552f7a435dd36bba30b8b4">dmxinputinit.h</a>
+</li>
+<li>DMX_FUNCTION_TERMINATE
+: <a class="el" href="dmxinputinit_8h.html#a9537dacd464c8445848fb808e172039ca69c6e18081258083ff0e25109e6bc32a">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_HIGHLEVEL
+: <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba522a6d99a065b65dc4ae638dbbd28618">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_KEYBOARD
+: <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba9cfee78a907b9e6bed60a9389c7709a2">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_MOUSE
+: <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba35757b72bace4308b51b6fe3329d6818">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_OTHER
+: <a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181ba95e6b211e73013a06ea68d760fca770e">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_TYPE_BACKEND
+: <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baab3f82141a68b75ae9fa1fdcc30c946fa">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_TYPE_COMMON
+: <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa942a3c9c695ca587e3543f57669066ee">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_TYPE_CONSOLE
+: <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa8c17962e3be26e8ac6ab67cce2613eb8">dmxinputinit.h</a>
+</li>
+<li>DMX_LOCAL_TYPE_LOCAL
+: <a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9baa04cf7124964dfea96c0d273b9acf1e16">dmxinputinit.h</a>
+</li>
+<li>DMX_NO_BLOCK
+: <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7add5ccc82aea86bc4dfec91782883202b">dmxinput.h</a>
+</li>
+<li>DMX_NO_RECOMPUTE_BOUNDING_BOX
+: <a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea90f550ce4ddbbbbec42e974f7f42ad0b">dmxcb.h</a>
+</li>
+<li>DMX_NOSIGIO
+: <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a3332aab1a0fa6ab7dbb69ff402b0d596">dmxinput.h</a>
+</li>
+<li>DMX_RECOMPUTE_BOUNDING_BOX
+: <a class="el" href="dmxcb_8h.html#ab00a2ebacc2ad1ec1b8ad02800ff63eea2bc3f60d973a4d9e53e0fe71ee386d9a">dmxcb.h</a>
+</li>
+<li>DMX_RELATIVE
+: <a class="el" href="dmxinputinit_8h.html#a009c1c06db97e0347237f11a701db349a065d85ca14ad2eb8f7bae4eaffac6412">dmxinputinit.h</a>
+</li>
+<li>DMX_UPDATE_COPY
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a3eb041e8c291b09423f9e7e48a097c72">dmxinput.h</a>
+</li>
+<li>DMX_UPDATE_REALIZE
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a7c104dbcebe304b597aa6214c7857ba9">dmxinput.h</a>
+</li>
+<li>DMX_UPDATE_REPARENT
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8abd180f2b5dc44a7f596c94da55b1b06c">dmxinput.h</a>
+</li>
+<li>DMX_UPDATE_RESIZE
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8aff37829542cf6747dfc40ad0b1db4146">dmxinput.h</a>
+</li>
+<li>DMX_UPDATE_RESTACK
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8a5cbd84079e335dd7025ca4698f96ee25">dmxinput.h</a>
+</li>
+<li>DMX_UPDATE_UNREALIZE
+: <a class="el" href="dmxinput_8h.html#ae16d9134720b35da8f258db9a1c039a8ad8f34c00059f389fd2f6e38af575f11b">dmxinput.h</a>
+</li>
+<li>DMX_USESIGIO
+: <a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4a602a53cb181b839ee55e077c20588608">dmxinput.h</a>
+</li>
+<li>dmxConfigComment
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88aec466000071c74f9c5d74dfbdac0188f">dmxparse.h</a>
+</li>
+<li>dmxConfigDisplay
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88abec41b4db7ba31e88eaaddc8b34eea4f">dmxparse.h</a>
+</li>
+<li>dmxConfigOption
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a614d5741a7446449811a7627b13535b2">dmxparse.h</a>
+</li>
+<li>dmxConfigParam
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a86387d0341d85b69a1f41fec10494698">dmxparse.h</a>
+</li>
+<li>dmxConfigStateOpen
+: <a class="el" href="xdmxconfig_8c.html#a99fb83031ce9923c84392b4e92f956b5a3d56a13f1c60f52f9161283f8206b716">xdmxconfig.c</a>
+</li>
+<li>dmxConfigStateSave
+: <a class="el" href="xdmxconfig_8c.html#a99fb83031ce9923c84392b4e92f956b5a387ae4d1cea5ba75911cb467d76d0996">xdmxconfig.c</a>
+</li>
+<li>dmxConfigVirtual
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88a4c957b5f3b7c0886587bdb5a47f3face">dmxparse.h</a>
+</li>
+<li>dmxConfigWall
+: <a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88ac20511fb5c828f993a1f76015646f212">dmxparse.h</a>
+</li>
+<li>dmxDebug
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa55e322963608341d32ebb8a0b9d936fe">dmxlog.h</a>
+</li>
+<li>dmxError
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa537bf9f60b39a221057e37c76aeea890">dmxlog.h</a>
+</li>
+<li>dmxFatal
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fa4d84ad320675a046536d76c0820abc70">dmxlog.h</a>
+</li>
+<li>dmxInfo
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917faf73564300bdffb23b369b84c842aceea">dmxlog.h</a>
+</li>
+<li>dmxWarning
+: <a class="el" href="dmxlog_8h.html#aeed612a5c0be196e23bd6b71b76b917fae81ae2a11fb7ab8eea902f609574210a">dmxlog.h</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_p">- p -</a></h3><ul>
+<li>PosAbove
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a8b4710773b7ba23cd4ba12a48f544414">dmx.h</a>
+</li>
+<li>PosAbsolute
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a98c1cbf3326de8339bf0538c74477351">dmx.h</a>
+</li>
+<li>PosBelow
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a61079f63564c7d135feeeabb170cff1e">dmx.h</a>
+</li>
+<li>PosLeftOf
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6e57f3ac055303c9c0c730274faa419f">dmx.h</a>
+</li>
+<li>PosNone
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48ad375955ea9a568af249c13e41d2f0d44">dmx.h</a>
+</li>
+<li>PosRelative
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48a6681d76ba36d5d2fce88975100fbfddc">dmx.h</a>
+</li>
+<li>PosRightOf
+: <a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48adbb68d2dea659baab7c04a54a95679ae">dmx.h</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_u">- u -</a></h3><ul>
+<li>usbKeyboard
+: <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3">usb-common.h</a>
+</li>
+<li>usbMouse
+: <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7">usb-common.h</a>
+</li>
+<li>usbOther
+: <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb">usb-common.h</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_func.html b/xorg-server/hw/dmx/doc/html/globals_func.html
index 85b327b60..d1a02d446 100644
--- a/xorg-server/hw/dmx/doc/html/globals_func.html
+++ b/xorg-server/hw/dmx/doc/html/globals_func.html
@@ -6,374 +6,88 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_k">k</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_x">x</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals_func.html#index__"><span>_</span></a></li>
+      <li><a href="globals_func_0x61.html#index_a"><span>a</span></a></li>
+      <li><a href="globals_func_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_func_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_func_0x65.html#index_e"><span>e</span></a></li>
+      <li><a href="globals_func_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_func_0x69.html#index_i"><span>i</span></a></li>
+      <li><a href="globals_func_0x6b.html#index_k"><span>k</span></a></li>
+      <li><a href="globals_func_0x6c.html#index_l"><span>l</span></a></li>
+      <li><a href="globals_func_0x6d.html#index_m"><span>m</span></a></li>
+      <li><a href="globals_func_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_func_0x6f.html#index_o"><span>o</span></a></li>
+      <li><a href="globals_func_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_func_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_func_0x75.html#index_u"><span>u</span></a></li>
+      <li><a href="globals_func_0x76.html#index_v"><span>v</span></a></li>
+      <li><a href="globals_func_0x78.html#index_x"><span>x</span></a></li>
+      <li><a href="globals_func_0x79.html#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-
-<p>
-<h3><a class="anchor" name="index_a">- a -</a></h3><ul>
-<li>AbortDDX()
-: <a class="el" href="dmxinit_8c.html#a36">dmxinit.c</a><li>AbortServer()
-: <a class="el" href="dmxlog_8c.html#a3">dmxlog.c</a><li>AddOtherInputDevices()
-: <a class="el" href="dmxxinput_8c.html#a4">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_c">- c -</a></h3><ul>
-<li>ChangeDeviceControl()
-: <a class="el" href="dmxxinput_8c.html#a8">dmxxinput.c</a><li>ChangeKeyboardDevice()
-: <a class="el" href="dmxxinput_8c.html#a1">dmxxinput.c</a><li>ChangePointerDevice()
-: <a class="el" href="dmxxinput_8c.html#a2">dmxxinput.c</a><li>CloseInputDevice()
-: <a class="el" href="dmxxinput_8c.html#a3">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_d">- d -</a></h3><ul>
-<li>ddxGiveUp()
-: <a class="el" href="dmxinit_8c.html#a37">dmxinit.c</a><li>ddxProcessArgument()
-: <a class="el" href="dmxinit_8c.html#a40">dmxinit.c</a><li>ddxUseMsg()
-: <a class="el" href="dmxinit_8c.html#a41">dmxinit.c</a><li>DMXAddBackendInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a31">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a39">dmxext.h</a><li>DMXAddConsoleInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a32">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a40">dmxext.h</a><li>dmxAddInput()
-: <a class="el" href="dmxextension_8h.html#a12">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a7">dmxextension.c</a><li>DMXAddInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a30">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a37">dmxext.h</a><li>DMXAddScreen()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a21">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a30">dmxext.h</a><li>dmxArgAdd()
-: <a class="el" href="dmxarg_8h.html#a3">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a3">dmxarg.c</a><li>dmxArgC()
-: <a class="el" href="dmxarg_8h.html#a5">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a5">dmxarg.c</a><li>dmxArgCreate()
-: <a class="el" href="dmxarg_8h.html#a1">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a1">dmxarg.c</a><li>dmxArgFree()
-: <a class="el" href="dmxarg_8h.html#a2">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a2">dmxarg.c</a><li>dmxArgParse()
-: <a class="el" href="dmxarg_8h.html#a6">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a6">dmxarg.c</a><li>dmxArgV()
-: <a class="el" href="dmxarg_8h.html#a4">dmxarg.h</a>, <a class="el" href="dmxarg_8c.html#a4">dmxarg.c</a><li>dmxAttachScreen()
-: <a class="el" href="dmxextension_8h.html#a17">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a18">dmxextension.c</a><li>dmxBackendCollectEvents()
-: <a class="el" href="dmxbackend_8h.html#a6">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a25">dmxbackend.c</a><li>dmxBackendCreatePrivate()
-: <a class="el" href="dmxbackend_8h.html#a0">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a12">dmxbackend.c</a><li>dmxBackendDestroyPrivate()
-: <a class="el" href="dmxbackend_8h.html#a1">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a13">dmxbackend.c</a><li>dmxBackendFunctions()
-: <a class="el" href="dmxbackend_8h.html#a8">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a33">dmxbackend.c</a><li>dmxBackendInit()
-: <a class="el" href="dmxbackend_8h.html#a2">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a30">dmxbackend.c</a><li>dmxBackendKbdGetInfo()
-: <a class="el" href="dmxbackend_8h.html#a5">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a32">dmxbackend.c</a><li>dmxBackendLateReInit()
-: <a class="el" href="dmxbackend_8h.html#a3">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a29">dmxbackend.c</a><li>dmxBackendMouGetInfo()
-: <a class="el" href="dmxbackend_8h.html#a4">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a31">dmxbackend.c</a><li>dmxBackendProcessInput()
-: <a class="el" href="dmxbackend_8h.html#a7">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a26">dmxbackend.c</a><li>dmxBackendUpdatePosition()
-: <a class="el" href="dmxbackend_8h.html#a9">dmxbackend.h</a>, <a class="el" href="dmxbackend_8c.html#a24">dmxbackend.c</a><li>dmxBECloseScreen()
-: <a class="el" href="dmxscrinit_8h.html#a3">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a13">dmxscrinit.c</a><li>dmxBECreateColormap()
-: <a class="el" href="dmxcmap_8h.html#a10">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a2">dmxcmap.c</a><li>dmxBECreateCursor()
-: <a class="el" href="dmxcursor_8h.html#a13">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a29">dmxcursor.c</a><li>dmxBECreateGC()
-: <a class="el" href="dmxgc_8h.html#a15">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a3">dmxgc.c</a><li>dmxBECreatePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a8">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a1">dmxpixmap.c</a><li>dmxBEDestroyWindow()
-: <a class="el" href="dmxwindow_8h.html#a31">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a11">dmxwindow.c</a><li>dmxBEFreeColormap()
-: <a class="el" href="dmxcmap_8h.html#a11">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a4">dmxcmap.c</a><li>dmxBEFreeCursor()
-: <a class="el" href="dmxcursor_8h.html#a14">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a31">dmxcursor.c</a><li>dmxBEFreeFont()
-: <a class="el" href="dmxfont_8h.html#a8">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a14">dmxfont.c</a><li>dmxBEFreeGC()
-: <a class="el" href="dmxgc_8h.html#a16">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a8">dmxgc.c</a><li>dmxBEFreeGlyphSet()
-: <a class="el" href="dmxpict_8h.html#a30">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a16">dmxpict.c</a><li>dmxBEFreePicture()
-: <a class="el" href="dmxpict_8h.html#a31">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a20">dmxpict.c</a><li>dmxBEFreePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a9">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a3">dmxpixmap.c</a><li>dmxBELoadFont()
-: <a class="el" href="dmxfont_8h.html#a7">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a12">dmxfont.c</a><li>dmxBEScreenInit()
-: <a class="el" href="dmxscrinit_8h.html#a2">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a11">dmxscrinit.c</a><li>dmxBitmapToRegion()
-: <a class="el" href="dmxpixmap_8h.html#a7">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a5">dmxpixmap.c</a><li>dmxChangeBorderWidth()
-: <a class="el" href="dmxwindow_8h.html#a28">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a25">dmxwindow.c</a><li>dmxChangeClip()
-: <a class="el" href="dmxgc_8h.html#a12">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a10">dmxgc.c</a><li>DMXChangeDesktopAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a27">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a34">dmxext.h</a><li>dmxChangeGC()
-: <a class="el" href="dmxgc_8h.html#a9">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a6">dmxgc.c</a><li>dmxChangePicture()
-: <a class="el" href="dmxpict_8h.html#a18">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a25">dmxpict.c</a><li>dmxChangePictureClip()
-: <a class="el" href="dmxpict_8h.html#a16">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a23">dmxpict.c</a><li>dmxChangePointerControl()
-: <a class="el" href="dmxinputinit_8h.html#a54">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a16">dmxinputinit.c</a><li>DMXChangeScreensAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a20">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a29">dmxext.h</a><li>dmxChangeWindowAttributes()
-: <a class="el" href="dmxwindow_8h.html#a18">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a14">dmxwindow.c</a><li>dmxCheckCursor()
-: <a class="el" href="dmxcursor_8h.html#a10">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a41">dmxcursor.c</a><li>dmxCheckSpecialKeys()
-: <a class="el" href="dmxevents_8h.html#a2">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a28">dmxevents.c</a><li>dmxCloseIndexed()
-: <a class="el" href="dmxpict_8h.html#a24">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a31">dmxpict.c</a><li>dmxCloseScreen()
-: <a class="el" href="dmxscrinit_8c.html#a9">dmxscrinit.c</a><li>dmxColormapFromDefaultVisual()
-: <a class="el" href="dmxvisual_8h.html#a2">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a2">dmxvisual.c</a><li>dmxCommonCopyPrivate()
-: <a class="el" href="dmxcommon_8h.html#a27">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a26">dmxcommon.c</a><li>dmxCommonKbdBell()
-: <a class="el" href="dmxcommon_8h.html#a16">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a11">dmxcommon.c</a><li>dmxCommonKbdCtrl()
-: <a class="el" href="dmxcommon_8h.html#a15">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a9">dmxcommon.c</a><li>dmxCommonKbdGetInfo()
-: <a class="el" href="dmxcommon_8h.html#a13">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a13">dmxcommon.c</a><li>dmxCommonKbdGetMap()
-: <a class="el" href="dmxcommon_8h.html#a14">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a12">dmxcommon.c</a><li>dmxCommonKbdOff()
-: <a class="el" href="dmxcommon_8h.html#a18">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a15">dmxcommon.c</a><li>dmxCommonKbdOn()
-: <a class="el" href="dmxcommon_8h.html#a17">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a14">dmxcommon.c</a><li>dmxCommonMouCtrl()
-: <a class="el" href="dmxcommon_8h.html#a20">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a10">dmxcommon.c</a><li>dmxCommonMouGetMap()
-: <a class="el" href="dmxcommon_8h.html#a19">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a19">dmxcommon.c</a><li>dmxCommonMouOff()
-: <a class="el" href="dmxcommon_8h.html#a22">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a24">dmxcommon.c</a><li>dmxCommonMouOn()
-: <a class="el" href="dmxcommon_8h.html#a21">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a23">dmxcommon.c</a><li>dmxCommonOthGetInfo()
-: <a class="el" href="dmxcommon_8h.html#a26">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a18">dmxcommon.c</a><li>dmxCommonOthOff()
-: <a class="el" href="dmxcommon_8h.html#a25">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a17">dmxcommon.c</a><li>dmxCommonOthOn()
-: <a class="el" href="dmxcommon_8h.html#a24">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a16">dmxcommon.c</a><li>dmxCommonRestoreState()
-: <a class="el" href="dmxcommon_8h.html#a29">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a28">dmxcommon.c</a><li>dmxCommonSaveState()
-: <a class="el" href="dmxcommon_8h.html#a28">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a27">dmxcommon.c</a><li>dmxComposite()
-: <a class="el" href="dmxpict_8h.html#a20">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a27">dmxpict.c</a><li>dmxCompositeRects()
-: <a class="el" href="dmxpict_8h.html#a22">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a29">dmxpict.c</a><li>dmxComputeWidthHeight()
-: <a class="el" href="dmxcb_8h.html#a5">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a8">dmxcb.c</a><li>dmxConfigConfigure()
-: <a class="el" href="dmxconfig_8h.html#a10">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a32">dmxconfig.c</a><li>dmxConfigLog()
-: <a class="el" href="dmxparse_8h.html#a38">dmxparse.h</a>, <a class="el" href="dmxparse_8c.html#a0">dmxparse.c</a><li>dmxConfigPrint()
-: <a class="el" href="dmxprint_8h.html#a0">dmxprint.h</a>, <a class="el" href="dmxprint_8c.html#a25">dmxprint.c</a><li>dmxConfigSetMaxScreens()
-: <a class="el" href="dmxconfig_8h.html#a11">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a33">dmxconfig.c</a><li>dmxConfigStoreConfig()
-: <a class="el" href="dmxconfig_8h.html#a9">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a19">dmxconfig.c</a><li>dmxConfigStoreDisplay()
-: <a class="el" href="dmxconfig_8h.html#a5">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a15">dmxconfig.c</a><li>dmxConfigStoreFile()
-: <a class="el" href="dmxconfig_8h.html#a8">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a18">dmxconfig.c</a><li>dmxConfigStoreInput()
-: <a class="el" href="dmxconfig_8h.html#a6">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a16">dmxconfig.c</a><li>dmxConfigStoreXInput()
-: <a class="el" href="dmxconfig_8h.html#a7">dmxconfig.h</a>, <a class="el" href="dmxconfig_8c.html#a17">dmxconfig.c</a><li>dmxConfigVirtualPrint()
-: <a class="el" href="dmxprint_8h.html#a1">dmxprint.h</a>, <a class="el" href="dmxprint_8c.html#a26">dmxprint.c</a><li>dmxConnectionBlockCallback()
-: <a class="el" href="dmxcb_8h.html#a6">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a9">dmxcb.c</a><li>dmxConsoleCapture()
-: <a class="el" href="dmxconsole_8h.html#a10">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a47">dmxconsole.c</a><li>dmxConsoleCollectEvents()
-: <a class="el" href="dmxconsole_8h.html#a6">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a36">dmxconsole.c</a><li>dmxConsoleCreatePrivate()
-: <a class="el" href="dmxconsole_8h.html#a0">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a25">dmxconsole.c</a><li>dmxConsoleDestroyPrivate()
-: <a class="el" href="dmxconsole_8h.html#a1">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a26">dmxconsole.c</a><li>dmxConsoleFunctions()
-: <a class="el" href="dmxconsole_8h.html#a7">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a45">dmxconsole.c</a><li>dmxConsoleInit()
-: <a class="el" href="dmxconsole_8h.html#a2">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a42">dmxconsole.c</a><li>dmxConsoleKbdGetInfo()
-: <a class="el" href="dmxconsole_8h.html#a5">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a44">dmxconsole.c</a><li>dmxConsoleMouGetInfo()
-: <a class="el" href="dmxconsole_8h.html#a4">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a43">dmxconsole.c</a><li>dmxConsoleReInit()
-: <a class="el" href="dmxconsole_8h.html#a3">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a41">dmxconsole.c</a><li>dmxConsoleUncapture()
-: <a class="el" href="dmxconsole_8h.html#a11">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a48">dmxconsole.c</a><li>dmxConsoleUpdateInfo()
-: <a class="el" href="dmxconsole_8h.html#a12">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a32">dmxconsole.c</a><li>dmxConsoleUpdatePosition()
-: <a class="el" href="dmxconsole_8h.html#a8">dmxconsole.h</a>, <a class="el" href="dmxconsole_8c.html#a35">dmxconsole.c</a><li>dmxCopyArea()
-: <a class="el" href="dmxgcops_8h.html#a3">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a5">dmxgcops.c</a><li>dmxCopyClip()
-: <a class="el" href="dmxgc_8h.html#a14">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a12">dmxgc.c</a><li>dmxCopyGC()
-: <a class="el" href="dmxgc_8h.html#a10">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a7">dmxgc.c</a><li>dmxCopyPlane()
-: <a class="el" href="dmxgcops_8h.html#a4">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a6">dmxgcops.c</a><li>dmxCopyWindow()
-: <a class="el" href="dmxwindow_8h.html#a25">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a22">dmxwindow.c</a><li>dmxCreateAndRealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a14">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a9">dmxwindow.c</a><li>dmxCreateColormap()
-: <a class="el" href="dmxcmap_8h.html#a5">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a3">dmxcmap.c</a><li>dmxCreateDefColormap()
-: <a class="el" href="dmxcmap_8h.html#a9">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a8">dmxcmap.c</a><li>dmxCreateGC()
-: <a class="el" href="dmxgc_8h.html#a7">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a4">dmxgc.c</a><li>dmxCreatePicture()
-: <a class="el" href="dmxpict_8h.html#a14">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a19">dmxpict.c</a><li>dmxCreatePictureList()
-: <a class="el" href="dmxpict_8h.html#a12">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a18">dmxpict.c</a><li>dmxCreatePixmap()
-: <a class="el" href="dmxpixmap_8h.html#a5">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a2">dmxpixmap.c</a><li>dmxCreateWindow()
-: <a class="el" href="dmxwindow_8h.html#a15">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a10">dmxwindow.c</a><li>dmxCursorNoMulti()
-: <a class="el" href="dmxcursor_8h.html#a8">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a12">dmxcursor.c</a><li>dmxDestroyClip()
-: <a class="el" href="dmxgc_8h.html#a13">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a11">dmxgc.c</a><li>dmxDestroyColormap()
-: <a class="el" href="dmxcmap_8h.html#a6">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a5">dmxcmap.c</a><li>dmxDestroyGC()
-: <a class="el" href="dmxgc_8h.html#a11">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a9">dmxgc.c</a><li>dmxDestroyPicture()
-: <a class="el" href="dmxpict_8h.html#a15">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a22">dmxpict.c</a><li>dmxDestroyPictureClip()
-: <a class="el" href="dmxpict_8h.html#a17">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a24">dmxpict.c</a><li>dmxDestroyPictureList()
-: <a class="el" href="dmxpict_8h.html#a13">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a21">dmxpict.c</a><li>dmxDestroyPixmap()
-: <a class="el" href="dmxpixmap_8h.html#a6">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a4">dmxpixmap.c</a><li>dmxDestroyWindow()
-: <a class="el" href="dmxwindow_8h.html#a16">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a12">dmxwindow.c</a><li>dmxDetachScreen()
-: <a class="el" href="dmxextension_8h.html#a18">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a23">dmxextension.c</a><li>dmxDPMSInit()
-: <a class="el" href="dmxdpms_8h.html#a0">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a3">dmxdpms.c</a><li>dmxDPMSTerm()
-: <a class="el" href="dmxdpms_8h.html#a1">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a4">dmxdpms.c</a><li>dmxDPMSWakeup()
-: <a class="el" href="dmxdpms_8h.html#a2">dmxdpms.h</a>, <a class="el" href="dmxdpms_8c.html#a5">dmxdpms.c</a><li>dmxDummyKbdGetInfo()
-: <a class="el" href="dmxdummy_8h.html#a1">dmxdummy.h</a>, <a class="el" href="dmxdummy_8c.html#a0">dmxdummy.c</a><li>dmxDummyMouGetInfo()
-: <a class="el" href="dmxdummy_8h.html#a0">dmxdummy.h</a>, <a class="el" href="dmxdummy_8c.html#a1">dmxdummy.c</a><li>dmxEnqueue()
-: <a class="el" href="dmxevents_8h.html#a1">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a27">dmxevents.c</a><li>dmxeqEnqueue()
-: <a class="el" href="dmxeq_8c.html#a13">dmxeq.c</a>, <a class="el" href="dmxinput_8h.html#a24">dmxinput.h</a><li>dmxeqProcessInputEvents()
-: <a class="el" href="dmxeq_8h.html#a1">dmxeq.h</a>, <a class="el" href="dmxeq_8c.html#a16">dmxeq.c</a><li>dmxeqSwitchScreen()
-: <a class="el" href="dmxeq_8c.html#a14">dmxeq.c</a>, <a class="el" href="dmxinput_8h.html#a25">dmxinput.h</a><li>dmxEventName()
-: <a class="el" href="dmxlog_8h.html#a9">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a17">dmxlog.c</a><li>DMXExtensionInit()
-: <a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html#a3">programs/Xserver/Xext/dmx.c</a><li>dmxFillPolygon()
-: <a class="el" href="dmxgcops_8h.html#a10">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a12">dmxgcops.c</a><li>dmxFillSpans()
-: <a class="el" href="dmxgcops_8h.html#a0">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a2">dmxgcops.c</a><li>dmxFindPointerScreen()
-: <a class="el" href="dmxcommon_8h.html#a23">dmxcommon.h</a>, <a class="el" href="dmxcommon_8c.html#a25">dmxcommon.c</a><li>dmxFlushPendingSyncs()
-: <a class="el" href="dmxextension_8h.html#a6">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a11">dmxextension.c</a><li>DMXForceWindowCreation()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a13">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a26">dmxext.h</a><li>dmxForceWindowCreation()
-: <a class="el" href="dmxextension_8h.html#a5">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a10">dmxextension.c</a><li>DMXGetDesktopAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a24">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a33">dmxext.h</a><li>dmxGetGlobalPosition()
-: <a class="el" href="dmxevents_8c.html#a21">dmxevents.c</a>, <a class="el" href="dmxinput_8h.html#a26">dmxinput.h</a><li>dmxGetImage()
-: <a class="el" href="dmxgcops_8h.html#a20">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a22">dmxgcops.c</a><li>dmxGetInputAttributes()
-: <a class="el" href="dmxextension_8h.html#a11">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a5">dmxextension.c</a><li>DMXGetInputAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a29">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a36">dmxext.h</a><li>DMXGetInputCount()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a28">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a35">dmxext.h</a><li>dmxGetInputCount()
-: <a class="el" href="dmxextension_8h.html#a10">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a4">dmxextension.c</a><li>dmxGetLogLevel()
-: <a class="el" href="dmxlog_8h.html#a6">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a2">dmxlog.c</a><li>dmxGetNumScreens()
-: <a class="el" href="dmxextension_8h.html#a4">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a9">dmxextension.c</a><li>DMXGetScreenAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a15">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a28">dmxext.h</a><li>dmxGetScreenAttributes()
-: <a class="el" href="dmxextension_8h.html#a7">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a1">dmxextension.c</a><li>DMXGetScreenCount()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a14">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a27">dmxext.h</a><li>dmxGetSpans()
-: <a class="el" href="dmxgcops_8h.html#a21">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a23">dmxgcops.c</a><li>DMXGetWindowAttributes()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a23">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a32">dmxext.h</a><li>dmxGetWindowAttributes()
-: <a class="el" href="dmxextension_8h.html#a8">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a2">dmxextension.c</a><li>dmxGlyphs()
-: <a class="el" href="dmxpict_8h.html#a21">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a28">dmxpict.c</a><li>dmxHideCursor()
-: <a class="el" href="dmxcursor_8h.html#a12">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a40">dmxcursor.c</a><li>dmxImageGlyphBlt()
-: <a class="el" href="dmxgcops_8h.html#a17">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a19">dmxgcops.c</a><li>dmxImageText16()
-: <a class="el" href="dmxgcops_8h.html#a16">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a18">dmxgcops.c</a><li>dmxImageText8()
-: <a class="el" href="dmxgcops_8h.html#a15">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a17">dmxgcops.c</a><li>dmxInitFonts()
-: <a class="el" href="dmxfont_8h.html#a3">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a10">dmxfont.c</a><li>dmxInitGC()
-: <a class="el" href="dmxgc_8h.html#a6">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a2">dmxgc.c</a><li>dmxInitIndexed()
-: <a class="el" href="dmxpict_8h.html#a23">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a30">dmxpict.c</a><li>dmxInitOrigins()
-: <a class="el" href="dmxcursor_8h.html#a6">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a22">dmxcursor.c</a><li>dmxInitOverlap()
-: <a class="el" href="dmxcursor_8h.html#a7">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a28">dmxcursor.c</a><li>dmxInitPixmap()
-: <a class="el" href="dmxpixmap_8h.html#a4">dmxpixmap.h</a>, <a class="el" href="dmxpixmap_8c.html#a0">dmxpixmap.c</a><li>dmxInitRender()
-: <a class="el" href="dmxpict_8h.html#a9">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a12">dmxpict.c</a><li>dmxInitWindow()
-: <a class="el" href="dmxwindow_8h.html#a11">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a3">dmxwindow.c</a><li>dmxInputCopyLocal()
-: <a class="el" href="dmxinputinit_8h.html#a53">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a33">dmxinputinit.c</a><li>dmxInputDetach()
-: <a class="el" href="dmxinputinit_8h.html#a58">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a43">dmxinputinit.c</a>, <a class="el" href="dmxdetach_8c.html#a0">dmxdetach.c</a><li>dmxInputDetachAll()
-: <a class="el" href="dmxinputinit_8h.html#a59">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a44">dmxinputinit.c</a><li>dmxInputDetachId()
-: <a class="el" href="dmxinputinit_8h.html#a60">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a45">dmxinputinit.c</a><li>dmxInputFree()
-: <a class="el" href="dmxinputinit_8c.html#a41">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a20">dmxinput.h</a><li>dmxInputInit()
-: <a class="el" href="dmxinputinit_8c.html#a39">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a17">dmxinput.h</a><li>dmxInputLateReInit()
-: <a class="el" href="dmxinputinit_8c.html#a38">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a19">dmxinput.h</a><li>dmxInputLogDevices()
-: <a class="el" href="dmxinputinit_8c.html#a42">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a21">dmxinput.h</a><li>dmxInputReInit()
-: <a class="el" href="dmxinputinit_8c.html#a37">dmxinputinit.c</a>, <a class="el" href="dmxinput_8h.html#a18">dmxinput.h</a><li>dmxInstallColormap()
-: <a class="el" href="dmxcmap_8h.html#a7">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a6">dmxcmap.c</a><li>dmxInvalidateGlobalPosition()
-: <a class="el" href="dmxevents_8h.html#a3">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a22">dmxevents.c</a><li>dmxKeyboardBellProc()
-: <a class="el" href="dmxinputinit_8h.html#a56">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a20">dmxinputinit.c</a><li>dmxKeyboardKbdCtrlProc()
-: <a class="el" href="dmxinputinit_8h.html#a55">dmxinputinit.h</a>, <a class="el" href="dmxinputinit_8c.html#a18">dmxinputinit.c</a><li>dmxLog()
-: <a class="el" href="dmxlog_8h.html#a7">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a7">dmxlog.c</a><li>dmxLogArgs()
-: <a class="el" href="dmxlog_8h.html#a15">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a14">dmxlog.c</a><li>dmxLogCont()
-: <a class="el" href="dmxlog_8h.html#a8">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a8">dmxlog.c</a><li>dmxLogInput()
-: <a class="el" href="dmxlog_8h.html#a13">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a12">dmxlog.c</a><li>dmxLogInputCont()
-: <a class="el" href="dmxlog_8h.html#a14">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a13">dmxlog.c</a><li>dmxLogOutput()
-: <a class="el" href="dmxlog_8h.html#a10">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a9">dmxlog.c</a><li>dmxLogOutputCont()
-: <a class="el" href="dmxlog_8h.html#a11">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a10">dmxlog.c</a><li>dmxLogOutputWarning()
-: <a class="el" href="dmxlog_8h.html#a12">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a11">dmxlog.c</a><li>dmxLogVisual()
-: <a class="el" href="dmxlog_8h.html#a16">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a15">dmxlog.c</a><li>dmxLookupVisual()
-: <a class="el" href="dmxvisual_8h.html#a0">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a0">dmxvisual.c</a><li>dmxLookupVisualFromID()
-: <a class="el" href="dmxvisual_8h.html#a1">dmxvisual.h</a>, <a class="el" href="dmxvisual_8c.html#a1">dmxvisual.c</a><li>dmxMapClear()
-: <a class="el" href="dmxmap_8h.html#a1">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a1">dmxmap.c</a><li>dmxMapInsert()
-: <a class="el" href="dmxmap_8h.html#a0">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a0">dmxmap.c</a><li>dmxMapLookup()
-: <a class="el" href="dmxmap_8h.html#a2">dmxmap.h</a>, <a class="el" href="dmxmap_8c.html#a2">dmxmap.c</a><li>dmxMotion()
-: <a class="el" href="dmxevents_8h.html#a0">dmxevents.h</a>, <a class="el" href="dmxevents_8c.html#a23">dmxevents.c</a><li>dmxMoveCursor()
-: <a class="el" href="dmxcursor_8h.html#a9">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a38">dmxcursor.c</a><li>dmxOnScreen()
-: <a class="el" href="dmxcursor_8h.html#a11">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a23">dmxcursor.c</a><li>dmxPaintWindowBackground()
-: <a class="el" href="dmxwindow_8h.html#a23">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a20">dmxwindow.c</a><li>dmxPaintWindowBorder()
-: <a class="el" href="dmxwindow_8h.html#a24">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a21">dmxwindow.c</a><li>dmxPictureInit()
-: <a class="el" href="dmxpict_8h.html#a11">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a14">dmxpict.c</a><li>dmxPointerGetMotionBufferSize()
-: <a class="el" href="dmxmotion_8h.html#a0">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a1">dmxmotion.c</a><li>dmxPointerGetMotionEvents()
-: <a class="el" href="dmxmotion_8h.html#a1">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a2">dmxmotion.c</a><li>dmxPointerPutMotionEvent()
-: <a class="el" href="dmxmotion_8h.html#a2">dmxmotion.h</a>, <a class="el" href="dmxmotion_8c.html#a3">dmxmotion.c</a><li>dmxPolyArc()
-: <a class="el" href="dmxgcops_8h.html#a9">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a11">dmxgcops.c</a><li>dmxPolyFillArc()
-: <a class="el" href="dmxgcops_8h.html#a12">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a14">dmxgcops.c</a><li>dmxPolyFillRect()
-: <a class="el" href="dmxgcops_8h.html#a11">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a13">dmxgcops.c</a><li>dmxPolyGlyphBlt()
-: <a class="el" href="dmxgcops_8h.html#a18">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a20">dmxgcops.c</a><li>dmxPolylines()
-: <a class="el" href="dmxgcops_8h.html#a6">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a8">dmxgcops.c</a><li>dmxPolyPoint()
-: <a class="el" href="dmxgcops_8h.html#a5">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a7">dmxgcops.c</a><li>dmxPolyRectangle()
-: <a class="el" href="dmxgcops_8h.html#a8">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a10">dmxgcops.c</a><li>dmxPolySegment()
-: <a class="el" href="dmxgcops_8h.html#a7">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a9">dmxgcops.c</a><li>dmxPolyText16()
-: <a class="el" href="dmxgcops_8h.html#a14">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a16">dmxgcops.c</a><li>dmxPolyText8()
-: <a class="el" href="dmxgcops_8h.html#a13">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a15">dmxgcops.c</a><li>dmxPositionWindow()
-: <a class="el" href="dmxwindow_8h.html#a17">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a13">dmxwindow.c</a><li>dmxPropertyDisplay()
-: <a class="el" href="dmxprop_8h.html#a0">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a8">dmxprop.c</a><li>dmxPropertyIterate()
-: <a class="el" href="dmxprop_8c.html#a5">dmxprop.c</a><li>dmxPropertySameDisplay()
-: <a class="el" href="dmxprop_8h.html#a3">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a9">dmxprop.c</a><li>dmxPropertyWindow()
-: <a class="el" href="dmxprop_8h.html#a1">dmxprop.h</a>, <a class="el" href="dmxprop_8c.html#a10">dmxprop.c</a><li>dmxPushPixels()
-: <a class="el" href="dmxgcops_8h.html#a19">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a21">dmxgcops.c</a><li>dmxPutImage()
-: <a class="el" href="dmxgcops_8h.html#a2">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a4">dmxgcops.c</a><li>DMXQueryExtension()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a10">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a23">dmxext.h</a><li>DMXQueryVersion()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a11">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a24">dmxext.h</a><li>dmxRealizeFont()
-: <a class="el" href="dmxfont_8h.html#a5">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a13">dmxfont.c</a><li>dmxRealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a19">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a15">dmxwindow.c</a><li>dmxReInitOrigins()
-: <a class="el" href="dmxcursor_8h.html#a5">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a21">dmxcursor.c</a><li>dmxRemoveInput()
-: <a class="el" href="dmxextension_8h.html#a13">dmxextension.h</a>, <a class="el" href="dmxextension_8c.html#a8">dmxextension.c</a><li>DMXRemoveInput()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a33">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a38">dmxext.h</a><li>DMXRemoveScreen()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a22">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a31">dmxext.h</a><li>dmxReparentWindow()
-: <a class="el" href="dmxwindow_8h.html#a27">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a24">dmxwindow.c</a><li>dmxResetFonts()
-: <a class="el" href="dmxfont_8h.html#a4">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a11">dmxfont.c</a><li>dmxResetRender()
-: <a class="el" href="dmxpict_8h.html#a10">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a13">dmxpict.c</a><li>dmxResizeRootWindow()
-: <a class="el" href="dmxwindow_8h.html#a30">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a6">dmxwindow.c</a><li>dmxResizeScreenWindow()
-: <a class="el" href="dmxwindow_8h.html#a29">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a5">dmxwindow.c</a><li>dmxResizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a26">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a23">dmxwindow.c</a><li>dmxRestackWindow()
-: <a class="el" href="dmxwindow_8h.html#a21">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a17">dmxwindow.c</a><li>dmxScreenInit()
-: <a class="el" href="dmxscrinit_8h.html#a1">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a12">dmxscrinit.c</a><li>dmxSetLogLevel()
-: <a class="el" href="dmxlog_8h.html#a5">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a1">dmxlog.c</a><li>dmxSetShape()
-: <a class="el" href="dmxwindow_8h.html#a32">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a26">dmxwindow.c</a><li>dmxSetSpans()
-: <a class="el" href="dmxgcops_8h.html#a1">dmxgcops.h</a>, <a class="el" href="dmxgcops_8c.html#a3">dmxgcops.c</a><li>dmxSetWidthHeight()
-: <a class="el" href="dmxcb_8h.html#a4">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a7">dmxcb.c</a><li>dmxShadowUpdateProc()
-: <a class="el" href="dmxshadow_8h.html#a0">dmxshadow.h</a>, <a class="el" href="dmxshadow_8c.html#a0">dmxshadow.c</a><li>dmxSigioBlock()
-: <a class="el" href="dmxsigio_8h.html#a0">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a5">dmxsigio.c</a><li>dmxSigioDisableInput()
-: <a class="el" href="dmxsigio_8h.html#a3">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a12">dmxsigio.c</a><li>dmxSigioEnableInput()
-: <a class="el" href="dmxsigio_8h.html#a2">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a11">dmxsigio.c</a><li>dmxSigioRegister()
-: <a class="el" href="dmxsigio_8h.html#a4">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a13">dmxsigio.c</a><li>dmxSigioUnblock()
-: <a class="el" href="dmxsigio_8h.html#a1">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a6">dmxsigio.c</a><li>dmxSigioUnregister()
-: <a class="el" href="dmxsigio_8h.html#a5">dmxsigio.h</a>, <a class="el" href="dmxsigio_8c.html#a14">dmxsigio.c</a><li>dmxStatActivate()
-: <a class="el" href="dmxstat_8h.html#a6">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a6">dmxstat.c</a><li>dmxStatAlloc()
-: <a class="el" href="dmxstat_8h.html#a7">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a7">dmxstat.c</a><li>dmxStatFree()
-: <a class="el" href="dmxstat_8h.html#a8">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a8">dmxstat.c</a><li>dmxStatInit()
-: <a class="el" href="dmxstat_8h.html#a9">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a12">dmxstat.c</a><li>dmxStatSync()
-: <a class="el" href="dmxstat_8h.html#a10">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a10">dmxstat.c</a><li>dmxStoreColors()
-: <a class="el" href="dmxcmap_8h.html#a8">dmxcmap.h</a>, <a class="el" href="dmxcmap_8c.html#a7">dmxcmap.c</a><li>dmxSync()
-: <a class="el" href="dmxsync_8h.html#a2">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a9">dmxsync.c</a><li>DMXSync()
-: <a class="el" href="lib_2dmx_2dmx_8c.html#a12">lib/dmx/dmx.c</a>, <a class="el" href="dmxext_8h.html#a25">dmxext.h</a><li>dmxSyncActivate()
-: <a class="el" href="dmxsync_8h.html#a0">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a7">dmxsync.c</a><li>dmxSyncInit()
-: <a class="el" href="dmxsync_8h.html#a1">dmxsync.h</a>, <a class="el" href="dmxsync_8c.html#a8">dmxsync.c</a><li>dmxTrapezoids()
-: <a class="el" href="dmxpict_8h.html#a26">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a33">dmxpict.c</a><li>dmxTriangles()
-: <a class="el" href="dmxpict_8h.html#a27">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a34">dmxpict.c</a><li>dmxTriFan()
-: <a class="el" href="dmxpict_8h.html#a29">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a36">dmxpict.c</a><li>dmxTriStrip()
-: <a class="el" href="dmxpict_8h.html#a28">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a35">dmxpict.c</a><li>dmxUnrealizeFont()
-: <a class="el" href="dmxfont_8h.html#a6">dmxfont.h</a>, <a class="el" href="dmxfont_8c.html#a15">dmxfont.c</a><li>dmxUnrealizeWindow()
-: <a class="el" href="dmxwindow_8h.html#a20">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a16">dmxwindow.c</a><li>dmxUpdateIndexed()
-: <a class="el" href="dmxpict_8h.html#a25">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a32">dmxpict.c</a><li>dmxUpdateWindowInfo()
-: <a class="el" href="dmxinput_8h.html#a22">dmxinput.h</a>, <a class="el" href="dmxinput_8c.html#a3">dmxinput.c</a><li>dmxValidateGC()
-: <a class="el" href="dmxgc_8h.html#a8">dmxgc.h</a>, <a class="el" href="dmxgc_8c.html#a5">dmxgc.c</a><li>dmxValidatePicture()
-: <a class="el" href="dmxpict_8h.html#a19">dmxpict.h</a>, <a class="el" href="dmxpict_8c.html#a26">dmxpict.c</a><li>dmxVDLRead()
-: <a class="el" href="dmxcompat_8h.html#a0">dmxcompat.h</a>, <a class="el" href="dmxcompat_8c.html#a4">dmxcompat.c</a><li>dmxWindowExposures()
-: <a class="el" href="dmxwindow_8h.html#a22">dmxwindow.h</a>, <a class="el" href="dmxwindow_8c.html#a19">dmxwindow.c</a><li>dmxXInputEventName()
-: <a class="el" href="dmxlog_8h.html#a17">dmxlog.h</a>, <a class="el" href="dmxlog_8c.html#a16">dmxlog.c</a></ul>
-<h3><a class="anchor" name="index_g">- g -</a></h3><ul>
-<li>GetTimeInMillis()
-: <a class="el" href="dmxinit_8c.html#a42">dmxinit.c</a></ul>
-<h3><a class="anchor" name="index_i">- i -</a></h3><ul>
-<li>InitInput()
-: <a class="el" href="dmxinput_8c.html#a1">dmxinput.c</a><li>InitOutput()
-: <a class="el" href="dmxinit_8c.html#a34">dmxinit.c</a></ul>
-<h3><a class="anchor" name="index_k">- k -</a></h3><ul>
-<li>kbdLinuxBell()
-: <a class="el" href="lnx-keyboard_8h.html#a11">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a26">lnx-keyboard.c</a><li>kbdLinuxCreatePrivate()
-: <a class="el" href="lnx-keyboard_8h.html#a0">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a24">lnx-keyboard.c</a><li>kbdLinuxCtrl()
-: <a class="el" href="lnx-keyboard_8h.html#a10">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a27">lnx-keyboard.c</a><li>kbdLinuxDestroyPrivate()
-: <a class="el" href="lnx-keyboard_8h.html#a1">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a25">lnx-keyboard.c</a><li>kbdLinuxGetInfo()
-: <a class="el" href="lnx-keyboard_8h.html#a3">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a47">lnx-keyboard.c</a><li>kbdLinuxInit()
-: <a class="el" href="lnx-keyboard_8h.html#a2">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a38">lnx-keyboard.c</a><li>kbdLinuxOff()
-: <a class="el" href="lnx-keyboard_8h.html#a5">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a44">lnx-keyboard.c</a><li>kbdLinuxOn()
-: <a class="el" href="lnx-keyboard_8h.html#a4">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a43">lnx-keyboard.c</a><li>kbdLinuxRead()
-: <a class="el" href="lnx-keyboard_8c.html#a42">lnx-keyboard.c</a><li>kbdLinuxVTPostSwitch()
-: <a class="el" href="lnx-keyboard_8h.html#a7">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a33">lnx-keyboard.c</a><li>kbdLinuxVTPreSwitch()
-: <a class="el" href="lnx-keyboard_8h.html#a6">lnx-keyboard.h</a>, <a class="el" href="lnx-keyboard_8c.html#a32">lnx-keyboard.c</a><li>kbdLinuxVTSwitch()
-: <a class="el" href="lnx-keyboard_8c.html#a34">lnx-keyboard.c</a><li>kbdUSBCtrl()
-: <a class="el" href="usb-keyboard_8h.html#a4">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a20">usb-keyboard.c</a><li>kbdUSBGetInfo()
-: <a class="el" href="usb-keyboard_8h.html#a1">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a26">usb-keyboard.c</a><li>kbdUSBInit()
-: <a class="el" href="usb-keyboard_8h.html#a0">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a21">usb-keyboard.c</a><li>kbdUSBOn()
-: <a class="el" href="usb-keyboard_8h.html#a2">usb-keyboard.h</a>, <a class="el" href="usb-keyboard_8c.html#a24">usb-keyboard.c</a><li>kbdUSBRead()
-: <a class="el" href="usb-keyboard_8c.html#a23">usb-keyboard.c</a></ul>
-<h3><a class="anchor" name="index_l">- l -</a></h3><ul>
-<li>LegalModifier()
-: <a class="el" href="dmxinput_8c.html#a0">dmxinput.c</a></ul>
-<h3><a class="anchor" name="index_m">- m -</a></h3><ul>
-<li>mouUSBGetInfo()
-: <a class="el" href="usb-mouse_8h.html#a2">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a16">usb-mouse.c</a><li>mouUSBInit()
-: <a class="el" href="usb-mouse_8h.html#a1">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a13">usb-mouse.c</a><li>mouUSBOn()
-: <a class="el" href="usb-mouse_8h.html#a3">usb-mouse.h</a>, <a class="el" href="usb-mouse_8c.html#a14">usb-mouse.c</a><li>mouUSBRead()
-: <a class="el" href="usb-mouse_8c.html#a12">usb-mouse.c</a><li>msLinuxCreatePrivate()
-: <a class="el" href="lnx-ms_8h.html#a0">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a24">lnx-ms.c</a><li>msLinuxDestroyPrivate()
-: <a class="el" href="lnx-ms_8h.html#a1">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a25">lnx-ms.c</a><li>msLinuxGetInfo()
-: <a class="el" href="lnx-ms_8h.html#a4">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a26">lnx-ms.c</a><li>msLinuxInit()
-: <a class="el" href="lnx-ms_8h.html#a3">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a18">lnx-ms.c</a><li>msLinuxOff()
-: <a class="el" href="lnx-ms_8h.html#a6">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a20">lnx-ms.c</a><li>msLinuxOn()
-: <a class="el" href="lnx-ms_8h.html#a5">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a19">lnx-ms.c</a><li>msLinuxRead()
-: <a class="el" href="lnx-ms_8c.html#a17">lnx-ms.c</a><li>msLinuxVTPostSwitch()
-: <a class="el" href="lnx-ms_8h.html#a9">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a23">lnx-ms.c</a><li>msLinuxVTPreSwitch()
-: <a class="el" href="lnx-ms_8h.html#a8">lnx-ms.h</a>, <a class="el" href="lnx-ms_8c.html#a22">lnx-ms.c</a></ul>
-<h3><a class="anchor" name="index_o">- o -</a></h3><ul>
-<li>OpenInputDevice()
-: <a class="el" href="dmxxinput_8c.html#a5">dmxxinput.c</a><li>OsVendorFatalError()
-: <a class="el" href="dmxinit_8c.html#a39">dmxinit.c</a><li>OsVendorInit()
-: <a class="el" href="dmxinit_8c.html#a38">dmxinit.c</a><li>othUSBGetInfo()
-: <a class="el" href="usb-other_8h.html#a2">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a16">usb-other.c</a><li>othUSBInit()
-: <a class="el" href="usb-other_8h.html#a1">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a14">usb-other.c</a><li>othUSBOn()
-: <a class="el" href="usb-other_8h.html#a3">usb-other.h</a>, <a class="el" href="usb-other_8c.html#a15">usb-other.c</a><li>othUSBRead()
-: <a class="el" href="usb-other_8c.html#a13">usb-other.c</a></ul>
-<h3><a class="anchor" name="index_p">- p -</a></h3><ul>
-<li>ProcessInputEvents()
-: <a class="el" href="dmxinput_8c.html#a2">dmxinput.c</a><li>ps2LinuxCreatePrivate()
-: <a class="el" href="lnx-ps2_8h.html#a0">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a24">lnx-ps2.c</a><li>ps2LinuxDestroyPrivate()
-: <a class="el" href="lnx-ps2_8h.html#a1">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a25">lnx-ps2.c</a><li>ps2LinuxGetInfo()
-: <a class="el" href="lnx-ps2_8h.html#a4">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a26">lnx-ps2.c</a><li>ps2LinuxInit()
-: <a class="el" href="lnx-ps2_8h.html#a3">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a18">lnx-ps2.c</a><li>ps2LinuxOff()
-: <a class="el" href="lnx-ps2_8h.html#a6">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a20">lnx-ps2.c</a><li>ps2LinuxOn()
-: <a class="el" href="lnx-ps2_8h.html#a5">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a19">lnx-ps2.c</a><li>ps2LinuxRead()
-: <a class="el" href="lnx-ps2_8c.html#a17">lnx-ps2.c</a><li>ps2LinuxVTPostSwitch()
-: <a class="el" href="lnx-ps2_8h.html#a9">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a23">lnx-ps2.c</a><li>ps2LinuxVTPreSwitch()
-: <a class="el" href="lnx-ps2_8h.html#a8">lnx-ps2.h</a>, <a class="el" href="lnx-ps2_8c.html#a22">lnx-ps2.c</a></ul>
-<h3><a class="anchor" name="index_s">- s -</a></h3><ul>
-<li>SetDeviceMode()
-: <a class="el" href="dmxxinput_8c.html#a6">dmxxinput.c</a><li>SetDeviceValuators()
-: <a class="el" href="dmxxinput_8c.html#a7">dmxxinput.c</a></ul>
-<h3><a class="anchor" name="index_u">- u -</a></h3><ul>
-<li>usbCreatePrivate()
-: <a class="el" href="usb-common_8h.html#a3">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a25">usb-common.c</a><li>usbDestroyPrivate()
-: <a class="el" href="usb-common_8h.html#a4">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a26">usb-common.c</a><li>usbInit()
-: <a class="el" href="usb-common_8h.html#a6">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a23">usb-common.c</a><li>usbOff()
-: <a class="el" href="usb-common_8h.html#a7">usb-common.h</a>, <a class="el" href="usb-common_8c.html#a24">usb-common.c</a><li>usbRead()
-: <a class="el" href="usb-common_8c.html#a21">usb-common.c</a></ul>
-<h3><a class="anchor" name="index_x">- x -</a></h3><ul>
-<li>XCheckNotMaskEvent()
-: <a class="el" href="ChkNotMaskEv_8h.html#a0">ChkNotMaskEv.h</a>, <a class="el" href="ChkNotMaskEv_8c.html#a2">ChkNotMaskEv.c</a></ul>
+<h3><a class="anchor" id="index__">- _ -</a></h3><ul>
+<li>_dmxChangePointerControl()
+: <a class="el" href="dmxinputinit_8c.html#a4f65a9b46fe88b8f530752e3b7769424">dmxinputinit.c</a>
+</li>
+<li>_dmxDPMSInit()
+: <a class="el" href="dmxdpms_8c.html#afd14a12acf152c0a881144aff85e584a">dmxdpms.c</a>
+</li>
+<li>_dmxKeyboardBellProc()
+: <a class="el" href="dmxinputinit_8c.html#adcea87288c189798602bd610f87ad785">dmxinputinit.c</a>
+</li>
+<li>_dmxKeyboardKbdCtrlProc()
+: <a class="el" href="dmxinputinit_8c.html#aa785da3b31e5310dd1b1ea13325a83dc">dmxinputinit.c</a>
+</li>
+<li>_dmxMoveCursor()
+: <a class="el" href="dmxcursor_8c.html#aa208a04334d595e3507287bacffdae80">dmxcursor.c</a>
+</li>
+<li>_dmxRealizeCursor()
+: <a class="el" href="dmxcursor_8c.html#ac722828c4781d1a44d8b04955472a134">dmxcursor.c</a>
+</li>
+<li>_dmxSetCursor()
+: <a class="el" href="dmxcursor_8c.html#a6fd26c7c7811ff77fc3c6e84b82d57d5">dmxcursor.c</a>
+</li>
+<li>_dmxUnrealizeCursor()
+: <a class="el" href="dmxcursor_8c.html#aa2ac82b5666d162e873c7f0c88ec96f6">dmxcursor.c</a>
+</li>
+<li>_DMXXineramaActive()
+: <a class="el" href="dmx_8c.html#a9760de3bc5bce0c3fcb7eda8afdafcb7">dmx.c</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_type.html b/xorg-server/hw/dmx/doc/html/globals_type.html
index e3aaeb4ca..8f9ec2b48 100644
--- a/xorg-server/hw/dmx/doc/html/globals_type.html
+++ b/xorg-server/hw/dmx/doc/html/globals_type.html
@@ -6,82 +6,329 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_m">m</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-
-<p>
-<h3><a class="anchor" name="index_d">- d -</a></h3><ul>
+<h3><a class="anchor" id="index_d">- d -</a></h3><ul>
+<li>dmxArg
+: <a class="el" href="dmxarg_8h.html#a7f310ec1f9d20311533a2a142a0b92b8">dmxarg.h</a>
+</li>
+<li>dmxCheckSpecialProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxinputinit.h</a>
+</li>
+<li>dmxCollectEventsProcPtr
+: <a class="el" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxinputinit.h</a>
+</li>
 <li>dmxColormapPrivPtr
-: <a class="el" href="dmxcmap_8h.html#a3">dmxcmap.h</a><li>dmxColormapPrivRec
-: <a class="el" href="dmxcmap_8h.html#a2">dmxcmap.h</a><li>DMXConfigCmd
-: <a class="el" href="dmxconfig_8c.html#a9">dmxconfig.c</a><li>DMXConfigCmdPtr
-: <a class="el" href="dmxconfig_8c.html#a10">dmxconfig.c</a><li>DMXConfigComment
-: <a class="el" href="dmxparse_8h.html#a8">dmxparse.h</a><li>DMXConfigCommentPtr
-: <a class="el" href="dmxparse_8h.html#a9">dmxparse.h</a><li>DMXConfigDisplay
-: <a class="el" href="dmxparse_8h.html#a14">dmxparse.h</a><li>DMXConfigDisplayPtr
-: <a class="el" href="dmxparse_8h.html#a15">dmxparse.h</a><li>DMXConfigEntry
-: <a class="el" href="dmxparse_8h.html#a26">dmxparse.h</a><li>DMXConfigEntryPtr
-: <a class="el" href="dmxparse_8h.html#a27">dmxparse.h</a><li>DMXConfigFullDim
-: <a class="el" href="dmxparse_8h.html#a12">dmxparse.h</a><li>DMXConfigFullDimPtr
-: <a class="el" href="dmxparse_8h.html#a13">dmxparse.h</a><li>DMXConfigList
-: <a class="el" href="dmxconfig_8c.html#a7">dmxconfig.c</a><li>DMXConfigListPtr
-: <a class="el" href="dmxconfig_8c.html#a8">dmxconfig.c</a><li>DMXConfigNumber
-: <a class="el" href="dmxparse_8h.html#a4">dmxparse.h</a><li>DMXConfigNumberPtr
-: <a class="el" href="dmxparse_8h.html#a5">dmxparse.h</a><li>DMXConfigOption
-: <a class="el" href="dmxparse_8h.html#a18">dmxparse.h</a><li>DMXConfigOptionPtr
-: <a class="el" href="dmxparse_8h.html#a19">dmxparse.h</a><li>DMXConfigPair
-: <a class="el" href="dmxparse_8h.html#a6">dmxparse.h</a><li>DMXConfigPairPtr
-: <a class="el" href="dmxparse_8h.html#a7">dmxparse.h</a><li>DMXConfigParam
-: <a class="el" href="dmxparse_8h.html#a20">dmxparse.h</a><li>DMXConfigParamPtr
-: <a class="el" href="dmxparse_8h.html#a21">dmxparse.h</a><li>DMXConfigPartDim
-: <a class="el" href="dmxparse_8h.html#a10">dmxparse.h</a><li>DMXConfigPartDimPtr
-: <a class="el" href="dmxparse_8h.html#a11">dmxparse.h</a><li>DMXConfigString
-: <a class="el" href="dmxparse_8h.html#a2">dmxparse.h</a><li>DMXConfigStringPtr
-: <a class="el" href="dmxparse_8h.html#a3">dmxparse.h</a><li>DMXConfigSub
-: <a class="el" href="dmxparse_8h.html#a22">dmxparse.h</a><li>DMXConfigSubPtr
-: <a class="el" href="dmxparse_8h.html#a23">dmxparse.h</a><li>DMXConfigToken
-: <a class="el" href="dmxparse_8h.html#a0">dmxparse.h</a><li>DMXConfigTokenPtr
-: <a class="el" href="dmxparse_8h.html#a1">dmxparse.h</a><li>DMXConfigVirtual
-: <a class="el" href="dmxparse_8h.html#a24">dmxparse.h</a><li>DMXConfigVirtualPtr
-: <a class="el" href="dmxparse_8h.html#a25">dmxparse.h</a><li>DMXConfigWall
-: <a class="el" href="dmxparse_8h.html#a16">dmxparse.h</a><li>DMXConfigWallPtr
-: <a class="el" href="dmxparse_8h.html#a17">dmxparse.h</a><li>dmxCursorPrivPtr
-: <a class="el" href="dmxcursor_8h.html#a2">dmxcursor.h</a><li>dmxCursorPrivRec
-: <a class="el" href="dmxcursor_8h.html#a1">dmxcursor.h</a><li>DMXEventMap
-: <a class="el" href="dmxinputinit_8h.html#a34">dmxinputinit.h</a><li>dmxFontPrivPtr
-: <a class="el" href="dmxfont_8h.html#a1">dmxfont.h</a><li>dmxFontPrivRec
-: <a class="el" href="dmxfont_8h.html#a0">dmxfont.h</a><li>dmxGCPrivPtr
-: <a class="el" href="dmxgc_8h.html#a4">dmxgc.h</a><li>dmxGCPrivRec
-: <a class="el" href="dmxgc_8h.html#a3">dmxgc.h</a><li>dmxGlyphPrivPtr
-: <a class="el" href="dmxpict_8h.html#a6">dmxpict.h</a><li>dmxGlyphPrivRec
-: <a class="el" href="dmxpict_8h.html#a5">dmxpict.h</a><li>DMXInputInfo
-: <a class="el" href="dmx_8h.html#a2">dmx.h</a><li>DMXLocalInitInfo
-: <a class="el" href="dmxinputinit_8h.html#a9">dmxinputinit.h</a><li>DMXLocalInitInfoPtr
-: <a class="el" href="dmxinputinit_8h.html#a10">dmxinputinit.h</a><li>DMXLocalInputInfoPtr
-: <a class="el" href="dmxinput_8h.html#a3">dmxinput.h</a><li>DMXLocalInputInfoRec
-: <a class="el" href="dmxinputinit_8h.html#a35">dmxinputinit.h</a><li>dmxPictPrivPtr
-: <a class="el" href="dmxpict_8h.html#a4">dmxpict.h</a><li>dmxPictPrivRec
-: <a class="el" href="dmxpict_8h.html#a3">dmxpict.h</a><li>dmxPixPrivPtr
-: <a class="el" href="dmxpixmap_8h.html#a2">dmxpixmap.h</a><li>dmxPixPrivRec
-: <a class="el" href="dmxpixmap_8h.html#a1">dmxpixmap.h</a><li>DMXScreenInfo
-: <a class="el" href="dmx_8h.html#a4">dmx.h</a><li>DMXStatAvg
-: <a class="el" href="dmxstat_8c.html#a0">dmxstat.c</a><li>DMXStatInfo
-: <a class="el" href="dmx_8h.html#a3">dmx.h</a><li>dmxWinPrivPtr
-: <a class="el" href="dmxwindow_8h.html#a9">dmxwindow.h</a><li>dmxWinPrivRec
-: <a class="el" href="dmxwindow_8h.html#a8">dmxwindow.h</a></ul>
-<h3><a class="anchor" name="index_e">- e -</a></h3><ul>
-<li>EventPtr
-: <a class="el" href="dmxeq_8c.html#a6">dmxeq.c</a><li>EventQueuePtr
-: <a class="el" href="dmxeq_8c.html#a8">dmxeq.c</a><li>EventQueueRec
-: <a class="el" href="dmxeq_8c.html#a7">dmxeq.c</a><li>EventRec
-: <a class="el" href="dmxeq_8c.html#a5">dmxeq.c</a></ul>
-<h3><a class="anchor" name="index_m">- m -</a></h3><ul>
+: <a class="el" href="dmxcmap_8h.html#aec71fbb492f3a3ce7e6b2b083a8b0978">dmxcmap.h</a>
+</li>
+<li>dmxColormapPrivRec
+: <a class="el" href="dmxcmap_8h.html#a9b220494b52f982d4dcfa437d34d628b">dmxcmap.h</a>
+</li>
+<li>DMXConfigCmd
+: <a class="el" href="dmxconfig_8c.html#ab9c66f76ee551600df2b3fc9ce6f4d33">dmxconfig.c</a>
+</li>
+<li>DMXConfigCmdPtr
+: <a class="el" href="dmxconfig_8c.html#a5a96d2434004ba9bddaf2b62b5ca9f39">dmxconfig.c</a>
+</li>
+<li>DMXConfigComment
+: <a class="el" href="dmxparse_8h.html#ac53f3a487c56877ce84e621b93c75e63">dmxparse.h</a>
+</li>
+<li>DMXConfigCommentPtr
+: <a class="el" href="dmxparse_8h.html#a3eaf8193499e4474fa2f2c8363ff9558">dmxparse.h</a>
+</li>
+<li>DMXConfigDisplay
+: <a class="el" href="dmxparse_8h.html#a31b5941021484d5b5ae6c905dca6f35a">dmxparse.h</a>
+</li>
+<li>DMXConfigDisplayPtr
+: <a class="el" href="dmxparse_8h.html#a77569967e2f40e3e3f05d8e49a4e81f7">dmxparse.h</a>
+</li>
+<li>DMXConfigEntry
+: <a class="el" href="dmxparse_8h.html#a8cb4fa1fa814f09a1cad1712894a8207">dmxparse.h</a>
+</li>
+<li>DMXConfigEntryPtr
+: <a class="el" href="dmxparse_8h.html#ab46cf3c98a49f9dbf90120e8afd65e81">dmxparse.h</a>
+</li>
+<li>DMXConfigFullDim
+: <a class="el" href="dmxparse_8h.html#a8ad44f7990920ef85b4bdb51c98be380">dmxparse.h</a>
+</li>
+<li>DMXConfigFullDimPtr
+: <a class="el" href="dmxparse_8h.html#af1018551e3cc9ec6836d0d605216e611">dmxparse.h</a>
+</li>
+<li>DMXConfigList
+: <a class="el" href="dmxconfig_8c.html#a3dfd693067cad9597343923410b0372e">dmxconfig.c</a>
+</li>
+<li>DMXConfigListPtr
+: <a class="el" href="dmxconfig_8c.html#a1e7e0db8e8b8c4ea8068d57243bb94b9">dmxconfig.c</a>
+</li>
+<li>DMXConfigNumber
+: <a class="el" href="dmxparse_8h.html#a09ee4bfd4fb105b8d12a3debde0bedd9">dmxparse.h</a>
+</li>
+<li>DMXConfigNumberPtr
+: <a class="el" href="dmxparse_8h.html#a0595f026bf3e261dda1479c3c3664ed7">dmxparse.h</a>
+</li>
+<li>DMXConfigOption
+: <a class="el" href="dmxparse_8h.html#a9d47b44af4d217c2e6da2d4678611376">dmxparse.h</a>
+</li>
+<li>DMXConfigOptionPtr
+: <a class="el" href="dmxparse_8h.html#a8671db1fd961dbb11df3f83d1fab8227">dmxparse.h</a>
+</li>
+<li>DMXConfigPair
+: <a class="el" href="dmxparse_8h.html#a67fb30fb9b3f930220aeea0e7258e5d1">dmxparse.h</a>
+</li>
+<li>DMXConfigPairPtr
+: <a class="el" href="dmxparse_8h.html#a311865c935a9669ca901705d5b28db02">dmxparse.h</a>
+</li>
+<li>DMXConfigParam
+: <a class="el" href="dmxparse_8h.html#a5f7052d0d09e5bd5415f5fb9924c799e">dmxparse.h</a>
+</li>
+<li>DMXConfigParamPtr
+: <a class="el" href="dmxparse_8h.html#a5af8bd2f2624df3b2fa6e36560f2b0a3">dmxparse.h</a>
+</li>
+<li>DMXConfigPartDim
+: <a class="el" href="dmxparse_8h.html#a0040a762f091a14803e78efa90c2b3aa">dmxparse.h</a>
+</li>
+<li>DMXConfigPartDimPtr
+: <a class="el" href="dmxparse_8h.html#a62dde6c86a1db2e243c3d5804770ac98">dmxparse.h</a>
+</li>
+<li>DMXConfigString
+: <a class="el" href="dmxparse_8h.html#a997735bb2e5362d670bd0eaf006e1336">dmxparse.h</a>
+</li>
+<li>DMXConfigStringPtr
+: <a class="el" href="dmxparse_8h.html#a163965084bb791376852afc3c8e2a3cd">dmxparse.h</a>
+</li>
+<li>DMXConfigSub
+: <a class="el" href="dmxparse_8h.html#a2eeff7f31b82f02916abfddeac619406">dmxparse.h</a>
+</li>
+<li>DMXConfigSubPtr
+: <a class="el" href="dmxparse_8h.html#aaeef2cb474e931950e496db8005654ff">dmxparse.h</a>
+</li>
+<li>DMXConfigToken
+: <a class="el" href="dmxparse_8h.html#aa553d8e6837818d31707e48941f2c755">dmxparse.h</a>
+</li>
+<li>DMXConfigTokenPtr
+: <a class="el" href="dmxparse_8h.html#aa54f2be8a82814626992b0e2c2fd76ab">dmxparse.h</a>
+</li>
+<li>DMXConfigVirtual
+: <a class="el" href="dmxparse_8h.html#ac88a2d841fca93f81e6412228570134d">dmxparse.h</a>
+</li>
+<li>DMXConfigVirtualPtr
+: <a class="el" href="dmxparse_8h.html#a7df6222bb31e29b3b6d98cc9d765c70f">dmxparse.h</a>
+</li>
+<li>DMXConfigWall
+: <a class="el" href="dmxparse_8h.html#a09a530a073d8e23f78a3fdd3cdaa16c6">dmxparse.h</a>
+</li>
+<li>DMXConfigWallPtr
+: <a class="el" href="dmxparse_8h.html#a176e5216b55fbc5ed7adb856501826a0">dmxparse.h</a>
+</li>
+<li>dmxCreatePrivateProcPtr
+: <a class="el" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxinputinit.h</a>
+</li>
+<li>dmxCursorPrivPtr
+: <a class="el" href="dmxcursor_8h.html#ae93d2b5a8714fcf2714f03b6cdeadc07">dmxcursor.h</a>
+</li>
+<li>dmxCursorPrivRec
+: <a class="el" href="dmxcursor_8h.html#a78a877b8bee68809063112fb5286e2db">dmxcursor.h</a>
+</li>
+<li>DMXDesktopAttributesPtr
+: <a class="el" href="dmxextension_8h.html#a96ae1d459f8d65cbc2204f324cbe8b72">dmxextension.h</a>
+</li>
+<li>dmxDestroyPrivateProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxinputinit.h</a>
+</li>
+<li>dmxEnqueueProcPtr
+: <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxinputinit.h</a>
+</li>
+<li>DMXEventMap
+: <a class="el" href="dmxinputinit_8h.html#a8143582d36de7cbdda4cca97cc4fb4f8">dmxinputinit.h</a>
+</li>
+<li>dmxFontPrivPtr
+: <a class="el" href="dmxfont_8h.html#a79b4c89f92d4b1c88343b39bc681ef2a">dmxfont.h</a>
+</li>
+<li>dmxFontPrivRec
+: <a class="el" href="dmxfont_8h.html#a06305f429e61106b149a71e28db42541">dmxfont.h</a>
+</li>
+<li>dmxFunctionsProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxinputinit.h</a>
+</li>
+<li>dmxGCPrivPtr
+: <a class="el" href="dmxgc_8h.html#a234db372824505de585d75173374f566">dmxgc.h</a>
+</li>
+<li>dmxGCPrivRec
+: <a class="el" href="dmxgc_8h.html#a2d7a664f045bba899390f66832c1ccf8">dmxgc.h</a>
+</li>
+<li>dmxGetInfoProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxinputinit.h</a>
+</li>
+<li>dmxGlyphPrivPtr
+: <a class="el" href="dmxpict_8h.html#a269ea3cc32b511169336925123d1558d">dmxpict.h</a>
+</li>
+<li>dmxGlyphPrivRec
+: <a class="el" href="dmxpict_8h.html#a9861086a35576e59fe0f9306c4e2588d">dmxpict.h</a>
+</li>
+<li>dmxInitProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxinputinit.h</a>
+</li>
+<li>DMXInputAttributesPtr
+: <a class="el" href="dmxextension_8h.html#af665732621edf76f4bd259d14eb99164">dmxextension.h</a>
+</li>
+<li>DMXInputInfo
+: <a class="el" href="dmx_8h.html#a175903acd588f450ac6325e17355f8ca">dmx.h</a>
+</li>
+<li>dmxKBBellProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxinputinit.h</a>
+</li>
+<li>dmxKBCtrlProcPtr
+: <a class="el" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxinputinit.h</a>
+</li>
+<li>dmxLateReInitProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxinputinit.h</a>
+</li>
+<li>DMXLocalInitInfo
+: <a class="el" href="dmxinputinit_8h.html#a3c9d38c22c8aff8456167d8990cbded0">dmxinputinit.h</a>
+</li>
+<li>DMXLocalInitInfoPtr
+: <a class="el" href="dmxinputinit_8h.html#a6f7eba570368d4ee72420f0cdb70f5c5">dmxinputinit.h</a>
+</li>
+<li>DMXLocalInputInfoPtr
+: <a class="el" href="dmxinput_8h.html#adb148db00fe0adf1938b815b9b934d26">dmxinput.h</a>
+</li>
+<li>DMXLocalInputInfoRec
+: <a class="el" href="dmxinputinit_8h.html#a18d50c3ccca9422952b75ceed4e26e8e">dmxinputinit.h</a>
+</li>
+<li>dmxMCtrlProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxinputinit.h</a>
+</li>
+<li>dmxMotionProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxinputinit.h</a>
+</li>
+<li>dmxOffProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxinputinit.h</a>
+</li>
+<li>dmxOnProcPtr
+: <a class="el" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxinputinit.h</a>
+</li>
+<li>dmxPictPrivPtr
+: <a class="el" href="dmxpict_8h.html#af8d6ee7f8278532ad8b810f448d1cca3">dmxpict.h</a>
+</li>
+<li>dmxPictPrivRec
+: <a class="el" href="dmxpict_8h.html#ab9d490e5079b84da8b60bf0aadd4b10e">dmxpict.h</a>
+</li>
+<li>dmxPixPrivPtr
+: <a class="el" href="dmxpixmap_8h.html#a33d23370f4af28113332cd6112de22f1">dmxpixmap.h</a>
+</li>
+<li>dmxPixPrivRec
+: <a class="el" href="dmxpixmap_8h.html#af881d895a7a1cac8c226aa3aff5678c7">dmxpixmap.h</a>
+</li>
+<li>dmxProcessInputProcPtr
+: <a class="el" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxinputinit.h</a>
+</li>
+<li>dmxReInitProcPtr
+: <a class="el" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxinputinit.h</a>
+</li>
+<li>DMXScreenAttributesPtr
+: <a class="el" href="dmxextension_8h.html#a0e47929486368da1a7513c7d2305f24f">dmxextension.h</a>
+</li>
+<li>DMXScreenInfo
+: <a class="el" href="dmx_8h.html#a093c967353474b26640284f89d78e204">dmx.h</a>
+</li>
+<li>DMXStatAvg
+: <a class="el" href="dmxstat_8c.html#a75a8942c042ee0a2c387e61a28a59b94">dmxstat.c</a>
+</li>
+<li>DMXStatInfo
+: <a class="el" href="dmx_8h.html#aac7b710f9533f3b984574f1403488673">dmx.h</a>
+</li>
+<li>dmxUpdateInfoProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxinputinit.h</a>
+</li>
+<li>dmxUpdatePositionProcPtr
+: <a class="el" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxinputinit.h</a>
+</li>
+<li>dmxVTPostSwitchProcPtr
+: <a class="el" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxinputinit.h</a>
+</li>
+<li>dmxVTPreSwitchProcPtr
+: <a class="el" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxinputinit.h</a>
+</li>
+<li>dmxVTSwitchProcPtr
+: <a class="el" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxinputinit.h</a>
+</li>
+<li>dmxVTSwitchReturnProcPtr
+: <a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxinputinit.h</a>
+</li>
+<li>DMXWindowAttributesPtr
+: <a class="el" href="dmxextension_8h.html#ad22f823435ccab00deb798c2e080fbe1">dmxextension.h</a>
+</li>
+<li>dmxWinPrivPtr
+: <a class="el" href="dmxwindow_8h.html#a3024ab3c0220000ce6ed1e93fd4880cc">dmxwindow.h</a>
+</li>
+<li>dmxWinPrivRec
+: <a class="el" href="dmxwindow_8h.html#a5f9a6e44e1c8fbd89cf1d50b50fee122">dmxwindow.h</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_m">- m -</a></h3><ul>
 <li>myPrivate
-: <a class="el" href="dmxcommon_8c.html#a4">dmxcommon.c</a></ul>
+: <a class="el" href="dmxbackend_8c.html#a25692217bddf2b6c089525b325afccf1">dmxbackend.c</a>
+, <a class="el" href="usb-private_8h.html#a25692217bddf2b6c089525b325afccf1">usb-private.h</a>
+, <a class="el" href="lnx-ps2_8c.html#a25692217bddf2b6c089525b325afccf1">lnx-ps2.c</a>
+, <a class="el" href="lnx-ms_8c.html#a25692217bddf2b6c089525b325afccf1">lnx-ms.c</a>
+, <a class="el" href="lnx-keyboard_8c.html#a25692217bddf2b6c089525b325afccf1">lnx-keyboard.c</a>
+, <a class="el" href="dmxconsole_8c.html#a25692217bddf2b6c089525b325afccf1">dmxconsole.c</a>
+, <a class="el" href="dmxcommon_8c.html#a25692217bddf2b6c089525b325afccf1">dmxcommon.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_p">- p -</a></h3><ul>
+<li>ProcessInputEventsProc
+: <a class="el" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">dmxinput.h</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_u">- u -</a></h3><ul>
+<li>UpdateWindowInfoProc
+: <a class="el" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">dmxinput.h</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/globals_vars.html b/xorg-server/hw/dmx/doc/html/globals_vars.html
index c1c2d27c6..778caa815 100644
--- a/xorg-server/hw/dmx/doc/html/globals_vars.html
+++ b/xorg-server/hw/dmx/doc/html/globals_vars.html
@@ -6,42 +6,600 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration&nbsp;values</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li class="current"><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index__"><span>_</span></a></li>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_q"><span>q</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+&nbsp;
 
-<p>
-<ul>
+<h3><a class="anchor" id="index__">- _ -</a></h3><ul>
+<li>_Xevent_to_mask
+: <a class="el" href="ChkNotMaskEv_8c.html#a653c12c824c0297b32b16e69fdc6b1a5">ChkNotMaskEv.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_a">- a -</a></h3><ul>
+<li>aboutpopup
+: <a class="el" href="xdmxconfig_8c.html#a0ae8f8e10b130f61b00f0aeb0aa54f71">xdmxconfig.c</a>
+</li>
+<li>at2lnx
+: <a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">lnx-keyboard.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_b">- b -</a></h3><ul>
+<li>buttonpopup
+: <a class="el" href="xdmxconfig_8c.html#acad0e44da558823cb3c1d09d76652bb0">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_c">- c -</a></h3><ul>
+<li>canvas
+: <a class="el" href="xdmxconfig_8c.html#a8aa7fc9518191f57124a67f4a3afdd42">xdmxconfig.c</a>
+</li>
+<li>cdimbox
+: <a class="el" href="xdmxconfig_8c.html#ade389d0f04ea208e93527bb1d8bd8a1c">xdmxconfig.c</a>
+</li>
+<li>ChangeDeviceNotify
+: <a class="el" href="dmxclient_8h.html#a9cdf1d1f5958572f162e6c5d5c19d4a4">dmxclient.h</a>
+</li>
+<li>cnamebox
+: <a class="el" href="xdmxconfig_8c.html#a8286e1b3c5833128c8e3903d3b3b8039">xdmxconfig.c</a>
+</li>
+<li>connBlockScreenStart
+: <a class="el" href="dmxcb_8c.html#a21fd58c4d3a6b5bba84476c314a6d657">dmxcb.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_d">- d -</a></h3><ul>
+<li>dcbutton
+: <a class="el" href="xdmxconfig_8c.html#aa702bb96d419e4b93256107f61f54b96">xdmxconfig.c</a>
+</li>
+<li>ddbutton
+: <a class="el" href="xdmxconfig_8c.html#a43d831fb3dc9d33f8f6732e9407a3fa6">xdmxconfig.c</a>
+</li>
+<li>defaultFont
+: <a class="el" href="dmxextension_8c.html#a7decb269dc8674114f44964a88a68063">dmxextension.c</a>
+</li>
+<li>DeviceFocusIn
+: <a class="el" href="dmxclient_8h.html#a83d9bb79d3ddadf36469794bf2563482">dmxclient.h</a>
+</li>
+<li>DeviceFocusOut
+: <a class="el" href="dmxclient_8h.html#a5da5340a54a4f158c507ee002c4b3824">dmxclient.h</a>
+</li>
+<li>DeviceMappingNotify
+: <a class="el" href="dmxclient_8h.html#a232c73ad30bfc3116842076bd6fc1151">dmxclient.h</a>
+</li>
+<li>DeviceMotionNotify
+: <a class="el" href="dmxclient_8h.html#a989f862a42e735c00e8c23a239920772">dmxclient.h</a>
+</li>
+<li>DeviceStateNotify
+: <a class="el" href="dmxclient_8h.html#a7212800e5b127f95425fb860bb2dcbdf">dmxclient.h</a>
+</li>
+<li>DeviceValuator
+: <a class="el" href="dmxclient_8h.html#a7008cfdcc3748585492b12a9658278b9">dmxclient.h</a>
+</li>
+<li>dimbox
+: <a class="el" href="xdmxconfig_8c.html#ad5d5209613aeed1c3d40068bd107bf56">xdmxconfig.c</a>
+</li>
+<li>display
+: <a class="el" href="dmxprop_8c.html#ac49dfab9200d48f835ce64819c4fc878">dmxprop.c</a>
+</li>
 <li>dmxAddRemoveScreens
-: <a class="el" href="dmxinit_8c.html#a17">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a18">dmx.h</a><li>dmxColormapPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a6">dmxscrinit.c</a>, <a class="el" href="dmxcmap_8h.html#a4">dmxcmap.h</a><li>dmxDepth
-: <a class="el" href="dmxinit_8c.html#a13">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a14">dmx.h</a><li>dmxErrorOccurred
-: <a class="el" href="dmxinit_8c.html#a7">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a9">dmx.h</a><li>dmxFontPath
-: <a class="el" href="dmxinit_8c.html#a8">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a16">dmx.h</a><li>dmxFontPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a4">dmxscrinit.c</a>, <a class="el" href="dmxfont_8h.html#a2">dmxfont.h</a><li>dmxGCPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a2">dmxscrinit.c</a>, <a class="el" href="dmxgc_8h.html#a5">dmxgc.h</a><li>dmxGlobalHeight
-: <a class="el" href="dmxcb_8h.html#a1">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a6">dmxcb.c</a><li>dmxGlobalWidth
-: <a class="el" href="dmxcb_8h.html#a0">dmxcb.h</a>, <a class="el" href="dmxcb_8c.html#a5">dmxcb.c</a><li>dmxGlyphSetPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a8">dmxscrinit.c</a>, <a class="el" href="dmxpict_8h.html#a8">dmxpict.h</a><li>dmxIgnoreBadFontPaths
-: <a class="el" href="dmxinit_8c.html#a16">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a17">dmx.h</a><li>dmxInputs
-: <a class="el" href="dmxinput_8h.html#a5">dmxinput.h</a>, <a class="el" href="dmxinit_8c.html#a4">dmxinit.c</a><li>dmxLastErrorEvent
-: <a class="el" href="dmxinit_8c.html#a6">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a8">dmx.h</a><li>dmxLazyWindowCreation
-: <a class="el" href="dmxinit_8c.html#a11">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a12">dmx.h</a><li>dmxNoRender
-: <a class="el" href="dmxinit_8c.html#a14">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a15">dmx.h</a><li>dmxNumInputs
-: <a class="el" href="dmxinput_8h.html#a4">dmxinput.h</a>, <a class="el" href="dmxinit_8c.html#a3">dmxinit.c</a><li>dmxNumScreens
-: <a class="el" href="dmxinit_8c.html#a1">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a5">dmx.h</a><li>dmxOffScreenOpt
-: <a class="el" href="dmxinit_8c.html#a9">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a10">dmx.h</a><li>dmxPictPrivateIndex
-: <a class="el" href="dmxscrinit_8c.html#a7">dmxscrinit.c</a>, <a class="el" href="dmxpict_8h.html#a7">dmxpict.h</a><li>dmxPixPrivateIndex
-: <a class="el" href="dmxpixmap_8h.html#a3">dmxpixmap.h</a><li>dmxPointerCursorFuncs
-: <a class="el" href="dmxcursor_8h.html#a3">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a10">dmxcursor.c</a><li>dmxPointerSpriteFuncs
-: <a class="el" href="dmxcursor_8h.html#a4">dmxcursor.h</a>, <a class="el" href="dmxcursor_8c.html#a11">dmxcursor.c</a><li>dmxScreenPrivateIndex
-: <a class="el" href="dmxscrinit_8h.html#a0">dmxscrinit.h</a>, <a class="el" href="dmxscrinit_8c.html#a5">dmxscrinit.c</a><li>dmxScreens
-: <a class="el" href="dmxinit_8c.html#a2">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a6">dmx.h</a><li>dmxShadowFB
-: <a class="el" href="dmxinit_8c.html#a5">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a7">dmx.h</a><li>dmxStatInterval
-: <a class="el" href="dmxstat_8h.html#a5">dmxstat.h</a>, <a class="el" href="dmxstat_8c.html#a1">dmxstat.c</a><li>dmxSubdividePrimitives
-: <a class="el" href="dmxinit_8c.html#a10">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a11">dmx.h</a><li>dmxUseXKB
-: <a class="el" href="dmxinit_8c.html#a12">dmxinit.c</a>, <a class="el" href="dmx_8h.html#a13">dmx.h</a><li>dmxWinPrivateIndex
-: <a class="el" href="dmxwindow_8h.html#a10">dmxwindow.h</a>, <a class="el" href="dmxscrinit_8c.html#a3">dmxscrinit.c</a></ul>
+: <a class="el" href="dmx_8h.html#a8d53c22ed93cbef2684016d3c7638671">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a8d53c22ed93cbef2684016d3c7638671">dmxinit.c</a>
+</li>
+<li>DMXBackendKbd
+: <a class="el" href="dmxinputinit_8c.html#a4ad947489cdc8cae1835dbd5604e0cde">dmxinputinit.c</a>
+</li>
+<li>DMXBackendMou
+: <a class="el" href="dmxinputinit_8c.html#a420b4847b9c9f9992e042754c9a5d9c9">dmxinputinit.c</a>
+</li>
+<li>DMXCode
+: <a class="el" href="dmx_8c.html#a358d781b37da0527044c0cc8213097d2">dmx.c</a>
+</li>
+<li>dmxColormapPrivateKey
+: <a class="el" href="dmxcmap_8h.html#ac851002ecdb3ee41847403048e47cc8d">dmxcmap.h</a>
+, <a class="el" href="dmxscrinit_8c.html#ac851002ecdb3ee41847403048e47cc8d">dmxscrinit.c</a>
+</li>
+<li>dmxColormapPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#ac035360e2c085bc8ff3a8061ea5c21b2">dmxscrinit.c</a>
+</li>
+<li>DMXCommonOth
+: <a class="el" href="dmxinputinit_8c.html#a42322c044220c5f39e1fd37b23cc037b">dmxinputinit.c</a>
+</li>
+<li>dmxConfigCmd
+: <a class="el" href="dmxconfig_8c.html#a9d2aa7477b1176f8ee206f47e03c29da">dmxconfig.c</a>
+</li>
+<li>dmxConfigCurrent
+: <a class="el" href="xdmxconfig_8c.html#a7d0525177e2bcd01130c2d88219eaea7">xdmxconfig.c</a>
+</li>
+<li>dmxConfigCurrentDisplay
+: <a class="el" href="xdmxconfig_8c.html#ae7d68549ff5ad989a28258671bf1a007">xdmxconfig.c</a>
+</li>
+<li>dmxConfigEntry
+: <a class="el" href="dmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">dmxconfig.c</a>
+, <a class="el" href="dmxparse_8h.html#af1733e9f6f810a355a158f16f8bc7899">dmxparse.h</a>
+, <a class="el" href="xdmxconfig_8c.html#af1733e9f6f810a355a158f16f8bc7899">xdmxconfig.c</a>
+</li>
+<li>dmxConfigFilename
+: <a class="el" href="xdmxconfig_8c.html#a675632838d5a243f57ee16302a6b7cf9">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGC
+: <a class="el" href="xdmxconfig_8c.html#aa477b9696222130ee598fb12dc1dd6c5">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGCHL
+: <a class="el" href="xdmxconfig_8c.html#ae6e5f9776e42a6b3c72faca8486ce3d1">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGCInit
+: <a class="el" href="xdmxconfig_8c.html#a759c2efde7d196076ce7af7e02c720d3">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGCRev
+: <a class="el" href="xdmxconfig_8c.html#a32768cf28349ecd06adf9b568a79db52">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGrabbed
+: <a class="el" href="xdmxconfig_8c.html#a9d4629bf6b66304ec1dae9aefcb8e690">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGrabbedFine
+: <a class="el" href="xdmxconfig_8c.html#a71a96fb97110e965bceec5e6a5e8c082">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGrabbedX
+: <a class="el" href="xdmxconfig_8c.html#a68f7d459bce6cc9feb1f45d161080379">xdmxconfig.c</a>
+</li>
+<li>dmxConfigGrabbedY
+: <a class="el" href="xdmxconfig_8c.html#afd652683b9230abcc541aba117ec13fe">xdmxconfig.c</a>
+</li>
+<li>dmxConfigNewDisplay
+: <a class="el" href="xdmxconfig_8c.html#a5b85ce4267bf51937e8f8873fcd0f898">xdmxconfig.c</a>
+</li>
+<li>dmxConfigNewVirtual
+: <a class="el" href="xdmxconfig_8c.html#ae231cf2b287cec0f4b9dce3f5bcb4870">xdmxconfig.c</a>
+</li>
+<li>dmxConfigNotSaved
+: <a class="el" href="xdmxconfig_8c.html#ae459f0fca016b8b403de9bf49e06bd08">xdmxconfig.c</a>
+</li>
+<li>dmxConfigScaleX
+: <a class="el" href="xdmxconfig_8c.html#a3351557ff2692e424639e5cfd648c94a">xdmxconfig.c</a>
+</li>
+<li>dmxConfigScaleY
+: <a class="el" href="xdmxconfig_8c.html#a0593aa4d0048daba8d06415335469129">xdmxconfig.c</a>
+</li>
+<li>dmxConfigState
+: <a class="el" href="xdmxconfig_8c.html#a94d7edcf3287b564489ccf5ec288201b">xdmxconfig.c</a>
+</li>
+<li>dmxConfigWallHeight
+: <a class="el" href="xdmxconfig_8c.html#a1607f63798909b672cef90f7a8bb3ce2">xdmxconfig.c</a>
+</li>
+<li>dmxConfigWallWidth
+: <a class="el" href="xdmxconfig_8c.html#a08700108cb0b467380001fbaa626cd61">xdmxconfig.c</a>
+</li>
+<li>dmxConfigWidgetHeight
+: <a class="el" href="xdmxconfig_8c.html#ae8e507a8ffea650807baebab3b720027">xdmxconfig.c</a>
+</li>
+<li>dmxConfigWidgetWidth
+: <a class="el" href="xdmxconfig_8c.html#ad159f52770b5cc4224709338a4fd3f8c">xdmxconfig.c</a>
+</li>
+<li>DMXConsoleKbd
+: <a class="el" href="dmxinputinit_8c.html#a3c213f84d74e74751787f916f509581f">dmxinputinit.c</a>
+</li>
+<li>DMXConsoleMou
+: <a class="el" href="dmxinputinit_8c.html#a3a58ba39e104b23698ca8ef19789caf3">dmxinputinit.c</a>
+</li>
+<li>dmxCurrentLogLevel
+: <a class="el" href="dmxlog_8c.html#adec7b3dba0fe95f6ff8c96575cbd29b1">dmxlog.c</a>
+</li>
+<li>dmxCursorDoMultiCursors
+: <a class="el" href="dmxcursor_8c.html#a4d792c0cb9ce0c21787d3cd88d774fa6">dmxcursor.c</a>
+</li>
+<li>dmxCursorGeneration
+: <a class="el" href="dmxscrinit_8c.html#a1bed5fde9231f820a1aa25228649575b">dmxscrinit.c</a>
+</li>
+<li>dmxDepth
+: <a class="el" href="dmx_8h.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#ad2d0e8e1a260d9fdb7ea3a980d5fce8b">dmxinit.c</a>
+</li>
+<li>dmxDisplaysFromCommandLine
+: <a class="el" href="dmxconfig_8c.html#a574577536ff981870613b67021f61930">dmxconfig.c</a>
+</li>
+<li>DMXDummyKbd
+: <a class="el" href="dmxinputinit_8c.html#af0b33ec9267eea9d58f6792e33e02295">dmxinputinit.c</a>
+</li>
+<li>DMXDummyMou
+: <a class="el" href="dmxinputinit_8c.html#a3041e526ae9e56b4a2d0a99f030af71f">dmxinputinit.c</a>
+</li>
+<li>dmxErrorOccurred
+: <a class="el" href="dmx_8h.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a9a817996c23e8669c5d9a8dc25e8cb51">dmxinit.c</a>
+</li>
+<li>dmxFdCount
+: <a class="el" href="dmxsigio_8c.html#ac926cb5aa8d124192f381a9e05d49cb8">dmxsigio.c</a>
+</li>
+<li>dmxFontLastError
+: <a class="el" href="dmxfont_8c.html#a9c9ed2980702f901796479788b6b8f66">dmxfont.c</a>
+</li>
+<li>dmxFontPath
+: <a class="el" href="dmx_8h.html#a10581b0cb51e730e26cbc08913a76c5f">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a10581b0cb51e730e26cbc08913a76c5f">dmxinit.c</a>
+</li>
+<li>dmxFontPrivateIndex
+: <a class="el" href="dmxfont_8h.html#a4e2a5b2ae34073156aef6b406552657f">dmxfont.h</a>
+, <a class="el" href="dmxscrinit_8c.html#a4e2a5b2ae34073156aef6b406552657f">dmxscrinit.c</a>
+</li>
+<li>dmxGCFuncs
+: <a class="el" href="dmxgc_8c.html#a3c6b012a9ca843b7f1083a151030c400">dmxgc.c</a>
+</li>
+<li>dmxGCOps
+: <a class="el" href="dmxgc_8c.html#a4688e83670c13b303cba5309eaf23424">dmxgc.c</a>
+</li>
+<li>dmxGCPrivateKey
+: <a class="el" href="dmxgc_8h.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxgc.h</a>
+, <a class="el" href="dmxscrinit_8c.html#ac268fa35580a060a02ec3ae0ff2b2669">dmxscrinit.c</a>
+</li>
+<li>dmxGCPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#ad44e630c146c4229565af9099435dd9c">dmxscrinit.c</a>
+</li>
+<li>dmxGeneration
+: <a class="el" href="dmxscrinit_8c.html#a4f7aaf448bb3a6c12bccf07600bb1d52">dmxscrinit.c</a>
+</li>
+<li>dmxGlobalHeight
+: <a class="el" href="dmxcb_8c.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxcb.c</a>
+, <a class="el" href="dmxcb_8h.html#a7c8270dd4b1ef6cd953a30cdcae548de">dmxcb.h</a>
+</li>
+<li>dmxGlobalInvalid
+: <a class="el" href="dmxevents_8c.html#a1ae34b930e721372a403fbbe2111a221">dmxevents.c</a>
+</li>
+<li>dmxGlobalWidth
+: <a class="el" href="dmxcb_8c.html#a738220b78d864fe9317683a1ff425c75">dmxcb.c</a>
+, <a class="el" href="dmxcb_8h.html#a738220b78d864fe9317683a1ff425c75">dmxcb.h</a>
+</li>
+<li>dmxGlobalX
+: <a class="el" href="dmxevents_8c.html#a6f6d88e8d30622451b8e9fe4ba22c811">dmxevents.c</a>
+</li>
+<li>dmxGlobalY
+: <a class="el" href="dmxevents_8c.html#abbf8898981b5b2ac573e68e1a9386f08">dmxevents.c</a>
+</li>
+<li>dmxGLXProxy
+: <a class="el" href="dmxinit_8c.html#ae0253d9b4aa523bbdee8aaafbe63c1a4">dmxinit.c</a>
+</li>
+<li>dmxGlyphLastError
+: <a class="el" href="dmxpict_8c.html#a80081bafc7043ef16f07b96b9322264c">dmxpict.c</a>
+</li>
+<li>dmxGlyphSetPrivateKey
+: <a class="el" href="dmxpict_8h.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxpict.h</a>
+, <a class="el" href="dmxscrinit_8c.html#af4a0d93e32ac272f72e3b5a6642fb135">dmxscrinit.c</a>
+</li>
+<li>dmxGlyphSetPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#ac5ddcc47c5f64bb86709e1de5e460969">dmxscrinit.c</a>
+</li>
+<li>dmxIgnoreBadFontPaths
+: <a class="el" href="dmx_8h.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a2eb1403caea1e0c8ac3cb9d1edc8d3c6">dmxinit.c</a>
+</li>
+<li>dmxInputEnabled
+: <a class="el" href="dmxsigio_8c.html#ace65587735b6bff523a064f6ad1f978f">dmxsigio.c</a>
+</li>
+<li>dmxInputs
+: <a class="el" href="dmxinit_8c.html#a067017d9e67716c251357e9edf917e59">dmxinit.c</a>
+, <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxinput.h</a>
+</li>
+<li>dmxLastErrorEvent
+: <a class="el" href="dmxinit_8c.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmxinit.c</a>
+, <a class="el" href="dmx_8h.html#aacf5b80f46b3ba1e46d7f1f12cfb158f">dmx.h</a>
+</li>
+<li>dmxLazyWindowCreation
+: <a class="el" href="dmx_8h.html#af266e8dde07901ede60eaa822b3e945a">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#af266e8dde07901ede60eaa822b3e945a">dmxinit.c</a>
+</li>
+<li>dmxLocalCoreKeyboard
+: <a class="el" href="dmxinputinit_8h.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxinputinit.h</a>
+, <a class="el" href="dmxinputinit_8c.html#afbf8cd02f52e073392a645f6ef0bcf78">dmxinputinit.c</a>
+</li>
+<li>dmxLocalCorePointer
+: <a class="el" href="dmxinputinit_8c.html#ab34ec11967377e32bc0817fb3a8b939e">dmxinputinit.c</a>
+, <a class="el" href="dmxinputinit_8h.html#ab34ec11967377e32bc0817fb3a8b939e">dmxinputinit.h</a>
+</li>
+<li>DMXLocalDevices
+: <a class="el" href="dmxinputinit_8c.html#a74cb9ef11048e61ab91acd98613210b8">dmxinputinit.c</a>
+</li>
+<li>dmxNumInputs
+: <a class="el" href="dmxinit_8c.html#a7c8f7f00098aec51d56c188a26747d9f">dmxinit.c</a>
+, <a class="el" href="dmxinput_8h.html#a7c8f7f00098aec51d56c188a26747d9f">dmxinput.h</a>
+</li>
+<li>dmxNumScreens
+: <a class="el" href="dmx_8h.html#a5a881109fe1e32c74cda4a280b09a7c4">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a5a881109fe1e32c74cda4a280b09a7c4">dmxinit.c</a>
+</li>
+<li>dmxOffScreenOpt
+: <a class="el" href="dmxinit_8c.html#aa8987e6ecde1821c659e8fe22336fd20">dmxinit.c</a>
+, <a class="el" href="dmx_8h.html#aa8987e6ecde1821c659e8fe22336fd20">dmx.h</a>
+</li>
+<li>dmxPictPrivateKey
+: <a class="el" href="dmxpict_8h.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxpict.h</a>
+, <a class="el" href="dmxscrinit_8c.html#a4b033f36c5e01a808f7d6460eb7c1af3">dmxscrinit.c</a>
+</li>
+<li>dmxPictPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#afa3047e4749b013eaa7761baeb3da12b">dmxscrinit.c</a>
+</li>
+<li>dmxPixPrivateKey
+: <a class="el" href="dmxpixmap_8h.html#af5bfb64208a18ade9f50196263c9d847">dmxpixmap.h</a>
+, <a class="el" href="dmxscrinit_8c.html#af5bfb64208a18ade9f50196263c9d847">dmxscrinit.c</a>
+</li>
+<li>dmxPixPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#a94d6255a4be0d273ed4d90fb768a6094">dmxscrinit.c</a>
+</li>
+<li>dmxPointerCursorFuncs
+: <a class="el" href="dmxcursor_8h.html#aacf8d4857dd965073f62f10a53edcaa3">dmxcursor.h</a>
+, <a class="el" href="dmxcursor_8c.html#aacf8d4857dd965073f62f10a53edcaa3">dmxcursor.c</a>
+</li>
+<li>dmxPointerSpriteFuncs
+: <a class="el" href="dmxcursor_8c.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxcursor.c</a>
+, <a class="el" href="dmxcursor_8h.html#a7bf2f59a6c5d381aea975cd78dd1f9dc">dmxcursor.h</a>
+</li>
+<li>dmxSaveProcVector
+: <a class="el" href="dmxfont_8c.html#a306f6e316020fcda44fb35e1c96f2bd3">dmxfont.c</a>
+</li>
+<li>dmxSaveRenderVector
+: <a class="el" href="dmxpict_8c.html#aeba9d541daf04470813b176723c857e8">dmxpict.c</a>
+</li>
+<li>dmxScreenPrivateKey
+: <a class="el" href="dmxscrinit_8c.html#ad3275163fbf66db755e5497df16b9140">dmxscrinit.c</a>
+, <a class="el" href="dmxscrinit_8h.html#ad3275163fbf66db755e5497df16b9140">dmxscrinit.h</a>
+</li>
+<li>dmxScreenPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#a7897d9161e88c6a522715f635995c864">dmxscrinit.c</a>
+</li>
+<li>dmxScreens
+: <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxinit.c</a>
+, <a class="el" href="dmx_8h.html#a3e242a6818df05e547a4776919e3827f">dmx.h</a>
+</li>
+<li>dmxShadowFB
+: <a class="el" href="dmx_8h.html#a97d09d0d46e9e7df451072def499e4fe">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a97d09d0d46e9e7df451072def499e4fe">dmxinit.c</a>
+</li>
+<li>dmxStatDisplays
+: <a class="el" href="dmxstat_8c.html#a9994506527c1e7aac2f30d4ed67ea4a5">dmxstat.c</a>
+</li>
+<li>dmxStatInterval
+: <a class="el" href="dmxstat_8c.html#abe67369da5135f53f058261d3c173927">dmxstat.c</a>
+, <a class="el" href="dmxstat_8h.html#abe67369da5135f53f058261d3c173927">dmxstat.h</a>
+</li>
+<li>dmxStatTimer
+: <a class="el" href="dmxstat_8c.html#a4b07a4c989d24e5cad8f85a24d24406c">dmxstat.c</a>
+</li>
+<li>dmxSubdividePrimitives
+: <a class="el" href="dmx_8h.html#a8207510b34c9871015d1e9378c31c568">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#a8207510b34c9871015d1e9378c31c568">dmxinit.c</a>
+</li>
+<li>dmxSyncInterval
+: <a class="el" href="dmxsync_8c.html#a01c45efcf0b2d9242b06e1e0fe42bd76">dmxsync.c</a>
+</li>
+<li>dmxSyncPending
+: <a class="el" href="dmxsync_8c.html#a6fb7fbcbe509b8ffb8637691925d46f2">dmxsync.c</a>
+</li>
+<li>dmxSyncTimer
+: <a class="el" href="dmxsync_8c.html#a9466911712aef6631a5b88d1bcb1afad">dmxsync.c</a>
+</li>
+<li>dmxUseXKB
+: <a class="el" href="dmx_8h.html#ab5b999218612af4136983694943737aa">dmx.h</a>
+, <a class="el" href="dmxinit_8c.html#ab5b999218612af4136983694943737aa">dmxinit.c</a>
+</li>
+<li>dmxWinPrivateKey
+: <a class="el" href="dmxscrinit_8c.html#af6748237525fb596a210d3b3614312ba">dmxscrinit.c</a>
+, <a class="el" href="dmxwindow_8h.html#af6748237525fb596a210d3b3614312ba">dmxwindow.h</a>
+</li>
+<li>dmxWinPrivateKeyIndex
+: <a class="el" href="dmxscrinit_8c.html#aded404553276687d3f5ff7b9508765a5">dmxscrinit.c</a>
+</li>
+<li>dmxXkbLayout
+: <a class="el" href="dmxconfig_8c.html#a70d750a10d2cda84bbb9e009c8cdbdda">dmxconfig.c</a>
+</li>
+<li>dmxXkbModel
+: <a class="el" href="dmxconfig_8c.html#a03f1affbcf5042cf537cffc8ce9d47f4">dmxconfig.c</a>
+</li>
+<li>dmxXkbOptions
+: <a class="el" href="dmxconfig_8c.html#aba9019237c80bcabbbbd9afffc723c22">dmxconfig.c</a>
+</li>
+<li>dmxXkbRules
+: <a class="el" href="dmxconfig_8c.html#aae9b4e8aa3f950c6e12e792d6940a852">dmxconfig.c</a>
+</li>
+<li>dmxXkbVariant
+: <a class="el" href="dmxconfig_8c.html#a9237687e93253996897e0e0d584222ed">dmxconfig.c</a>
+</li>
+<li>dpmsGeneration
+: <a class="el" href="dmxdpms_8c.html#a7bb06fe7454077ecfbfae62ac9cba1e0">dmxdpms.c</a>
+</li>
+<li>dpmsSupported
+: <a class="el" href="dmxdpms_8c.html#a2d45a784084cd5cdef646499d5298254">dmxdpms.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_e">- e -</a></h3><ul>
+<li>ecbutton
+: <a class="el" href="xdmxconfig_8c.html#a655e2589b88ef8902e7c022e496d8170">xdmxconfig.c</a>
+</li>
+<li>ecdialog0
+: <a class="el" href="xdmxconfig_8c.html#a26c26ea49a9040762018c2fee570f9d2">xdmxconfig.c</a>
+</li>
+<li>ecdialog1
+: <a class="el" href="xdmxconfig_8c.html#a425c2cbc50e36e8e0e584a362ba47e0d">xdmxconfig.c</a>
+</li>
+<li>ecpopup
+: <a class="el" href="xdmxconfig_8c.html#a3bafacdb9cd693553e468c9b38cd3e38">xdmxconfig.c</a>
+</li>
+<li>edbutton
+: <a class="el" href="xdmxconfig_8c.html#a7cd605cfca87d28f931794de0132fb91">xdmxconfig.c</a>
+</li>
+<li>eddialog0
+: <a class="el" href="xdmxconfig_8c.html#a721a151e60708d340e2585488ae8e523">xdmxconfig.c</a>
+</li>
+<li>eddialog1
+: <a class="el" href="xdmxconfig_8c.html#a8664a3991accdb9f89987e5a4369dfcc">xdmxconfig.c</a>
+</li>
+<li>eddialog2
+: <a class="el" href="xdmxconfig_8c.html#a35536bd91fe1b4aea8aaf8c216215162">xdmxconfig.c</a>
+</li>
+<li>edpopup
+: <a class="el" href="xdmxconfig_8c.html#af23c4351113634ffc58b365cb6d9b8b7">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_i">- i -</a></h3><ul>
+<li>indent
+: <a class="el" href="dmxprint_8c.html#a913a30aaae68bab9c263fd5208679335">dmxprint.c</a>
+</li>
+<li>initialStack
+: <a class="el" href="dmxprint_8c.html#a32dfc14ba99dbdf0241b5e2e42553fec">dmxprint.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_l">- l -</a></h3><ul>
+<li>linux_to_x
+: <a class="el" href="lnx-keyboard_8c.html#a8448907727701c5b1fd1001458ccd62c">lnx-keyboard.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_m">- m -</a></h3><ul>
+<li>map
+: <a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">usb-keyboard.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_n">- n -</a></h3><ul>
+<li>namebox
+: <a class="el" href="xdmxconfig_8c.html#aeb035d7eb4ec0fd86074b4729a1bcb1e">xdmxconfig.c</a>
+</li>
+<li>ndbutton0
+: <a class="el" href="xdmxconfig_8c.html#a210a7f8748e7ac28c44be94bb607840d">xdmxconfig.c</a>
+</li>
+<li>ndbutton1
+: <a class="el" href="xdmxconfig_8c.html#a191091047c7a786b2994aa7cabbf9d19">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_o">- o -</a></h3><ul>
+<li>okbutton
+: <a class="el" href="xdmxconfig_8c.html#abee71366e59a470de4cb1f16ce83f611">xdmxconfig.c</a>
+</li>
+<li>opendialog
+: <a class="el" href="xdmxconfig_8c.html#a9f0309382a6f4897d04f0f249108295a">xdmxconfig.c</a>
+</li>
+<li>openpopup
+: <a class="el" href="xdmxconfig_8c.html#a2e98b18bed5c7a45a679dca531b228b0">xdmxconfig.c</a>
+</li>
+<li>origbox
+: <a class="el" href="xdmxconfig_8c.html#ac277ca719048235d195e2fe39e16e280">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_p">- p -</a></h3><ul>
+<li>pos
+: <a class="el" href="dmxprint_8c.html#a1910d262855b71da353ed0d07a6c7823">dmxprint.c</a>
+</li>
+<li>PRIV
+: <a class="el" href="lnx-keyboard_8c.html#a4feca68f31d2c2170bef7d62f747dd88">lnx-keyboard.c</a>
+</li>
+<li>ProcRenderVector
+: <a class="el" href="dmxpict_8c.html#a04fe5f379830ee6515c7af277f3a7908">dmxpict.c</a>
+</li>
+<li>ProximityIn
+: <a class="el" href="dmxclient_8h.html#ac1fa54a853b3edb8cbf6378dfaa962a6">dmxclient.h</a>
+</li>
+<li>ProximityOut
+: <a class="el" href="dmxclient_8h.html#a606f455d31c949b7f57a51a0e0b5f351">dmxclient.h</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_q">- q -</a></h3><ul>
+<li>quitpopup
+: <a class="el" href="xdmxconfig_8c.html#a8372ac105b5b86c27efda8f1c3578a21">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_r">- r -</a></h3><ul>
+<li>RenderErrBase
+: <a class="el" href="dmxpict_8c.html#a2a976139e942aa64e03b8f5357ba82ca">dmxpict.c</a>
+</li>
+<li>rtbox
+: <a class="el" href="xdmxconfig_8c.html#acb241369adbfdc70fec382d0d306e012">xdmxconfig.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_s">- s -</a></h3><ul>
+<li>str
+: <a class="el" href="dmxprint_8c.html#a41b4e3023940f8a5c705ea2863f2cd09">dmxprint.c</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_y">- y -</a></h3><ul>
+<li>yydebug
+: <a class="el" href="dmxparse_8h.html#ab138aa8e11f58bcdcc7134adf240ea8c">dmxparse.h</a>
+</li>
+<li>yyin
+: <a class="el" href="xdmxconfig_8c.html#a46af646807e0797e72b6e8945e7ea88b">xdmxconfig.c</a>
+, <a class="el" href="dmxtodmx_8c.html#a46af646807e0797e72b6e8945e7ea88b">dmxtodmx.c</a>
+, <a class="el" href="dmxconfig_8c.html#a46af646807e0797e72b6e8945e7ea88b">dmxconfig.c</a>
+</li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/index.html b/xorg-server/hw/dmx/doc/html/index.html
index 722db1aa5..8c3338217 100644
--- a/xorg-server/hw/dmx/doc/html/index.html
+++ b/xorg-server/hw/dmx/doc/html/index.html
@@ -1,8 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>Distributed Multihead X</title></head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<title>Distributed Multihead X</title>
+</head>
 <frameset cols="250,*">
-  <frame src="tree.html" name="treefrm">
-  <frame src="main.html" name="basefrm">
+  <frame src="tree.html" name="treefrm"/>
+  <frame src="main.html" name="basefrm"/>
+  <noframes>
+    <body>
+    <a href="main.html">Frames are disabled. Click here to go to the main page.</a>
+    </body>
+  </noframes>
 </frameset>
 </html>
diff --git a/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html b/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html
deleted file mode 100644
index 15bb74a1e..000000000
--- a/xorg-server/hw/dmx/doc/html/lib_2dmx_2dmx_8c.html
+++ /dev/null
@@ -1,894 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmx.c File Reference</h1><code>#include &lt;X11/Xlibint.h&gt;</code><br>
-<code>#include "Xext.h"</code><br>
-<code>#include "extutil.h"</code><br>
-<code>#include "<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxext_8h-source.html">dmxext.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmx_extension_info Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a10">DMXQueryExtension</a> (Display *dpy, int *event_basep, int *error_basep)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a11">DMXQueryVersion</a> (Display *dpy, int *majorVersion, int *minorVersion, int *patchVersion)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a12">DMXSync</a> (Display *dpy)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a13">DMXForceWindowCreation</a> (Display *dpy, Window window)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a14">DMXGetScreenCount</a> (Display *dpy, int *screen_count)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a15">DMXGetScreenAttributes</a> (Display *dpy, int physical_screen, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a20">DMXChangeScreensAttributes</a> (Display *dpy, int screen_count, int *screens, int mask_count, unsigned int *masks, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attrs, int *error_screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a21">DMXAddScreen</a> (Display *dpy, const  char *displayName, unsigned int mask, <a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *attr, int *screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a22">DMXRemoveScreen</a> (Display *dpy, int screen)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a23">DMXGetWindowAttributes</a> (Display *dpy, Window window, int *screen_count, int available_count, <a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a> *inf)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a24">DMXGetDesktopAttributes</a> (Display *dpy, <a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a27">DMXChangeDesktopAttributes</a> (Display *dpy, unsigned int mask, <a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *attr)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a28">DMXGetInputCount</a> (Display *dpy, int *input_count)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a29">DMXGetInputAttributes</a> (Display *dpy, int id, <a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *inf)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a> (Display *dpy, unsigned int mask, <a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *attr, int *id)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a31">DMXAddBackendInput</a> (Display *dpy, int screen, int sendsCore, int *newId)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a32">DMXAddConsoleInput</a> (Display *dpy, const  char *name, int sendsCore, int *newId)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lib_2dmx_2dmx_8c.html#a33">DMXRemoveInput</a> (Display *dpy, int id)</td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements the client-side part of the DMX protocol. It can be included in client applications by linking with the libdmx.a library.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a31" doxytag="lib/dmx/dmx.c::DMXAddBackendInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddBackendInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sendsCore</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>newId</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add backend input (a helper function that calls <a class="el" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="lib/dmx/dmx.c::DMXAddConsoleInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddConsoleInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sendsCore</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>newId</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add console input (a helper function that calls <a class="el" href="lib_2dmx_2dmx_8c.html#a30">DMXAddInput</a>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a30" doxytag="lib/dmx/dmx.c::DMXAddInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add input.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="lib/dmx/dmx.c::DMXAddScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXAddScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>displayName</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Add a screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="lib/dmx/dmx.c::DMXChangeDesktopAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int DMXChangeDesktopAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change the global bounding box and origin offset.<p>
-Available in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="lib/dmx/dmx.c::DMXChangeScreensAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int DMXChangeScreensAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screens</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>unsigned int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>masks</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attrs</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>error_screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Change geometries and positions of the DMX screen and root windows on the back-end X server.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="lib/dmx/dmx.c::DMXForceWindowCreation" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXForceWindowCreation </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>Window&nbsp;</td>
-          <td class="mdname" nowrap> <em>window</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-The creation of the specified <em>window</em> will be forced.<p>
-Available in DMX Protocol Version 1.2 Reply added in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="lib/dmx/dmx.c::DMXGetDesktopAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetDesktopAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXDesktopAttributes.html">DMXDesktopAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetDesktopAttributes protocol request returns information correctly, the information will be placed in <em>attr</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a29" doxytag="lib/dmx/dmx.c::DMXGetInputAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetInputAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXInputAttributes.html">DMXInputAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>inf</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetInputAttributes protocol request returns information about the input device with the specified <em>id</em>, information about the input device will be placed in <em>inf</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.1     </td>
-  </tr>
-</table>
-<a class="anchor" name="a28" doxytag="lib/dmx/dmx.c::DMXGetInputCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetInputCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>input_count</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetInputCount protocol request returns the input count, the value will be placed in <em>input_count</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.1     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="lib/dmx/dmx.c::DMXGetScreenAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetScreenAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>physical_screen</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXScreenAttributes.html">DMXScreenAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetScreenAttributes protocol request returns information for the specified <em>physical_screen</em>, information about the screen will be placed in <em>attr</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0; Modified in Version 2.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="lib/dmx/dmx.c::DMXGetScreenCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetScreenCount </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetScreenCount protocol request returns the screen count, the value will be placed in <em>screen_count</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="lib/dmx/dmx.c::DMXGetWindowAttributes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXGetWindowAttributes </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>Window&nbsp;</td>
-          <td class="mdname" nowrap> <em>window</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>available_count</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="structDMXWindowAttributes.html">DMXWindowAttributes</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>inf</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXGetWindowAttributes protocol request returns information about the specified <em>window</em>, the number of screens for which information is available will be returned in <em>screen_count</em> and information about the first <em>available_count</em> of those screens will be placed in <em>inf</em>. Because this call transports a great deal of information over the wire, please call <a class="el" href="lib_2dmx_2dmx_8c.html#a14">DMXGetScreenCount</a> first, and make sure <em>inf</em> is that large.<p>
-Note that if the specified <em>window</em> has not yet been mapped when <a class="el" href="lib_2dmx_2dmx_8c.html#a23">DMXGetWindowAttributes</a> is called, then a subsequent XMapWindow call might be buffered in xlib while requests directly to the back-end X servers are processed. This race condition can be solved by calling <a class="el" href="lib_2dmx_2dmx_8c.html#a12">DMXSync</a> before talking directly to the back-end X servers.<p>
-Available in DMX Protocol Version 1.0, but not working correctly until DMX Protocol Version 1.4     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="lib/dmx/dmx.c::DMXQueryExtension" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmx_extension_info Bool DMXQueryExtension </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>event_basep</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>error_basep</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the server has the DMX extension, the event and error bases will be placed in <em>event_basep</em> and <em>error_basep</em>, and True will be returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a11" doxytag="lib/dmx/dmx.c::DMXQueryVersion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXQueryVersion </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>majorVersion</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>minorVersion</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>patchVersion</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If the DMXQueryVersion protocol request returns version information from the server, <em>majorVersion</em>, <em>minorVersion</em>, and <em>patchVersion</em> are filled in with the appropriate information and True is returned. Otherwise, False will be returned.<p>
-Available in DMX Protocol Version 1.0     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="lib/dmx/dmx.c::DMXRemoveInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXRemoveInput </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>id</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove an input.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="lib/dmx/dmx.c::DMXRemoveScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXRemoveScreen </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dpy</em>, </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>screen</em></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Remove a screen.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="lib/dmx/dmx.c::DMXSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool DMXSync </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Display *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>dpy</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Flush all pending dmxSync requests in DMX server.<p>
-Available in DMX Protocol Version 1.5     </td>
-  </tr>
-</table>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html
index e02182b73..05de129c4 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8c.html
@@ -6,497 +6,1244 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-keyboard.c File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-keyboard_8h-source.html">lnx-keyboard.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "Xos.h"</code><br>
-<code>#include &lt;sys/ioctl.h&gt;</code><br>
-<code>#include &lt;errno.h&gt;</code><br>
-<code>#include &lt;signal.h&gt;</code><br>
-<code>#include &lt;sys/vt.h&gt;</code><br>
-<code>#include &lt;sys/kd.h&gt;</code><br>
-<code>#include &lt;termios.h&gt;</code><br>
-<code>#include "atKeynames.h"</code><br>
-<code>#include "xf86Keymap.h"</code><br>
-<code>#include &lt;linux/keyboard.h&gt;</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>lnx-keyboard.c File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-keyboard_8h_source.html">lnx-keyboard.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<code>#include &lt;sys/ioctl.h&gt;</code><br/>
+<code>#include &lt;errno.h&gt;</code><br/>
+<code>#include &lt;signal.h&gt;</code><br/>
+<code>#include &lt;sys/vt.h&gt;</code><br/>
+<code>#include &lt;sys/kd.h&gt;</code><br/>
+<code>#include &lt;termios.h&gt;</code><br/>
+<code>#include &quot;atKeynames.h&quot;</code><br/>
+<code>#include &lt;linux/keyboard.h&gt;</code><br/>
+<code>#include &lt;xkbsrv.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a3463151de078a8c7b6bfcae492b9e5f9">SWITCHRETPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#af8a3e30cb4858ca8a098acae107286c0">MESSAGE</a>&nbsp;&nbsp;&nbsp;&quot;\033c\n\n\nDMX taking input from this console...&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#ad71b1ebcfa90278a27073d2c0cb4dad4">FINALMESSAGE</a>&nbsp;&nbsp;&nbsp;&quot;\033cDMX terminated.&quot;</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aa472fa3dc86eaccfc92bb0caf47bdcd9">NUM_AT2LNX</a>&nbsp;&nbsp;&nbsp;(sizeof(<a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a>) / sizeof(<a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a>[0]))</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a4551482d17e969e4de70a669be3afc74">NUM_STATE_ENTRIES</a>&nbsp;&nbsp;&nbsp;(256/32)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#acdc80f4d45e1276e533490146d014bde">SYSCALL</a>(call)&nbsp;&nbsp;&nbsp;while(((call) == -1) &amp;&amp; (errno == EINTR))</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a508da29b3082d7901ebf5c7397bd1a88">kbdLinuxKeyDown</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int keyCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a0667fd33b8b30b74319818c9e1752950">kbdLinuxKeyState</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int type, int keyCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aaeba8e3220761201a64b5da3e2f85e52">kbdLinuxCreatePrivate</a> (DeviceIntPtr pKeyboard)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a5c9ddc88a9a5d989ce49a071eadcec87">kbdLinuxDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a0acb8c77b4bd032bda9aeb87a656b9e7">kbdLinuxBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a278d93f44fccf1e642fa58c05bb2d06a">kbdLinuxCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a198a0f886cb4a350bfe714c16e92c44d">kbdLinuxGetFreeVTNumber</a> (void)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#af405cce5d5bbc25171b425782f6e0b92">kbdLinuxOpenVT</a> (int vtno)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aefe715d8634268857806b5655cb70466">kbdLinuxGetCurrentVTNumber</a> (int fd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a49faeb3e9d06f702f1bd45ffc6f7c8b7">kbdLinuxActivate</a> (int fd, int vtno, int setSig)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a50fd258e64aa03fd197af2a1a8306b32">kbdLinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a8c0e2439e4991b78f99c79e90f5e474d">kbdLinuxVTPostSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a7e6977d8d414fb1b62710835ca763af4">kbdLinuxVTSwitch</a> (pointer p, int vt, void(*switch_return)(pointer), pointer switch_return_data)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a93a481bcaf8d735c29c8b8114cf68eba">kbdLinuxVTSignalHandler</a> (int sig)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a583121fb5591debead8398c1626f2385">kbdLinuxOpenConsole</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#ac4263fa687463ddbe1622bdb82a44b08">kbdLinuxCloseConsole</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a24c8cbb95ad1f21d590f57cdb22c25f4">kbdLinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a582fe5af774d898b85edb42116598890">kbdLinuxPrefix0Mapping</a> (unsigned char *scanCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a67b95ff06cbdb5de12cc01954aa7b67e">kbdLinuxPrefixMapping</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, unsigned char *scanCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a6338eb254610cdbf7942ad91f23c36fe">kbdLinuxConvert</a> (DevicePtr pDev, unsigned char scanCode, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#aa7781cedb743039542090faf43d9423f">kbdLinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a541096c9032b400b6f7f8cc76c36f716">kbdLinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a2f0498bfb85d9301b7bab802844b047d">kbdLinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#acc3cbed3f7e836f032b2e131baeb4800">kbdLinuxReadKernelMapping</a> (int fd, KeySymsPtr pKeySyms)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#ad3e8695c18469949e1ed00f7cd8055a5">kbdLinuxGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#ae65b4fd1c456532a438479b35228d4cf">kbdLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static <a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a4feca68f31d2c2170bef7d62f747dd88">PRIV</a> = NULL</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static KeySym&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a8448907727701c5b1fd1001458ccd62c">linux_to_x</a> [256]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a> [NUM_KEYCODES]</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for the Linux keyboard. The code is derived from code by Thomas Roell, Orest Zborowski, and David Dawes (see the source code for complete references). </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="lnx&#45;keyboard.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a24">kbdLinuxCreatePrivate</a> (DeviceIntPtr pKeyboard)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="lnx&#45;keyboard.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a25">kbdLinuxDestroyPrivate</a> (pointer priv)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="lnx&#45;keyboard.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a26">kbdLinuxBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="lnx&#45;keyboard.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a27">kbdLinuxCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00411">kbdLinuxGetFreeVTNumber()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a32">kbdLinuxVTPreSwitch</a> (pointer p)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="lnx&#45;keyboard.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a33">kbdLinuxVTPostSwitch</a> (pointer p)</td></tr>
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00411">kbdLinuxGetFreeVTNumber()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00563">kbdLinuxInit()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00752">kbdLinuxOn()</a>, <a class="el" href="lnx-ms_8c_source.html#l00214">msLinuxInit()</a>, <a class="el" href="lnx-ms_8c_source.html#l00240">msLinuxOn()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00208">ps2LinuxInit()</a>, and <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a34">kbdLinuxVTSwitch</a> (pointer p, int vt, void(*switch_return)(pointer), pointer switch_return_data)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="lnx&#45;keyboard.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a38">kbdLinuxInit</a> (DevicePtr pDev)</td></tr>
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00428">kbdLinuxOpenVT()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a42">kbdLinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="ad71b1ebcfa90278a27073d2c0cb4dad4"></a><!-- doxytag: member="lnx&#45;keyboard.c::FINALMESSAGE" ref="ad71b1ebcfa90278a27073d2c0cb4dad4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FINALMESSAGE&nbsp;&nbsp;&nbsp;&quot;\033cDMX terminated.&quot;</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a43">kbdLinuxOn</a> (DevicePtr pDev)</td></tr>
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a44">kbdLinuxOff</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="lnx&#45;keyboard.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00390">kbdLinuxBell()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00404">kbdLinuxCtrl()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00563">kbdLinuxInit()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00774">kbdLinuxOff()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00752">kbdLinuxOn()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00735">kbdLinuxRead()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00265">kbdUSBCtrl()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00388">kbdUSBOn()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00369">kbdUSBRead()</a>, <a class="el" href="usb-mouse_8c_source.html#l00085">mouUSBOn()</a>, <a class="el" href="lnx-ms_8c_source.html#l00144">msLinuxButton()</a>, <a class="el" href="lnx-ms_8c_source.html#l00214">msLinuxInit()</a>, <a class="el" href="lnx-ms_8c_source.html#l00265">msLinuxOff()</a>, <a class="el" href="lnx-ms_8c_source.html#l00240">msLinuxOn()</a>, <a class="el" href="lnx-ms_8c_source.html#l00183">msLinuxRead()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00087">othUSBOn()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00140">ps2LinuxButton()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00208">ps2LinuxInit()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00234">ps2LinuxOff()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00225">ps2LinuxOn()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00179">ps2LinuxRead()</a>, <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, <a class="el" href="usb-common_8c_source.html#l00360">usbOff()</a>, and <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8c.html#a47">kbdLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="lnx&#45;keyboard.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for the Linux keyboard. The code is derived from code by Thomas Roell, Orest Zborowski, and David Dawes (see the source code for complete references).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a26" doxytag="lnx-keyboard.c::kbdLinuxBell" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="lnx&#45;keyboard.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxBell </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="lnx&#45;keyboard.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>volume</em>, </td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pitch</em>, </td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="lnx&#45;keyboard.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duration</em></td>
+          <td class="paramtype">b, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00369">kbdUSBRead()</a>, and <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af8a3e30cb4858ca8a098acae107286c0"></a><!-- doxytag: member="lnx&#45;keyboard.c::MESSAGE" ref="af8a3e30cb4858ca8a098acae107286c0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MESSAGE&nbsp;&nbsp;&nbsp;&quot;\033c\n\n\nDMX taking input from this console...&quot;</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Ring the bell.<p>
-Note: we completely ignore the <em>volume</em>, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.<p>
-Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="lnx-keyboard.c::kbdLinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="lnx&#45;keyboard.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer kbdLinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pKeyboard</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="aa472fa3dc86eaccfc92bb0caf47bdcd9"></a><!-- doxytag: member="lnx&#45;keyboard.c::NUM_AT2LNX" ref="aa472fa3dc86eaccfc92bb0caf47bdcd9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define NUM_AT2LNX&nbsp;&nbsp;&nbsp;(sizeof(<a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a>) / sizeof(<a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a>[0]))</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a27" doxytag="lnx-keyboard.c::kbdLinuxCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4551482d17e969e4de70a669be3afc74"></a><!-- doxytag: member="lnx&#45;keyboard.c::NUM_STATE_ENTRIES" ref="a4551482d17e969e4de70a669be3afc74" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define NUM_STATE_ENTRIES&nbsp;&nbsp;&nbsp;(256/32)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00202">kbdLinuxKeyDown()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00211">kbdLinuxKeyState()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00245">kbdUSBKeyDown()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00254">kbdUSBKeyState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3463151de078a8c7b6bfcae492b9e5f9"></a><!-- doxytag: member="lnx&#45;keyboard.c::SWITCHRETPROC" ref="a3463151de078a8c7b6bfcae492b9e5f9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define SWITCHRETPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="acdc80f4d45e1276e533490146d014bde"></a><!-- doxytag: member="lnx&#45;keyboard.c::SYSCALL" ref="acdc80f4d45e1276e533490146d014bde" args="(call)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define SYSCALL</td>
+          <td>(</td>
+          <td class="paramtype">call&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;while(((call) == -1) &amp;&amp; (errno == EINTR))</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="lnx&#45;keyboard.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a49faeb3e9d06f702f1bd45ffc6f7c8b7"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxActivate" ref="a49faeb3e9d06f702f1bd45ffc6f7c8b7" args="(int fd, int vtno, int setSig)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static int kbdLinuxActivate </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vtno</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>setSig</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the LEDs.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="lnx-keyboard.c::kbdLinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00143">FATAL0</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00200">SYSCALL</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0acb8c77b4bd032bda9aeb87a656b9e7"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxBell" ref="a0acb8c77b4bd032bda9aeb87a656b9e7" args="(DevicePtr pDev, int percent, int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxBell </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pitch</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duration</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Ring the bell.</p>
+<p>Note: we completely ignore the <em>volume</em>, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.</p>
+<p>Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong"). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ac4263fa687463ddbe1622bdb82a44b08"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxCloseConsole" ref="ac4263fa687463ddbe1622bdb82a44b08" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdLinuxCloseConsole </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a47" doxytag="lnx-keyboard.c::kbdLinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00152">FINALMESSAGE</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00140">LOG1</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00774">kbdLinuxOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6338eb254610cdbf7942ad91f23c36fe"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxConvert" ref="a6338eb254610cdbf7942ad91f23c36fe" args="(DevicePtr pDev, unsigned char scanCode, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void kbdLinuxConvert </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">unsigned char&nbsp;</td>
+          <td class="paramname"> <em>scanCode</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a38" doxytag="lnx-keyboard.c::kbdLinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00202">kbdLinuxKeyDown()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00211">kbdLinuxKeyState()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00621">kbdLinuxPrefixMapping()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00110">MIN_KEYCODE</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00735">kbdLinuxRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaeba8e3220761201a64b5da3e2f85e52"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxCreatePrivate" ref="aaeba8e3220761201a64b5da3e2f85e52" args="(DeviceIntPtr pKeyboard)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer kbdLinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeyboard</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00185">_myPrivate::pKeyboard</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a278d93f44fccf1e642fa58c05bb2d06a"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxCtrl" ref="a278d93f44fccf1e642fa58c05bb2d06a" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the <em>pDev</em> as a Linux keyboard.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a44" doxytag="lnx-keyboard.c::kbdLinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Set the LEDs. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5c9ddc88a9a5d989ce49a071eadcec87"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxDestroyPrivate" ref="a5c9ddc88a9a5d989ce49a071eadcec87" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
+</div>
+</div>
+<a class="anchor" id="aefe715d8634268857806b5655cb70466"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxGetCurrentVTNumber" ref="aefe715d8634268857806b5655cb70466" args="(int fd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int kbdLinuxGetCurrentVTNumber </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a43" doxytag="lnx-keyboard.c::kbdLinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a198a0f886cb4a350bfe714c16e92c44d"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxGetFreeVTNumber" ref="a198a0f886cb4a350bfe714c16e92c44d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int kbdLinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static int kbdLinuxGetFreeVTNumber </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00143">FATAL0</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ae65b4fd1c456532a438479b35228d4cf"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxGetInfo" ref="ae65b4fd1c456532a438479b35228d4cf" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a42" doxytag="lnx-keyboard.c::kbdLinuxRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad3e8695c18469949e1ed00f7cd8055a5"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxGetMap" ref="ad3e8695c18469949e1ed00f7cd8055a5" args="(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void kbdLinuxGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeySymsPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeySyms</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">CARD8 *&nbsp;</td>
+          <td class="paramname"> <em>pModMap</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="usb-keyboard_8c_source.html#l00108">GLYPHS_PER_KEY</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00113">map</a>, <a class="el" href="usb-keyboard_8c_source.html#l00111">MAX_KEYCODE</a>, <a class="el" href="usb-keyboard_8c_source.html#l00110">MIN_KEYCODE</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00109">NUM_KEYCODES</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a24c8cbb95ad1f21d590f57cdb22c25f4"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxInit" ref="a24c8cbb95ad1f21d590f57cdb22c25f4" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize the <em>pDev</em> as a Linux keyboard. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a508da29b3082d7901ebf5c7397bd1a88"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxKeyDown" ref="a508da29b3082d7901ebf5c7397bd1a88" args="(myPrivate *priv, int keyCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static int kbdLinuxKeyDown </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>keyCode</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00184">_myPrivate::kbdState</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00173">NUM_STATE_ENTRIES</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0667fd33b8b30b74319818c9e1752950"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxKeyState" ref="a0667fd33b8b30b74319818c9e1752950" args="(myPrivate *priv, int type, int keyCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdLinuxKeyState </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>keyCode</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00184">_myPrivate::kbdState</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00173">NUM_STATE_ENTRIES</a>.</p>
 
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2f0498bfb85d9301b7bab802844b047d"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxOff" ref="a2f0498bfb85d9301b7bab802844b047d" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a33" doxytag="lnx-keyboard.c::kbdLinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a541096c9032b400b6f7f8cc76c36f716"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxOn" ref="a541096c9032b400b6f7f8cc76c36f716" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int kbdLinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a583121fb5591debead8398c1626f2385"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxOpenConsole" ref="a583121fb5591debead8398c1626f2385" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdLinuxOpenConsole </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a32" doxytag="lnx-keyboard.c::kbdLinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00445">kbdLinuxGetCurrentVTNumber()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00411">kbdLinuxGetFreeVTNumber()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00428">kbdLinuxOpenVT()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00141">LOG2</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00151">MESSAGE</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00563">kbdLinuxInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af405cce5d5bbc25171b425782f6e0b92"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxOpenVT" ref="af405cce5d5bbc25171b425782f6e0b92" args="(int vtno)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">static int kbdLinuxOpenVT </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vtno</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00145">FATAL2</a>, and <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a582fe5af774d898b85edb42116598890"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxPrefix0Mapping" ref="a582fe5af774d898b85edb42116598890" args="(unsigned char *scanCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int kbdLinuxPrefix0Mapping </td>
+          <td>(</td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>scanCode</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a34" doxytag="lnx-keyboard.c::kbdLinuxVTSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00621">kbdLinuxPrefixMapping()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a67b95ff06cbdb5de12cc01954aa7b67e"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxPrefixMapping" ref="a67b95ff06cbdb5de12cc01954aa7b67e" args="(myPrivate *priv, unsigned char *scanCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int kbdLinuxVTSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">static int kbdLinuxPrefixMapping </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>scanCode</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>vt</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00574">kbdLinuxPrefix0Mapping()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00186">_myPrivate::prefix</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa7781cedb743039542090faf43d9423f"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxRead" ref="aa7781cedb743039542090faf43d9423f" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>void(*&nbsp;</td>
-          <td class="mdname" nowrap> <em>switch_return</em>)(pointer), </td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>pointer&nbsp;</td>
-          <td class="mdname" nowrap> <em>switch_return_data</em></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function. </p>
 
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acc3cbed3f7e836f032b2e131baeb4800"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxReadKernelMapping" ref="acc3cbed3f7e836f032b2e131baeb4800" args="(int fd, KeySymsPtr pKeySyms)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdLinuxReadKernelMapping </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">KeySymsPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeySyms</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Tell the operating system to switch to <em>vt</em>. The <em>switch_return</em> function is called with the <em>switch_return_data</em> when the VT is switched back to the pre-switch VT (i.e., the user returns to the DMX session).     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00291">at2lnx</a>, <a class="el" href="usb-keyboard_8c_source.html#l00108">GLYPHS_PER_KEY</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00221">linux_to_x</a>, <a class="el" href="usb-keyboard_8c_source.html#l00113">map</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00172">NUM_AT2LNX</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8c0e2439e4991b78f99c79e90f5e474d"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxVTPostSwitch" ref="a8c0e2439e4991b78f99c79e90f5e474d" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
+
+</div>
+</div>
+<a class="anchor" id="a50fd258e64aa03fd197af2a1a8306b32"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxVTPreSwitch" ref="a50fd258e64aa03fd197af2a1a8306b32" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
+
+</div>
+</div>
+<a class="anchor" id="a93a481bcaf8d735c29c8b8114cf68eba"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxVTSignalHandler" ref="a93a481bcaf8d735c29c8b8114cf68eba" args="(int sig)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdLinuxVTSignalHandler </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>sig</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00141">LOG2</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00189">_myPrivate::switch_return</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00190">_myPrivate::switch_return_data</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00188">_myPrivate::switched</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7e6977d8d414fb1b62710835ca763af4"></a><!-- doxytag: member="lnx&#45;keyboard.c::kbdLinuxVTSwitch" ref="a7e6977d8d414fb1b62710835ca763af4" args="(pointer p, int vt, void(*switch_return)(pointer), pointer switch_return_data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int kbdLinuxVTSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vt</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void(*)(pointer)&nbsp;</td>
+          <td class="paramname"> <em>switch_return</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>switch_return_data</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Tell the operating system to switch to <em>vt</em>. The <em>switch_return</em> function is called with the <em>switch_return_data</em> when the VT is switched back to the pre-switch VT (i.e., the user returns to the DMX session). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00143">FATAL0</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00502">kbdLinuxActivate()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00189">_myPrivate::switch_return</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00190">_myPrivate::switch_return_data</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00188">_myPrivate::switched</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00179">_myPrivate::vtno</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a87773afe2af683304ea3a365f360b624"></a><!-- doxytag: member="lnx&#45;keyboard.c::at2lnx" ref="a87773afe2af683304ea3a365f360b624" args="[NUM_KEYCODES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned char <a class="el" href="lnx-keyboard_8c.html#a87773afe2af683304ea3a365f360b624">at2lnx</a>[NUM_KEYCODES]<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8448907727701c5b1fd1001458ccd62c"></a><!-- doxytag: member="lnx&#45;keyboard.c::linux_to_x" ref="a8448907727701c5b1fd1001458ccd62c" args="[256]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">KeySym <a class="el" href="lnx-keyboard_8c.html#a8448907727701c5b1fd1001458ccd62c">linux_to_x</a>[256]<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4feca68f31d2c2170bef7d62f747dd88"></a><!-- doxytag: member="lnx&#45;keyboard.c::PRIV" ref="a4feca68f31d2c2170bef7d62f747dd88" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__myPrivate.html">myPrivate</a>* <a class="el" href="lnx-keyboard_8c.html#a4feca68f31d2c2170bef7d62f747dd88">PRIV</a> = NULL<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html
deleted file mode 100644
index 20330c73a..000000000
--- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h-source.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-keyboard.h</h1><a href="lnx-keyboard_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _LNX_KEYBOARD_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_KEYBOARD_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> pointer <a class="code" href="lnx-keyboard_8c.html#a24">kbdLinuxCreatePrivate</a>(DeviceIntPtr pKeyboard);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a25">kbdLinuxDestroyPrivate</a>(pointer <span class="keyword">private</span>);
-00043 
-00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a38">kbdLinuxInit</a>(DevicePtr pDev);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a47">kbdLinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00046 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-keyboard_8c.html#a43">kbdLinuxOn</a>(DevicePtr pDev);
-00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a44">kbdLinuxOff</a>(DevicePtr pDev);
-00048 
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a32">kbdLinuxVTPreSwitch</a>(pointer p);
-00050 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a33">kbdLinuxVTPostSwitch</a>(pointer p);
-00051 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-keyboard_8c.html#a34">kbdLinuxVTSwitch</a>(pointer p, <span class="keywordtype">int</span> vt,
-00052                                 dmxVTSwitchReturnProcPtr switch_return,
-00053                                 pointer switch_return_data);
-00054 
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a42">kbdLinuxRead</a>(DevicePtr pDev,
-00056                             dmxMotionProcPtr motion,
-00057                             dmxEnqueueProcPtr enqueue,
-00058                             dmxCheckSpecialProcPtr checkspecial,
-00059                             DMXBlockType block);
-00060 
-00061 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a27">kbdLinuxCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
-00062 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a26">kbdLinuxBell</a>(DevicePtr pDev, <span class="keywordtype">int</span> percent,
-00063                             <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
-00064 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html
index 4811cad59..3698b18d7 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h.html
@@ -6,374 +6,380 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>lnx-keyboard.h File Reference</h1>
-<p>
-<a href="lnx-keyboard_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a0">kbdLinuxCreatePrivate</a> (DeviceIntPtr pKeyboard)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a1">kbdLinuxDestroyPrivate</a> (pointer private)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a2">kbdLinuxInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a3">kbdLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a4">kbdLinuxOn</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a5">kbdLinuxOff</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a6">kbdLinuxVTPreSwitch</a> (pointer p)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a7">kbdLinuxVTPostSwitch</a> (pointer p)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a10">kbdLinuxCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-keyboard_8h.html#a11">kbdLinuxBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
-
+<p><a href="lnx-keyboard_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#aaeba8e3220761201a64b5da3e2f85e52">kbdLinuxCreatePrivate</a> (DeviceIntPtr pKeyboard)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a71f565aa8f6824d52f817dc4a5e504f7">kbdLinuxDestroyPrivate</a> (pointer private)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a24c8cbb95ad1f21d590f57cdb22c25f4">kbdLinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#ae65b4fd1c456532a438479b35228d4cf">kbdLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a541096c9032b400b6f7f8cc76c36f716">kbdLinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a2f0498bfb85d9301b7bab802844b047d">kbdLinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a50fd258e64aa03fd197af2a1a8306b32">kbdLinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a8c0e2439e4991b78f99c79e90f5e474d">kbdLinuxVTPostSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a11eda88b5082b0adaad1bbc723dae485">kbdLinuxVTSwitch</a> (pointer p, int vt, <a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a> switch_return, pointer switch_return_data)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a5c9ea7d8bd36c991d67988615ac57328">kbdLinuxRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a278d93f44fccf1e642fa58c05bb2d06a">kbdLinuxCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-keyboard_8h.html#a0acb8c77b4bd032bda9aeb87a656b9e7">kbdLinuxBell</a> (DevicePtr pDev, int percent, int volume, int pitch, int duration)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to Linux keyboard driver. <dl compact><dt><b>See also:</b></dt><dd>lnx-keyboard.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11" doxytag="lnx-keyboard.h::kbdLinuxBell" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to Linux keyboard driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="lnx-keyboard_8c.html">lnx-keyboard.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a0acb8c77b4bd032bda9aeb87a656b9e7"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxBell" ref="a0acb8c77b4bd032bda9aeb87a656b9e7" args="(DevicePtr pDev, int percent, int volume, int pitch, int duration)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxBell </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdLinuxBell </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>percent</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>percent</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>volume</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>volume</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pitch</em>, </td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pitch</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duration</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duration</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Ring the bell.</p>
+<p>Note: we completely ignore the <em>volume</em>, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.</p>
+<p>Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong"). </p>
 
-<p>
-Ring the bell.<p>
-Note: we completely ignore the <em>volume</em>, since Linux's ioctl() interface does not provide a way to control it. If it did, the XBell manpage tells how the actual volume is a function of the percent and the (base) volume.<p>
-Note that most of the other PC-based bell drivers compute the duration for KDMKTONE as a function of the volume and the duration. For some drivers, the duration is only measured in mS if the volume is 50, and is scaled by the volume for other values. This seems confusing and possibly incorrect (the xset man page says that the bell will be "as closely as it can to the user's specifications" -- if we ignore the volume and set the duration correctly, then we'll get one parameter "wrong" -- but if we use the volume to scale the duration, then we'll get both parameters "wrong").     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="lnx-keyboard.h::kbdLinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaeba8e3220761201a64b5da3e2f85e52"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxCreatePrivate" ref="aaeba8e3220761201a64b5da3e2f85e52" args="(DeviceIntPtr pKeyboard)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer kbdLinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pKeyboard</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer kbdLinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeyboard</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
 
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a10" doxytag="lnx-keyboard.h::kbdLinuxCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00185">_myPrivate::pKeyboard</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a278d93f44fccf1e642fa58c05bb2d06a"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxCtrl" ref="a278d93f44fccf1e642fa58c05bb2d06a" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdLinuxCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set the LEDs. </p>
 
-<p>
-Set the LEDs.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="lnx-keyboard.h::kbdLinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a71f565aa8f6824d52f817dc4a5e504f7"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxDestroyPrivate" ref="a71f565aa8f6824d52f817dc4a5e504f7" args="(pointer private)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="lnx-keyboard.h::kbdLinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ae65b4fd1c456532a438479b35228d4cf"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxGetInfo" ref="ae65b4fd1c456532a438479b35228d4cf" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdLinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="lnx-keyboard.h::kbdLinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a24c8cbb95ad1f21d590f57cdb22c25f4"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxInit" ref="a24c8cbb95ad1f21d590f57cdb22c25f4" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize the <em>pDev</em> as a Linux keyboard. </p>
 
-<p>
-Initialize the <em>pDev</em> as a Linux keyboard.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="lnx-keyboard.h::kbdLinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00524">kbdLinuxOpenConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2f0498bfb85d9301b7bab802844b047d"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxOff" ref="a2f0498bfb85d9301b7bab802844b047d" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="lnx-keyboard.h::kbdLinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00540">kbdLinuxCloseConsole()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a541096c9032b400b6f7f8cc76c36f716"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxOn" ref="a541096c9032b400b6f7f8cc76c36f716" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int kbdLinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int kbdLinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="lnx-keyboard.h::kbdLinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5c9ea7d8bd36c991d67988615ac57328"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxRead" ref="a5c9ea7d8bd36c991d67988615ac57328" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a8c0e2439e4991b78f99c79e90f5e474d"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxVTPostSwitch" ref="a8c0e2439e4991b78f99c79e90f5e474d" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdLinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
 
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="lnx-keyboard.h::kbdLinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a50fd258e64aa03fd197af2a1a8306b32"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxVTPreSwitch" ref="a50fd258e64aa03fd197af2a1a8306b32" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdLinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdLinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
 
+</div>
+</div>
+<a class="anchor" id="a11eda88b5082b0adaad1bbc723dae485"></a><!-- doxytag: member="lnx&#45;keyboard.h::kbdLinuxVTSwitch" ref="a11eda88b5082b0adaad1bbc723dae485" args="(pointer p, int vt, dmxVTSwitchReturnProcPtr switch_return, pointer switch_return_data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int kbdLinuxVTSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vt</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>switch_return</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>switch_return_data</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html
new file mode 100644
index 000000000..d29a1a785
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/lnx-keyboard_8h_source.html
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>lnx-keyboard.h</h1><a href="lnx-keyboard_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _LNX_KEYBOARD_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_KEYBOARD_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> pointer <a class="code" href="lnx-keyboard_8c.html#aaeba8e3220761201a64b5da3e2f85e52">kbdLinuxCreatePrivate</a>(DeviceIntPtr pKeyboard);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a5c9ddc88a9a5d989ce49a071eadcec87">kbdLinuxDestroyPrivate</a>(pointer <span class="keyword">private</span>);
+<a name="l00042"></a>00042 
+<a name="l00043"></a>00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a24c8cbb95ad1f21d590f57cdb22c25f4">kbdLinuxInit</a>(DevicePtr pDev);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#ae65b4fd1c456532a438479b35228d4cf">kbdLinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-keyboard_8c.html#a541096c9032b400b6f7f8cc76c36f716">kbdLinuxOn</a>(DevicePtr pDev);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a2f0498bfb85d9301b7bab802844b047d">kbdLinuxOff</a>(DevicePtr pDev);
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a50fd258e64aa03fd197af2a1a8306b32">kbdLinuxVTPreSwitch</a>(pointer p);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a8c0e2439e4991b78f99c79e90f5e474d">kbdLinuxVTPostSwitch</a>(pointer p);
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-keyboard_8c.html#a7e6977d8d414fb1b62710835ca763af4">kbdLinuxVTSwitch</a>(pointer p, <span class="keywordtype">int</span> vt,
+<a name="l00051"></a>00051                                 <a class="code" href="dmxinputinit_8h.html#adb9019a46004e627338bfb4a02800636">dmxVTSwitchReturnProcPtr</a> switch_return,
+<a name="l00052"></a>00052                                 pointer switch_return_data);
+<a name="l00053"></a>00053 
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#aa7781cedb743039542090faf43d9423f">kbdLinuxRead</a>(DevicePtr pDev,
+<a name="l00055"></a>00055                             <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00056"></a>00056                             <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00057"></a>00057                             <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00058"></a>00058                             <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00059"></a>00059 
+<a name="l00060"></a>00060 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a278d93f44fccf1e642fa58c05bb2d06a">kbdLinuxCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
+<a name="l00061"></a>00061 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-keyboard_8c.html#a0acb8c77b4bd032bda9aeb87a656b9e7">kbdLinuxBell</a>(DevicePtr pDev, <span class="keywordtype">int</span> percent,
+<a name="l00062"></a>00062                             <span class="keywordtype">int</span> volume, <span class="keywordtype">int</span> pitch, <span class="keywordtype">int</span> duration);
+<a name="l00063"></a>00063 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html
index e77e562a4..25ba6260a 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8c.html
@@ -6,338 +6,706 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-ms.c File Reference</h1><code>#include "inputstr.h"</code><br>
-<code>#include "Xos.h"</code><br>
-<code>#include &lt;errno.h&gt;</code><br>
-<code>#include &lt;termios.h&gt;</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-ms_8h-source.html">lnx-ms.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>lnx-ms.c File Reference</h1><code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<code>#include &lt;errno.h&gt;</code><br/>
+<code>#include &lt;termios.h&gt;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-ms_8h_source.html">lnx-ms.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>(b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>(b)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a71addb6f47215d1e4bf1452fdeeb5081">msLinuxReadBytes</a> (int fd, unsigned char *buf, int len, int min)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a40d253404cd0db2e90bf9e3e6957d2a5">msLinuxButton</a> (DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#abad8a6240d6769094e70b92f5d8b72d4">msLinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a0afb23673c5b1bc695c09f3f3bd75a4b">msLinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#ad8f116275f80b5143bc6fe8806cf1298">msLinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a834a356a0e28d90699a8178154588e09">msLinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a04f66d21af929f125fa7d524883700d5">msLinuxGetMap</a> (DevicePtr pDev, unsigned char *<a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, int *nButtons)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a1ce83df54082f3196ac29e36dea47fc5">msLinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#af83993c8cc498cbd9f91737beefb5ea3">msLinuxVTPostSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a7d7777681993bc701468245e42c04282">msLinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#a570d96862061388c5649972b2fa22d75">msLinuxDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8c.html#ad650b3779315db603085a045405c9d9a">msLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Juliusz Chroboczek and Keith Packard (see the source code for complete references). </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="lnx&#45;ms.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a17">msLinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="lnx&#45;ms.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a18">msLinuxInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="lnx&#45;ms.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a19">msLinuxOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="lnx&#45;ms.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a20">msLinuxOff</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="lnx&#45;ms.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a22">msLinuxVTPreSwitch</a> (pointer p)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="lnx&#45;ms.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a23">msLinuxVTPostSwitch</a> (pointer p)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="lnx&#45;ms.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="lnx&#45;ms.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a24">msLinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="lnx&#45;ms.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a25">msLinuxDestroyPrivate</a> (pointer priv)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="lnx&#45;ms.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8c.html#a26">msLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="lnx&#45;ms.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Juliusz Chroboczek and Keith Packard (see the source code for complete references).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a24" doxytag="lnx-ms.c::msLinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> pointer msLinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pMouse</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="lnx&#45;ms.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a7581da9bfd7ebf4fe3703352df521931"></a><!-- doxytag: member="lnx&#45;ms.c::PRESS" ref="a7581da9bfd7ebf4fe3703352df521931" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define PRESS</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="lnx-ms.c::msLinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00144">msLinuxButton()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00140">ps2LinuxButton()</a>, and <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2b4d2480737f9eb52f80998518486f01"></a><!-- doxytag: member="lnx&#45;ms.c::RELEASE" ref="a2b4d2480737f9eb52f80998518486f01" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define RELEASE</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00144">msLinuxButton()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00140">ps2LinuxButton()</a>, and <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
 
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="lnx&#45;ms.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="lnx-ms.c::msLinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a40d253404cd0db2e90bf9e3e6957d2a5"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxButton" ref="a40d253404cd0db2e90bf9e3e6957d2a5" args="(DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void msLinuxButton </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>buttons</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-ms_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>, and <a class="el" href="lnx-ms_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00183">msLinuxRead()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a7d7777681993bc701468245e42c04282"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxCreatePrivate" ref="a7d7777681993bc701468245e42c04282" args="(DeviceIntPtr pMouse)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer msLinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pMouse</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="lnx-ms.c::msLinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-ms_8c_source.html#l00107">_myPrivate::pMouse</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a570d96862061388c5649972b2fa22d75"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxDestroyPrivate" ref="a570d96862061388c5649972b2fa22d75" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
+</div>
+</div>
+<a class="anchor" id="ad650b3779315db603085a045405c9d9a"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxGetInfo" ref="ad650b3779315db603085a045405c9d9a" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void msLinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="lnx-ms.c::msLinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="lnx-ms_8c_source.html#l00274">msLinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a04f66d21af929f125fa7d524883700d5"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxGetMap" ref="a04f66d21af929f125fa7d524883700d5" args="(DevicePtr pDev, unsigned char *map, int *nButtons)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void msLinuxGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>map</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>nButtons</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0afb23673c5b1bc695c09f3f3bd75a4b"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxInit" ref="a0afb23673c5b1bc695c09f3f3bd75a4b" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void msLinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="lnx-ms.c::msLinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00240">msLinuxOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a834a356a0e28d90699a8178154588e09"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxOff" ref="a834a356a0e28d90699a8178154588e09" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int msLinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ad8f116275f80b5143bc6fe8806cf1298"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxOn" ref="ad8f116275f80b5143bc6fe8806cf1298" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int msLinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="lnx-ms.c::msLinuxRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-ms_8c_source.html#l00214">msLinuxInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abad8a6240d6769094e70b92f5d8b72d4"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxRead" ref="abad8a6240d6769094e70b92f5d8b72d4" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void msLinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-ms_8c_source.html#l00144">msLinuxButton()</a>, and <a class="el" href="lnx-ms_8c_source.html#l00119">msLinuxReadBytes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a71addb6f47215d1e4bf1452fdeeb5081"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxReadBytes" ref="a71addb6f47215d1e4bf1452fdeeb5081" args="(int fd, unsigned char *buf, int len, int min)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int msLinuxReadBytes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>len</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>min</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="lnx-ms.c::msLinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00183">msLinuxRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af83993c8cc498cbd9f91737beefb5ea3"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxVTPostSwitch" ref="af83993c8cc498cbd9f91737beefb5ea3" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="lnx-ms.c::msLinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
+
+</div>
+</div>
+<a class="anchor" id="a1ce83df54082f3196ac29e36dea47fc5"></a><!-- doxytag: member="lnx&#45;ms.c::msLinuxVTPreSwitch" ref="a1ce83df54082f3196ac29e36dea47fc5" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html
deleted file mode 100644
index c900c32b2..000000000
--- a/xorg-server/hw/dmx/doc/html/lnx-ms_8h-source.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-ms.h</h1><a href="lnx-ms_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _LNX_MS_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_MS_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> pointer <a class="code" href="lnx-ms_8c.html#a24">msLinuxCreatePrivate</a>(DeviceIntPtr pMouse);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a25">msLinuxDestroyPrivate</a>(pointer priv);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a17">msLinuxRead</a>(DevicePtr pDev,
-00044                            dmxMotionProcPtr motion,
-00045                            dmxEnqueueProcPtr enqueue,
-00046                            dmxCheckSpecialProcPtr checkspecial,
-00047                            DMXBlockType block);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a18">msLinuxInit</a>(DevicePtr pDev);
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a26">msLinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00050 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-ms_8c.html#a19">msLinuxOn</a>(DevicePtr pDev);
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a20">msLinuxOff</a>(DevicePtr pDev);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    msLinuxCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a22">msLinuxVTPreSwitch</a>(pointer p);
-00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a23">msLinuxVTPostSwitch</a>(pointer p);
-00055 
-00056 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html
index 3bd06c193..0f926cbb5 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8h.html
@@ -6,274 +6,288 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>lnx-ms.h File Reference</h1>
-<p>
-<a href="lnx-ms_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a0">msLinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a1">msLinuxDestroyPrivate</a> (pointer priv)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a3">msLinuxInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a4">msLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a5">msLinuxOn</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a6">msLinuxOff</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a8">msLinuxVTPreSwitch</a> (pointer p)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ms_8h.html#a9">msLinuxVTPostSwitch</a> (pointer p)</td></tr>
-
+<p><a href="lnx-ms_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a7d7777681993bc701468245e42c04282">msLinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a570d96862061388c5649972b2fa22d75">msLinuxDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a9212626ca3092129b094b014e92e0630">msLinuxRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a0afb23673c5b1bc695c09f3f3bd75a4b">msLinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#ad650b3779315db603085a045405c9d9a">msLinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#ad8f116275f80b5143bc6fe8806cf1298">msLinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a834a356a0e28d90699a8178154588e09">msLinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a760648b944ddf26eafb81cf9b54dd976">msLinuxCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#a1ce83df54082f3196ac29e36dea47fc5">msLinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ms_8h.html#af83993c8cc498cbd9f91737beefb5ea3">msLinuxVTPostSwitch</a> (pointer p)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to Linux MS mouse driver. <dl compact><dt><b>See also:</b></dt><dd>lnx-ms.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="lnx-ms.h::msLinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to Linux MS mouse driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="lnx-ms_8c.html">lnx-ms.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a7d7777681993bc701468245e42c04282"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxCreatePrivate" ref="a7d7777681993bc701468245e42c04282" args="(DeviceIntPtr pMouse)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer msLinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pMouse</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer msLinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pMouse</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
 
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="lnx-ms.h::msLinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-ms_8c_source.html#l00107">_myPrivate::pMouse</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a760648b944ddf26eafb81cf9b54dd976"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxCtrl" ref="a760648b944ddf26eafb81cf9b54dd976" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void msLinuxCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a570d96862061388c5649972b2fa22d75"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxDestroyPrivate" ref="a570d96862061388c5649972b2fa22d75" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void msLinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="lnx-ms.h::msLinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ad650b3779315db603085a045405c9d9a"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxGetInfo" ref="ad650b3779315db603085a045405c9d9a" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void msLinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="lnx-ms.h::msLinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="lnx-ms_8c_source.html#l00274">msLinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0afb23673c5b1bc695c09f3f3bd75a4b"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxInit" ref="a0afb23673c5b1bc695c09f3f3bd75a4b" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em>. </p>
 
-<p>
-Initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="lnx-ms.h::msLinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00240">msLinuxOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a834a356a0e28d90699a8178154588e09"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxOff" ref="a834a356a0e28d90699a8178154588e09" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="lnx-ms.h::msLinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad8f116275f80b5143bc6fe8806cf1298"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxOn" ref="ad8f116275f80b5143bc6fe8806cf1298" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int msLinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int msLinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="lnx-ms.h::msLinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-ms_8c_source.html#l00214">msLinuxInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9212626ca3092129b094b014e92e0630"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxRead" ref="a9212626ca3092129b094b014e92e0630" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="lnx-ms.h::msLinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="af83993c8cc498cbd9f91737beefb5ea3"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxVTPostSwitch" ref="af83993c8cc498cbd9f91737beefb5ea3" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void msLinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void msLinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
 
+</div>
+</div>
+<a class="anchor" id="a1ce83df54082f3196ac29e36dea47fc5"></a><!-- doxytag: member="lnx&#45;ms.h::msLinuxVTPreSwitch" ref="a1ce83df54082f3196ac29e36dea47fc5" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void msLinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
 
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html
new file mode 100644
index 000000000..9fcb934a0
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/lnx-ms_8h_source.html
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>lnx-ms.h</h1><a href="lnx-ms_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _LNX_MS_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_MS_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> pointer <a class="code" href="lnx-ms_8c.html#a7d7777681993bc701468245e42c04282">msLinuxCreatePrivate</a>(DeviceIntPtr pMouse);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a570d96862061388c5649972b2fa22d75">msLinuxDestroyPrivate</a>(pointer priv);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#abad8a6240d6769094e70b92f5d8b72d4">msLinuxRead</a>(DevicePtr pDev,
+<a name="l00043"></a>00043                            <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00044"></a>00044                            <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00045"></a>00045                            <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00046"></a>00046                            <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a0afb23673c5b1bc695c09f3f3bd75a4b">msLinuxInit</a>(DevicePtr pDev);
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#ad650b3779315db603085a045405c9d9a">msLinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-ms_8c.html#ad8f116275f80b5143bc6fe8806cf1298">msLinuxOn</a>(DevicePtr pDev);
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a834a356a0e28d90699a8178154588e09">msLinuxOff</a>(DevicePtr pDev);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8h.html#a760648b944ddf26eafb81cf9b54dd976">msLinuxCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#a1ce83df54082f3196ac29e36dea47fc5">msLinuxVTPreSwitch</a>(pointer p);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ms_8c.html#af83993c8cc498cbd9f91737beefb5ea3">msLinuxVTPostSwitch</a>(pointer p);
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html
index f0e44c742..da61a904b 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8c.html
@@ -6,338 +6,702 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-ps2.c File Reference</h1><code>#include "inputstr.h"</code><br>
-<code>#include "Xos.h"</code><br>
-<code>#include &lt;errno.h&gt;</code><br>
-<code>#include &lt;termios.h&gt;</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="lnx-ps2_8h-source.html">lnx-ps2.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>lnx-ps2.c File Reference</h1><code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<code>#include &lt;errno.h&gt;</code><br/>
+<code>#include &lt;termios.h&gt;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="lnx-ps2_8h_source.html">lnx-ps2.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>(b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>(b)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#ad806e9804e49f47d75f252ab0b14c075">ps2LinuxReadBytes</a> (int fd, unsigned char *buf, int len, int min)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#af3ff29bf7e70049ca978bc8fbff4aab6">ps2LinuxButton</a> (DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a373ac6b94ea32ce3f7329404ba1ae382">ps2LinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#aa0f0b690de9e5c3a958909000c7f787d">ps2LinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#aaf9aaca79e044d91f072901ad3be1863">ps2LinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#af955e539213ec85f5b6d5d7b38dae89e">ps2LinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a0f65c382ff39d64cd881a919eb566964">ps2LinuxGetMap</a> (DevicePtr pDev, unsigned char *<a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, int *nButtons)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a3a9ac063b46a191b38d92881367d74d4">ps2LinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#a11a5bfc4866f86dfe3ea5acb788c4afe">ps2LinuxVTPostSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#ab6e438a481e24f8c6ef7d731b8ee4fb8">ps2LinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#af67bcdd060164de0c3a0d3e69c8483ac">ps2LinuxDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8c.html#ab914e24acbae5ce49174e06842ac684b">ps2LinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Keith Packard (see the source code for complete references). </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="lnx&#45;ps2.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a17">ps2LinuxRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="lnx&#45;ps2.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a18">ps2LinuxInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="lnx&#45;ps2.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a19">ps2LinuxOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="lnx&#45;ps2.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a20">ps2LinuxOff</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="lnx&#45;ps2.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a22">ps2LinuxVTPreSwitch</a> (pointer p)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="lnx&#45;ps2.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a23">ps2LinuxVTPostSwitch</a> (pointer p)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="lnx&#45;ps2.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="lnx&#45;ps2.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a24">ps2LinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="lnx&#45;ps2.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a25">ps2LinuxDestroyPrivate</a> (pointer priv)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="lnx&#45;ps2.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8c.html#a26">ps2LinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="lnx&#45;ps2.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for a serial MS mouse. The code is derived from code by Keith Packard (see the source code for complete references).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a24" doxytag="lnx-ps2.c::ps2LinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> pointer ps2LinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pMouse</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="lnx&#45;ps2.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a7581da9bfd7ebf4fe3703352df521931"></a><!-- doxytag: member="lnx&#45;ps2.c::PRESS" ref="a7581da9bfd7ebf4fe3703352df521931" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define PRESS</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a25" doxytag="lnx-ps2.c::ps2LinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a2b4d2480737f9eb52f80998518486f01"></a><!-- doxytag: member="lnx&#45;ps2.c::RELEASE" ref="a2b4d2480737f9eb52f80998518486f01" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define RELEASE</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="lnx-ps2.c::ps2LinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="lnx&#45;ps2.c::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="af3ff29bf7e70049ca978bc8fbff4aab6"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxButton" ref="af3ff29bf7e70049ca978bc8fbff4aab6" args="(DevicePtr pDev, ENQUEUEPROC enqueue, int buttons, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">static void ps2LinuxButton </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>buttons</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-ms_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>, and <a class="el" href="lnx-ms_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ps2_8c_source.html#l00179">ps2LinuxRead()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ab6e438a481e24f8c6ef7d731b8ee4fb8"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxCreatePrivate" ref="ab6e438a481e24f8c6ef7d731b8ee4fb8" args="(DeviceIntPtr pMouse)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer ps2LinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pMouse</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a18" doxytag="lnx-ps2.c::ps2LinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-ms_8c_source.html#l00107">_myPrivate::pMouse</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af67bcdd060164de0c3a0d3e69c8483ac"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxDestroyPrivate" ref="af67bcdd060164de0c3a0d3e69c8483ac" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
+</div>
+</div>
+<a class="anchor" id="ab914e24acbae5ce49174e06842ac684b"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxGetInfo" ref="ab914e24acbae5ce49174e06842ac684b" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ps2LinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a20" doxytag="lnx-ps2.c::ps2LinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="lnx-ps2_8c_source.html#l00242">ps2LinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0f65c382ff39d64cd881a919eb566964"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxGetMap" ref="a0f65c382ff39d64cd881a919eb566964" args="(DevicePtr pDev, unsigned char *map, int *nButtons)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void ps2LinuxGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>map</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>nButtons</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa0f0b690de9e5c3a958909000c7f787d"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxInit" ref="aa0f0b690de9e5c3a958909000c7f787d" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ps2LinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a19" doxytag="lnx-ps2.c::ps2LinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ps2_8c_source.html#l00225">ps2LinuxOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af955e539213ec85f5b6d5d7b38dae89e"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxOff" ref="af955e539213ec85f5b6d5d7b38dae89e" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ps2LinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aaf9aaca79e044d91f072901ad3be1863"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxOn" ref="aaf9aaca79e044d91f072901ad3be1863" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int ps2LinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a17" doxytag="lnx-ps2.c::ps2LinuxRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00208">ps2LinuxInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a373ac6b94ea32ce3f7329404ba1ae382"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxRead" ref="a373ac6b94ea32ce3f7329404ba1ae382" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void ps2LinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-ps2_8c_source.html#l00140">ps2LinuxButton()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00115">ps2LinuxReadBytes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad806e9804e49f47d75f252ab0b14c075"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxReadBytes" ref="ad806e9804e49f47d75f252ab0b14c075" args="(int fd, unsigned char *buf, int len, int min)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int ps2LinuxReadBytes </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>len</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>min</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="lnx-ps2.c::ps2LinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-ps2_8c_source.html#l00179">ps2LinuxRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11a5bfc4866f86dfe3ea5acb788c4afe"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxVTPostSwitch" ref="a11a5bfc4866f86dfe3ea5acb788c4afe" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a22" doxytag="lnx-ps2.c::ps2LinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
+
+</div>
+</div>
+<a class="anchor" id="a3a9ac063b46a191b38d92881367d74d4"></a><!-- doxytag: member="lnx&#45;ps2.c::ps2LinuxVTPreSwitch" ref="a3a9ac063b46a191b38d92881367d74d4" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html
deleted file mode 100644
index f4f76a04e..000000000
--- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h-source.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>lnx-ps2.h</h1><a href="lnx-ps2_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _LNX_PS2_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_PS2_H_</span>
-00040 <span class="preprocessor"></span>
-00041 <span class="keyword">extern</span> pointer <a class="code" href="lnx-ps2_8c.html#a24">ps2LinuxCreatePrivate</a>(DeviceIntPtr pMouse);
-00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a25">ps2LinuxDestroyPrivate</a>(pointer priv);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a17">ps2LinuxRead</a>(DevicePtr pDev,
-00044                             dmxMotionProcPtr motion,
-00045                             dmxEnqueueProcPtr enqueue,
-00046                             dmxCheckSpecialProcPtr checkspecial,
-00047                             DMXBlockType block);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a18">ps2LinuxInit</a>(DevicePtr pDev);
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a26">ps2LinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00050 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-ps2_8c.html#a19">ps2LinuxOn</a>(DevicePtr pDev);
-00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a20">ps2LinuxOff</a>(DevicePtr pDev);
-00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    ps2LinuxCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a22">ps2LinuxVTPreSwitch</a>(pointer p);
-00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a23">ps2LinuxVTPostSwitch</a>(pointer p);
-00055 
-00056 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html
index 2723f9c60..0b86b1c4d 100644
--- a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html
+++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h.html
@@ -6,274 +6,288 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>lnx-ps2.h File Reference</h1>
-<p>
-<a href="lnx-ps2_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a0">ps2LinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a1">ps2LinuxDestroyPrivate</a> (pointer priv)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a3">ps2LinuxInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a4">ps2LinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a5">ps2LinuxOn</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a6">ps2LinuxOff</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a8">ps2LinuxVTPreSwitch</a> (pointer p)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="lnx-ps2_8h.html#a9">ps2LinuxVTPostSwitch</a> (pointer p)</td></tr>
-
+<p><a href="lnx-ps2_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#ab6e438a481e24f8c6ef7d731b8ee4fb8">ps2LinuxCreatePrivate</a> (DeviceIntPtr pMouse)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#af67bcdd060164de0c3a0d3e69c8483ac">ps2LinuxDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#a0cde2ad6c3aad19be778fc97bb7286a7">ps2LinuxRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#aa0f0b690de9e5c3a958909000c7f787d">ps2LinuxInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#ab914e24acbae5ce49174e06842ac684b">ps2LinuxGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#aaf9aaca79e044d91f072901ad3be1863">ps2LinuxOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#af955e539213ec85f5b6d5d7b38dae89e">ps2LinuxOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#a2c7781cb76c926b5a9648e05bc3a1b59">ps2LinuxCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#a3a9ac063b46a191b38d92881367d74d4">ps2LinuxVTPreSwitch</a> (pointer p)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="lnx-ps2_8h.html#a11a5bfc4866f86dfe3ea5acb788c4afe">ps2LinuxVTPostSwitch</a> (pointer p)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to Linux PS/2 mouse driver. <dl compact><dt><b>See also:</b></dt><dd>lnx-ps2.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0" doxytag="lnx-ps2.h::ps2LinuxCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to Linux PS/2 mouse driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="lnx-ps2_8c.html">lnx-ps2.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="ab6e438a481e24f8c6ef7d731b8ee4fb8"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxCreatePrivate" ref="ab6e438a481e24f8c6ef7d731b8ee4fb8" args="(DeviceIntPtr pMouse)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer ps2LinuxCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pMouse</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer ps2LinuxCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pMouse</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
 
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="lnx-ps2.h::ps2LinuxDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="lnx-ms_8c_source.html#l00107">_myPrivate::pMouse</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2c7781cb76c926b5a9648e05bc3a1b59"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxCtrl" ref="a2c7781cb76c926b5a9648e05bc3a1b59" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ps2LinuxCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="af67bcdd060164de0c3a0d3e69c8483ac"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxDestroyPrivate" ref="af67bcdd060164de0c3a0d3e69c8483ac" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ps2LinuxDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="lnx-ps2.h::ps2LinuxGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="ab914e24acbae5ce49174e06842ac684b"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxGetInfo" ref="ab914e24acbae5ce49174e06842ac684b" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void ps2LinuxGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="lnx-ps2.h::ps2LinuxInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="lnx-ps2_8c_source.html#l00242">ps2LinuxGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa0f0b690de9e5c3a958909000c7f787d"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxInit" ref="aa0f0b690de9e5c3a958909000c7f787d" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em>. </p>
 
-<p>
-Initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="lnx-ps2.h::ps2LinuxOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>.</p>
+
+<p>Referenced by <a class="el" href="lnx-ps2_8c_source.html#l00225">ps2LinuxOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af955e539213ec85f5b6d5d7b38dae89e"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxOff" ref="af955e539213ec85f5b6d5d7b38dae89e" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a5" doxytag="lnx-ps2.h::ps2LinuxOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaf9aaca79e044d91f072901ad3be1863"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxOn" ref="aaf9aaca79e044d91f072901ad3be1863" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int ps2LinuxOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int ps2LinuxOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a9" doxytag="lnx-ps2.h::ps2LinuxVTPostSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00208">ps2LinuxInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0cde2ad6c3aad19be778fc97bb7286a7"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxRead" ref="a0cde2ad6c3aad19be778fc97bb7286a7" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxVTPostSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Currently unused hook called after returning from a VT switch.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a8" doxytag="lnx-ps2.h::ps2LinuxVTPreSwitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a11a5bfc4866f86dfe3ea5acb788c4afe"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxVTPostSwitch" ref="a11a5bfc4866f86dfe3ea5acb788c4afe" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void ps2LinuxVTPreSwitch </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void ps2LinuxVTPostSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called after returning from a VT switch. </p>
 
+</div>
+</div>
+<a class="anchor" id="a3a9ac063b46a191b38d92881367d74d4"></a><!-- doxytag: member="lnx&#45;ps2.h::ps2LinuxVTPreSwitch" ref="a3a9ac063b46a191b38d92881367d74d4" args="(pointer p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void ps2LinuxVTPreSwitch </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>p</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Currently unused hook called prior to an VT switch. </p>
 
-<p>
-Currently unused hook called prior to an VT switch.     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html
new file mode 100644
index 000000000..5cc89aadc
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/lnx-ps2_8h_source.html
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>lnx-ps2.h</h1><a href="lnx-ps2_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2001 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _LNX_PS2_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _LNX_PS2_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span>
+<a name="l00040"></a>00040 <span class="keyword">extern</span> pointer <a class="code" href="lnx-ps2_8c.html#ab6e438a481e24f8c6ef7d731b8ee4fb8">ps2LinuxCreatePrivate</a>(DeviceIntPtr pMouse);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#af67bcdd060164de0c3a0d3e69c8483ac">ps2LinuxDestroyPrivate</a>(pointer priv);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a373ac6b94ea32ce3f7329404ba1ae382">ps2LinuxRead</a>(DevicePtr pDev,
+<a name="l00043"></a>00043                             <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00044"></a>00044                             <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00045"></a>00045                             <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00046"></a>00046                             <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#aa0f0b690de9e5c3a958909000c7f787d">ps2LinuxInit</a>(DevicePtr pDev);
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#ab914e24acbae5ce49174e06842ac684b">ps2LinuxGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00049"></a>00049 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="lnx-ps2_8c.html#aaf9aaca79e044d91f072901ad3be1863">ps2LinuxOn</a>(DevicePtr pDev);
+<a name="l00050"></a>00050 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#af955e539213ec85f5b6d5d7b38dae89e">ps2LinuxOff</a>(DevicePtr pDev);
+<a name="l00051"></a>00051 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8h.html#a2c7781cb76c926b5a9648e05bc3a1b59">ps2LinuxCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
+<a name="l00052"></a>00052 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a3a9ac063b46a191b38d92881367d74d4">ps2LinuxVTPreSwitch</a>(pointer p);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="lnx-ps2_8c.html#a11a5bfc4866f86dfe3ea5acb788c4afe">ps2LinuxVTPostSwitch</a>(pointer p);
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/main.html b/xorg-server/hw/dmx/doc/html/main.html
index 86ee52bea..8dd9c3b2c 100644
--- a/xorg-server/hw/dmx/doc/html/main.html
+++ b/xorg-server/hw/dmx/doc/html/main.html
@@ -6,12 +6,24 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindexHL" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>Distributed Multihead X Documentation</h1>
-<p>
-<h3 align="center">dmx-1-2-20040604 and later </h3><ul>
-<li><a href="http://dmx.sourceforge.net">DMX Home Page</a></li><li><a href="http://sourceforge.net/projects/dmx">DMX Project Page (on Source Forge)</a></li><li><a href="http://dmx.sourceforge.net/dmx.html">Distributed Multihead X design</a>, the design document for DMX</li><li><a href="http://dmx.sourceforge.net/DMXSpec.txt">Client-to-Server DMX Extension to the X Protocol</a> </li></ul>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>Distributed Multihead X Documentation</h1><h3>dmx-1-2-20040604 and later </h3><ul>
+<li><a href="http://dmx.sourceforge.net">DMX Home Page</a></li>
+<li><a href="http://sourceforge.net/projects/dmx">DMX Project Page (on Source Forge)</a></li>
+<li><a href="http://dmx.sourceforge.net/dmx.html">Distributed Multihead X design</a>, the design document for DMX</li>
+<li><a href="http://dmx.sourceforge.net/DMXSpec.txt">Client-to-Server DMX Extension to the X Protocol</a> </li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html b/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html
deleted file mode 100644
index d9fefed76..000000000
--- a/xorg-server/hw/dmx/doc/html/programs_2Xserver_2Xext_2dmx_8c.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmx.c File Reference</h1><code>#include "X.h"</code><br>
-<code>#include "Xproto.h"</code><br>
-<code>#include "misc.h"</code><br>
-<code>#include "os.h"</code><br>
-<code>#include "dixstruct.h"</code><br>
-<code>#include "extnsionst.h"</code><br>
-<code>#include "opaque.h"</code><br>
-<code>#include "<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxext_8h-source.html">dmxext.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html#a3">DMXExtensionInit</a> (void)</td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This file implements the server-side part of the DMX protocol. A vector of fucntions is provided at extension initialization time, so most all of the useful functions in this file are declared static and do not appear in the doxygen documentation.<p>
-Much of the low-level work is done by functions in #dmxextension.c<p>
-Please see the Client-to-Server DMX Extension to the X Protocol document for details about the protocol.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="programs/Xserver/Xext/dmx.c::DMXExtensionInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> void DMXExtensionInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize the extension.     </td>
-  </tr>
-</table>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html b/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html
index 5e1929147..1c3094f47 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXConfigCmdStruct.html
@@ -6,16 +6,114 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXConfigCmdStruct Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXConfigCmdStruct Struct Reference</h1><!-- doxytag: class="DMXConfigCmdStruct" --><table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html#a79e992244c72cd0aa3e4ed3c9a82c380">filename</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html#ad80f9e2045d2548ba872b12b1e2c7b91">config</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html#ab530ed54ea672cadf1ed228219a601de">displays</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html#af39f2b3673fba1458fe5b95186489b3f">inputs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigCmdStruct.html#a1f0051365f3eae01159f34a9fa96dfeb">xinputs</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This stucture stores the parsed configuration information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This stucture stores the parsed configuration information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="ad80f9e2045d2548ba872b12b1e2c7b91"></a><!-- doxytag: member="DMXConfigCmdStruct::config" ref="ad80f9e2045d2548ba872b12b1e2c7b91" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structDMXConfigCmdStruct.html#ad80f9e2045d2548ba872b12b1e2c7b91">DMXConfigCmdStruct::config</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00163">dmxConfigMatch()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00144">dmxConfigStoreConfig()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab530ed54ea672cadf1ed228219a601de"></a><!-- doxytag: member="DMXConfigCmdStruct::displays" ref="ab530ed54ea672cadf1ed228219a601de" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a>* <a class="el" href="structDMXConfigCmdStruct.html#ab530ed54ea672cadf1ed228219a601de">DMXConfigCmdStruct::displays</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a79e992244c72cd0aa3e4ed3c9a82c380"></a><!-- doxytag: member="DMXConfigCmdStruct::filename" ref="a79e992244c72cd0aa3e4ed3c9a82c380" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structDMXConfigCmdStruct.html#a79e992244c72cd0aa3e4ed3c9a82c380">DMXConfigCmdStruct::filename</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00430">dmxConfigConfigure()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="dmxconfig_8c_source.html#l00457">dmxConfigSetMaxScreens()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00135">dmxConfigStoreFile()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af39f2b3673fba1458fe5b95186489b3f"></a><!-- doxytag: member="DMXConfigCmdStruct::inputs" ref="af39f2b3673fba1458fe5b95186489b3f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a>* <a class="el" href="structDMXConfigCmdStruct.html#af39f2b3673fba1458fe5b95186489b3f">DMXConfigCmdStruct::inputs</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1f0051365f3eae01159f34a9fa96dfeb"></a><!-- doxytag: member="DMXConfigCmdStruct::xinputs" ref="a1f0051365f3eae01159f34a9fa96dfeb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structDMXConfigListStruct.html">DMXConfigList</a>* <a class="el" href="structDMXConfigCmdStruct.html#a1f0051365f3eae01159f34a9fa96dfeb">DMXConfigCmdStruct::xinputs</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html b/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html
index ca55fcce3..8d5fc6703 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXConfigListStruct.html
@@ -6,16 +6,66 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXConfigListStruct Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXConfigListStruct Struct Reference</h1><!-- doxytag: class="DMXConfigListStruct" --><table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigListStruct.html#ac089d9827a37331a0993cec9e541ba7b">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXConfigListStruct.html#a8ee70f1d27ada33a44e89f2ec31f01a3">next</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores lists of configuration information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores lists of configuration information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="ac089d9827a37331a0993cec9e541ba7b"></a><!-- doxytag: member="DMXConfigListStruct::name" ref="ac089d9827a37331a0993cec9e541ba7b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structDMXConfigListStruct.html#ac089d9827a37331a0993cec9e541ba7b">DMXConfigListStruct::name</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8ee70f1d27ada33a44e89f2ec31f01a3"></a><!-- doxytag: member="DMXConfigListStruct::next" ref="a8ee70f1d27ada33a44e89f2ec31f01a3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="structDMXConfigListStruct.html">DMXConfigListStruct</a>* <a class="el" href="structDMXConfigListStruct.html#a8ee70f1d27ada33a44e89f2ec31f01a3">DMXConfigListStruct::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00406">dmxConfigConfigInputs()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxconfig_8c_source.html#l00084">dmxConfigStoreDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00102">dmxConfigStoreInput()</a>, and <a class="el" href="dmxconfig_8c_source.html#l00119">dmxConfigStoreXInput()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxconfig_8c.html">dmxconfig.c</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html
deleted file mode 100644
index ed10c039b..000000000
--- a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXDesktopAttributes Struct Reference</h1><code>#include &lt;<a class="el" href="dmxext_8h-source.html">dmxext.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Client-library desktop information structure, returned by <a class="el" href="lib_2dmx_2dmx_8c.html#a24">DMXGetDesktopAttributes</a>. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxext_8h-source.html">dmxext.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
index ea37ca26d..fc522c688 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXDesktopAttributesRec Struct Reference</h1><code>#include &lt;<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXDesktopAttributesRec Struct Reference</h1><!-- doxytag: class="DMXDesktopAttributesRec" -->
+<p><code>#include &lt;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXDesktopAttributesRec.html#af1d25c0a82bd838fa97b22333892321f">width</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXDesktopAttributesRec.html#a7385888bade151dfb3cf953f2b3952ad">height</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXDesktopAttributesRec.html#a6d3460904e38d14e4c857164901dd0ff">shiftX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXDesktopAttributesRec.html#a66acb1156ef40a2bc377943d50e0f52f">shiftY</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Desktop attributes. Used by #ProcDMXGetDesktopAttributes and #ProcDMXChangeDesktopAttributes. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxextension_8h-source.html">dmxextension.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Desktop attributes. Used by <a class="el" href="dmx_8c.html#aabe6419a28240a533ea3407a85025e9b">ProcDMXGetDesktopAttributes</a> and <a class="el" href="dmx_8c.html#a021e70d07efcd1a832476c5b225e6cd7">ProcDMXChangeDesktopAttributes</a>. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a7385888bade151dfb3cf953f2b3952ad"></a><!-- doxytag: member="DMXDesktopAttributesRec::height" ref="a7385888bade151dfb3cf953f2b3952ad" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXDesktopAttributesRec.html#a7385888bade151dfb3cf953f2b3952ad">DMXDesktopAttributesRec::height</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00160">dmxSetDesktopAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6d3460904e38d14e4c857164901dd0ff"></a><!-- doxytag: member="DMXDesktopAttributesRec::shiftX" ref="a6d3460904e38d14e4c857164901dd0ff" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXDesktopAttributesRec.html#a6d3460904e38d14e4c857164901dd0ff">DMXDesktopAttributesRec::shiftX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00160">dmxSetDesktopAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a66acb1156ef40a2bc377943d50e0f52f"></a><!-- doxytag: member="DMXDesktopAttributesRec::shiftY" ref="a66acb1156ef40a2bc377943d50e0f52f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXDesktopAttributesRec.html#a66acb1156ef40a2bc377943d50e0f52f">DMXDesktopAttributesRec::shiftY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00160">dmxSetDesktopAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af1d25c0a82bd838fa97b22333892321f"></a><!-- doxytag: member="DMXDesktopAttributesRec::width" ref="af1d25c0a82bd838fa97b22333892321f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXDesktopAttributesRec.html#af1d25c0a82bd838fa97b22333892321f">DMXDesktopAttributesRec::width</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00161">dmxGetDesktopAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00160">dmxSetDesktopAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00683">ProcDMXGetDesktopAttributes()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxextension_8h_source.html">dmxextension.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html
deleted file mode 100644
index 6573b9efc..000000000
--- a/xorg-server/hw/dmx/doc/html/structDMXInputAttributes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXInputAttributes Struct Reference</h1><code>#include &lt;<a class="el" href="dmxext_8h-source.html">dmxext.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Client-library input information structure, returned by <a class="el" href="lib_2dmx_2dmx_8c.html#a29">DMXGetInputAttributes</a>. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxext_8h-source.html">dmxext.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
index 9e5ee05cf..8bfe84b1d 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
@@ -6,18 +6,148 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXInputAttributesRec Struct Reference</h1><code>#include &lt;<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXInputAttributesRec Struct Reference</h1><!-- doxytag: class="DMXInputAttributesRec" -->
+<p><code>#include &lt;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#ace2798f784b97234c901ef3380f06b93">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#aba63d1a444ff736beababf9ca1f00ec3">inputType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#a3eb115af0ab845d41902894d6de3bb20">physicalScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#aecefabab0214492770a1eaaf7659cd1c">physicalId</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#adb896b223fa01c660fa71a4911993d63">isCore</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#a7628a7913aa4f69220807605442fa4ca">sendsCore</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXInputAttributesRec.html#a114bb5da1e75bd500655a17cbfb99f1f">detached</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Input attributes. Used by #ProcDMXGetInputAttributes. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxextension_8h-source.html">dmxextension.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Input attributes. Used by <a class="el" href="dmx_8c.html#accc76dc52a070ec95d7330357645d175">ProcDMXGetInputAttributes</a>. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a114bb5da1e75bd500655a17cbfb99f1f"></a><!-- doxytag: member="DMXInputAttributesRec::detached" ref="a114bb5da1e75bd500655a17cbfb99f1f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#a114bb5da1e75bd500655a17cbfb99f1f">DMXInputAttributesRec::detached</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aba63d1a444ff736beababf9ca1f00ec3"></a><!-- doxytag: member="DMXInputAttributesRec::inputType" ref="aba63d1a444ff736beababf9ca1f00ec3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#aba63d1a444ff736beababf9ca1f00ec3">DMXInputAttributesRec::inputType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00189">dmxSetInputAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adb896b223fa01c660fa71a4911993d63"></a><!-- doxytag: member="DMXInputAttributesRec::isCore" ref="adb896b223fa01c660fa71a4911993d63" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#adb896b223fa01c660fa71a4911993d63">DMXInputAttributesRec::isCore</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ace2798f784b97234c901ef3380f06b93"></a><!-- doxytag: member="DMXInputAttributesRec::name" ref="ace2798f784b97234c901ef3380f06b93" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structDMXInputAttributesRec.html#ace2798f784b97234c901ef3380f06b93">DMXInputAttributesRec::name</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00815">ProcDMXAddInput()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aecefabab0214492770a1eaaf7659cd1c"></a><!-- doxytag: member="DMXInputAttributesRec::physicalId" ref="aecefabab0214492770a1eaaf7659cd1c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#aecefabab0214492770a1eaaf7659cd1c">DMXInputAttributesRec::physicalId</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3eb115af0ab845d41902894d6de3bb20"></a><!-- doxytag: member="DMXInputAttributesRec::physicalScreen" ref="a3eb115af0ab845d41902894d6de3bb20" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#a3eb115af0ab845d41902894d6de3bb20">DMXInputAttributesRec::physicalScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00189">dmxSetInputAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7628a7913aa4f69220807605442fa4ca"></a><!-- doxytag: member="DMXInputAttributesRec::sendsCore" ref="a7628a7913aa4f69220807605442fa4ca" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXInputAttributesRec.html#a7628a7913aa4f69220807605442fa4ca">DMXInputAttributesRec::sendsCore</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00248">dmxAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00189">dmxSetInputAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00777">ProcDMXGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxextension_8h_source.html">dmxextension.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html
deleted file mode 100644
index 708d4c3cf..000000000
--- a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXScreenAttributes Struct Reference</h1><code>#include &lt;<a class="el" href="dmxext_8h-source.html">dmxext.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Client-library screen information structure, returned by <a class="el" href="lib_2dmx_2dmx_8c.html#a15">DMXGetScreenAttributes</a>. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxext_8h-source.html">dmxext.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
index 595b4aee6..ee2faa6ee 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
@@ -6,18 +6,228 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXScreenAttributesRec Struct Reference</h1><code>#include &lt;<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXScreenAttributesRec Struct Reference</h1><!-- doxytag: class="DMXScreenAttributesRec" -->
+<p><code>#include &lt;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a665be893e5ec84e6b7df834036e39975">displayName</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#aac840a53c344858b34667e01a952910e">logicalScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a3b31eedad2369d6c63fd62133cda8fe2">screenWindowWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#af3066508831f1b6698b39d6bdf172110">screenWindowHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a3ab6942e75daddab2bce4854979978cb">screenWindowXoffset</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a332d04af8d7c0bd09e51cc4df006569a">screenWindowYoffset</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a53f8bc0cdd9a69851ea5a2c14b6a14a1">rootWindowWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a8508290530961305566fd94990bd2c37">rootWindowHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a5db5a54083e2624b8f58af3b111c8648">rootWindowXoffset</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#a86291b3521d1fecb31ba3f88084b0ef5">rootWindowYoffset</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#ae9cab06391a7353165ee5e6ebe385eb8">rootWindowXorigin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXScreenAttributesRec.html#adba7900b874fd0da70981001b9667c83">rootWindowYorigin</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Screen attributes. Used by #ProcDMXGetScreenAttributes and #ProcDMXChangeScreenAttributes. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxextension_8h-source.html">dmxextension.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Screen attributes. Used by <a class="el" href="dmx_8c.html#a235f9df8583e23d75be024d4e9f77a87">ProcDMXGetScreenAttributes</a> and <em>ProcDMXChangeScreensAttributes</em>. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a665be893e5ec84e6b7df834036e39975"></a><!-- doxytag: member="DMXScreenAttributesRec::displayName" ref="a665be893e5ec84e6b7df834036e39975" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structDMXScreenAttributesRec.html#a665be893e5ec84e6b7df834036e39975">DMXScreenAttributesRec::displayName</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aac840a53c344858b34667e01a952910e"></a><!-- doxytag: member="DMXScreenAttributesRec::logicalScreen" ref="aac840a53c344858b34667e01a952910e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#aac840a53c344858b34667e01a952910e">DMXScreenAttributesRec::logicalScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8508290530961305566fd94990bd2c37"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowHeight" ref="a8508290530961305566fd94990bd2c37" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned int <a class="el" href="structDMXScreenAttributesRec.html#a8508290530961305566fd94990bd2c37">DMXScreenAttributesRec::rootWindowHeight</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a53f8bc0cdd9a69851ea5a2c14b6a14a1"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowWidth" ref="a53f8bc0cdd9a69851ea5a2c14b6a14a1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned int <a class="el" href="structDMXScreenAttributesRec.html#a53f8bc0cdd9a69851ea5a2c14b6a14a1">DMXScreenAttributesRec::rootWindowWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5db5a54083e2624b8f58af3b111c8648"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowXoffset" ref="a5db5a54083e2624b8f58af3b111c8648" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#a5db5a54083e2624b8f58af3b111c8648">DMXScreenAttributesRec::rootWindowXoffset</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae9cab06391a7353165ee5e6ebe385eb8"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowXorigin" ref="ae9cab06391a7353165ee5e6ebe385eb8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#ae9cab06391a7353165ee5e6ebe385eb8">DMXScreenAttributesRec::rootWindowXorigin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a86291b3521d1fecb31ba3f88084b0ef5"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowYoffset" ref="a86291b3521d1fecb31ba3f88084b0ef5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#a86291b3521d1fecb31ba3f88084b0ef5">DMXScreenAttributesRec::rootWindowYoffset</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adba7900b874fd0da70981001b9667c83"></a><!-- doxytag: member="DMXScreenAttributesRec::rootWindowYorigin" ref="adba7900b874fd0da70981001b9667c83" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#adba7900b874fd0da70981001b9667c83">DMXScreenAttributesRec::rootWindowYorigin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af3066508831f1b6698b39d6bdf172110"></a><!-- doxytag: member="DMXScreenAttributesRec::screenWindowHeight" ref="af3066508831f1b6698b39d6bdf172110" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned int <a class="el" href="structDMXScreenAttributesRec.html#af3066508831f1b6698b39d6bdf172110">DMXScreenAttributesRec::screenWindowHeight</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3b31eedad2369d6c63fd62133cda8fe2"></a><!-- doxytag: member="DMXScreenAttributesRec::screenWindowWidth" ref="a3b31eedad2369d6c63fd62133cda8fe2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned int <a class="el" href="structDMXScreenAttributesRec.html#a3b31eedad2369d6c63fd62133cda8fe2">DMXScreenAttributesRec::screenWindowWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3ab6942e75daddab2bce4854979978cb"></a><!-- doxytag: member="DMXScreenAttributesRec::screenWindowXoffset" ref="a3ab6942e75daddab2bce4854979978cb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#a3ab6942e75daddab2bce4854979978cb">DMXScreenAttributesRec::screenWindowXoffset</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a332d04af8d7c0bd09e51cc4df006569a"></a><!-- doxytag: member="DMXScreenAttributesRec::screenWindowYoffset" ref="a332d04af8d7c0bd09e51cc4df006569a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXScreenAttributesRec.html#a332d04af8d7c0bd09e51cc4df006569a">DMXScreenAttributesRec::screenWindowYoffset</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmx_8c_source.html#l00125">dmxSetScreenAttribute()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxextension_8h_source.html">dmxextension.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html
deleted file mode 100644
index 18c427819..000000000
--- a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXWindowAttributes Struct Reference</h1><code>#include &lt;<a class="el" href="dmxext_8h-source.html">dmxext.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Client-library window information structure, returned by <a class="el" href="lib_2dmx_2dmx_8c.html#a23">DMXGetWindowAttributes</a>. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxext_8h-source.html">dmxext.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
index a18b883e6..c35cfff52 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>DMXWindowAttributesRec Struct Reference</h1><code>#include &lt;<a class="el" href="dmxextension_8h-source.html">dmxextension.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>DMXWindowAttributesRec Struct Reference</h1><!-- doxytag: class="DMXWindowAttributesRec" -->
+<p><code>#include &lt;<a class="el" href="dmxextension_8h_source.html">dmxextension.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXWindowAttributesRec.html#a4a1dec7a3e658352f4764b4cbcfba15a">screen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXWindowAttributesRec.html#a782667f9b11d69c0d32149b03713fa46">window</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">xRectangle&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXWindowAttributesRec.html#a73d55840c5f9f2577d5a51712c30cedf">pos</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">xRectangle&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structDMXWindowAttributesRec.html#a0397906d1b5c5fee806755ce6f06049e">vis</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Window attributes. Used by #ProcDMXGetWidowAttributes. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxextension_8h-source.html">dmxextension.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Window attributes. Used by <a class="el" href="dmx_8c.html#a53d2083350694f2f57b8eda81fbe5388">ProcDMXGetWindowAttributes</a>. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a73d55840c5f9f2577d5a51712c30cedf"></a><!-- doxytag: member="DMXWindowAttributesRec::pos" ref="a73d55840c5f9f2577d5a51712c30cedf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">xRectangle <a class="el" href="structDMXWindowAttributesRec.html#a73d55840c5f9f2577d5a51712c30cedf">DMXWindowAttributesRec::pos</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4a1dec7a3e658352f4764b4cbcfba15a"></a><!-- doxytag: member="DMXWindowAttributesRec::screen" ref="a4a1dec7a3e658352f4764b4cbcfba15a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structDMXWindowAttributesRec.html#a4a1dec7a3e658352f4764b4cbcfba15a">DMXWindowAttributesRec::screen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0397906d1b5c5fee806755ce6f06049e"></a><!-- doxytag: member="DMXWindowAttributesRec::vis" ref="a0397906d1b5c5fee806755ce6f06049e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">xRectangle <a class="el" href="structDMXWindowAttributesRec.html#a0397906d1b5c5fee806755ce6f06049e">DMXWindowAttributesRec::vis</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a782667f9b11d69c0d32149b03713fa46"></a><!-- doxytag: member="DMXWindowAttributesRec::window" ref="a782667f9b11d69c0d32149b03713fa46" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Window <a class="el" href="structDMXWindowAttributesRec.html#a782667f9b11d69c0d32149b03713fa46">DMXWindowAttributesRec::window</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00571">dmxPopulate()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxextension_8h_source.html">dmxextension.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html
index be011e397..ed84f96bb 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigComment.html
@@ -6,18 +6,84 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigComment Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigComment Struct Reference</h1><!-- doxytag: class="_DMXConfigComment" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigComment.html#af226b22c22c9925ed1bcba04bfa264e5">token</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigComment.html#a5789db611ea38b03cf6cfe75ba9276b0">line</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigComment.html#a1387eef92c8408b20fbdeea78057bc22">comment</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed comments not stored with a token. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed comments not stored with a token. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a1387eef92c8408b20fbdeea78057bc22"></a><!-- doxytag: member="_DMXConfigComment::comment" ref="a1387eef92c8408b20fbdeea78057bc22" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigComment.html#a1387eef92c8408b20fbdeea78057bc22">_DMXConfigComment::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>, <a class="el" href="dmxparse_8c_source.html#l00202">dmxConfigFreeComment()</a>, and <a class="el" href="dmxprint_8c_source.html#l00141">dmxConfigPrintComment()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5789db611ea38b03cf6cfe75ba9276b0"></a><!-- doxytag: member="_DMXConfigComment::line" ref="a5789db611ea38b03cf6cfe75ba9276b0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigComment.html#a5789db611ea38b03cf6cfe75ba9276b0">_DMXConfigComment::line</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af226b22c22c9925ed1bcba04bfa264e5"></a><!-- doxytag: member="_DMXConfigComment::token" ref="af226b22c22c9925ed1bcba04bfa264e5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigComment.html#af226b22c22c9925ed1bcba04bfa264e5">_DMXConfigComment::token</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00191">dmxConfigCreateComment()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html
index 53310fb7a..ff068c2fd 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigDisplay.html
@@ -6,18 +6,356 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigDisplay Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigDisplay Struct Reference</h1><!-- doxytag: class="_DMXConfigDisplay" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#aa44b268403b84baaba5f943b00c0caa1">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#ad192d6062290e04c1f859eaf68c06122">scrnWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a713c10234a650fee7fb91f31a6eb76fb">scrnHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#abd861ea01ca7d68f78d195c3b0542b52">scrnX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a0c2fbfb2cac1ca86e8e94cccc96c6079">scrnY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a4f8d37c6f5e5f14882ea980fa1af87d6">scrnXSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#acff064fb3eb17d33c13ca5e19a13840c">scrnYSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#aa6e3eafb8797b5218c3febec39a319d8">rootWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a576c44a633c820745e0166b0328c9428">rootHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a1ae1cae8ca5882ca871ac9aa84e63b19">rootX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#afdc4e97d421a7d12002d627cc208e239">rootY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a3f8f845a6294f7b2b4d4963296368572">rootXSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#ac741ca152d7feff75a0f610c98f575a9">rootYSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a66ec2d91b2138ebc44eecbda0033649a">rootXOrigin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a30bc7bf9c591007b64556743ca932108">rootYOrigin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#ae23c3e610b522311db14ab8187045060">start</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a89443ebc48309723160157c81b3eb196">dname</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a45c72329b5db1316df0cef1e448a81e7">dim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a7a86b3fc8780285c64b1f71b46d20165">origin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigDisplay.html#a5b4603446018c78bf4d1fa692dd349a1">end</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed display information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed display information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a45c72329b5db1316df0cef1e448a81e7"></a><!-- doxytag: member="_DMXConfigDisplay::dim" ref="a45c72329b5db1316df0cef1e448a81e7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigFullDim.html">DMXConfigFullDimPtr</a> <a class="el" href="struct__DMXConfigDisplay.html#a45c72329b5db1316df0cef1e448a81e7">_DMXConfigDisplay::dim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a89443ebc48309723160157c81b3eb196"></a><!-- doxytag: member="_DMXConfigDisplay::dname" ref="a89443ebc48309723160157c81b3eb196" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> <a class="el" href="struct__DMXConfigDisplay.html#a89443ebc48309723160157c81b3eb196">_DMXConfigDisplay::dname</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5b4603446018c78bf4d1fa692dd349a1"></a><!-- doxytag: member="_DMXConfigDisplay::end" ref="a5b4603446018c78bf4d1fa692dd349a1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigDisplay.html#a5b4603446018c78bf4d1fa692dd349a1">_DMXConfigDisplay::end</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa44b268403b84baaba5f943b00c0caa1"></a><!-- doxytag: member="_DMXConfigDisplay::name" ref="aa44b268403b84baaba5f943b00c0caa1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigDisplay.html#aa44b268403b84baaba5f943b00c0caa1">_DMXConfigDisplay::name</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7a86b3fc8780285c64b1f71b46d20165"></a><!-- doxytag: member="_DMXConfigDisplay::origin" ref="a7a86b3fc8780285c64b1f71b46d20165" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigDisplay.html#a7a86b3fc8780285c64b1f71b46d20165">_DMXConfigDisplay::origin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a576c44a633c820745e0166b0328c9428"></a><!-- doxytag: member="_DMXConfigDisplay::rootHeight" ref="a576c44a633c820745e0166b0328c9428" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a576c44a633c820745e0166b0328c9428">_DMXConfigDisplay::rootHeight</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6e3eafb8797b5218c3febec39a319d8"></a><!-- doxytag: member="_DMXConfigDisplay::rootWidth" ref="aa6e3eafb8797b5218c3febec39a319d8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#aa6e3eafb8797b5218c3febec39a319d8">_DMXConfigDisplay::rootWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1ae1cae8ca5882ca871ac9aa84e63b19"></a><!-- doxytag: member="_DMXConfigDisplay::rootX" ref="a1ae1cae8ca5882ca871ac9aa84e63b19" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a1ae1cae8ca5882ca871ac9aa84e63b19">_DMXConfigDisplay::rootX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a66ec2d91b2138ebc44eecbda0033649a"></a><!-- doxytag: member="_DMXConfigDisplay::rootXOrigin" ref="a66ec2d91b2138ebc44eecbda0033649a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a66ec2d91b2138ebc44eecbda0033649a">_DMXConfigDisplay::rootXOrigin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00478">dmxConfigMove()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3f8f845a6294f7b2b4d4963296368572"></a><!-- doxytag: member="_DMXConfigDisplay::rootXSign" ref="a3f8f845a6294f7b2b4d4963296368572" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a3f8f845a6294f7b2b4d4963296368572">_DMXConfigDisplay::rootXSign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afdc4e97d421a7d12002d627cc208e239"></a><!-- doxytag: member="_DMXConfigDisplay::rootY" ref="afdc4e97d421a7d12002d627cc208e239" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#afdc4e97d421a7d12002d627cc208e239">_DMXConfigDisplay::rootY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a30bc7bf9c591007b64556743ca932108"></a><!-- doxytag: member="_DMXConfigDisplay::rootYOrigin" ref="a30bc7bf9c591007b64556743ca932108" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a30bc7bf9c591007b64556743ca932108">_DMXConfigDisplay::rootYOrigin</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00478">dmxConfigMove()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac741ca152d7feff75a0f610c98f575a9"></a><!-- doxytag: member="_DMXConfigDisplay::rootYSign" ref="ac741ca152d7feff75a0f610c98f575a9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#ac741ca152d7feff75a0f610c98f575a9">_DMXConfigDisplay::rootYSign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a713c10234a650fee7fb91f31a6eb76fb"></a><!-- doxytag: member="_DMXConfigDisplay::scrnHeight" ref="a713c10234a650fee7fb91f31a6eb76fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a713c10234a650fee7fb91f31a6eb76fb">_DMXConfigDisplay::scrnHeight</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad192d6062290e04c1f859eaf68c06122"></a><!-- doxytag: member="_DMXConfigDisplay::scrnWidth" ref="ad192d6062290e04c1f859eaf68c06122" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#ad192d6062290e04c1f859eaf68c06122">_DMXConfigDisplay::scrnWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abd861ea01ca7d68f78d195c3b0542b52"></a><!-- doxytag: member="_DMXConfigDisplay::scrnX" ref="abd861ea01ca7d68f78d195c3b0542b52" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#abd861ea01ca7d68f78d195c3b0542b52">_DMXConfigDisplay::scrnX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4f8d37c6f5e5f14882ea980fa1af87d6"></a><!-- doxytag: member="_DMXConfigDisplay::scrnXSign" ref="a4f8d37c6f5e5f14882ea980fa1af87d6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a4f8d37c6f5e5f14882ea980fa1af87d6">_DMXConfigDisplay::scrnXSign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0c2fbfb2cac1ca86e8e94cccc96c6079"></a><!-- doxytag: member="_DMXConfigDisplay::scrnY" ref="a0c2fbfb2cac1ca86e8e94cccc96c6079" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#a0c2fbfb2cac1ca86e8e94cccc96c6079">_DMXConfigDisplay::scrnY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acff064fb3eb17d33c13ca5e19a13840c"></a><!-- doxytag: member="_DMXConfigDisplay::scrnYSign" ref="acff064fb3eb17d33c13ca5e19a13840c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigDisplay.html#acff064fb3eb17d33c13ca5e19a13840c">_DMXConfigDisplay::scrnYSign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00692">dmxConfigEDCallback()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00803">dmxConfigEDOkCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae23c3e610b522311db14ab8187045060"></a><!-- doxytag: member="_DMXConfigDisplay::start" ref="ae23c3e610b522311db14ab8187045060" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigDisplay.html#ae23c3e610b522311db14ab8187045060">_DMXConfigDisplay::start</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00295">dmxConfigFreeDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html
index 644098698..fa6fe120e 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigEntry.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigEntry Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigEntry Struct Reference</h1><!-- doxytag: class="_DMXConfigEntry" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">type</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">comment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigEntry.html#a8e77b8273c49b31ba999a7a182a4cb2c">virtual</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigEntry.html#a69f77f180912f1ffce742d974da981d7">next</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Heads entry storage. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Heads entry storage. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a770a4c024260d1c784c3e3ae93c136ee"></a><!-- doxytag: member="_DMXConfigEntry::comment" ref="a770a4c024260d1c784c3e3ae93c136ee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> <a class="el" href="struct__DMXConfigEntry.html#a770a4c024260d1c784c3e3ae93c136ee">_DMXConfigEntry::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, and <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a69f77f180912f1ffce742d974da981d7"></a><!-- doxytag: member="_DMXConfigEntry::next" ref="a69f77f180912f1ffce742d974da981d7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="struct__DMXConfigEntry.html">_DMXConfigEntry</a>* <a class="el" href="struct__DMXConfigEntry.html#a69f77f180912f1ffce742d974da981d7">_DMXConfigEntry::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00583">dmxConfigAddEntry()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00632">dmxConfigDCCallback()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00391">dmxConfigReadFile()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00364">dmxConfigSetupCnamemenu()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1082665dbe0f9f61e115a63f416f2e32"></a><!-- doxytag: member="_DMXConfigEntry::type" ref="a1082665dbe0f9f61e115a63f416f2e32" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> <a class="el" href="struct__DMXConfigEntry.html#a1082665dbe0f9f61e115a63f416f2e32">_DMXConfigEntry::type</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00632">dmxConfigDCCallback()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00391">dmxConfigReadFile()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00364">dmxConfigSetupCnamemenu()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8e77b8273c49b31ba999a7a182a4cb2c"></a><!-- doxytag: member="_DMXConfigEntry::virtual" ref="a8e77b8273c49b31ba999a7a182a4cb2c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigVirtual.html">DMXConfigVirtualPtr</a> <a class="el" href="struct__DMXConfigEntry.html#a8e77b8273c49b31ba999a7a182a4cb2c">_DMXConfigEntry::virtual</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00553">dmxConfigCreateEntry()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00632">dmxConfigDCCallback()</a>, <a class="el" href="dmxparse_8c_source.html#l00567">dmxConfigFreeEntry()</a>, <a class="el" href="dmxconfig_8c_source.html#l00388">dmxConfigFromConfigFile()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="dmxconfig_8c_source.html#l00163">dmxConfigMatch()</a>, <a class="el" href="dmxprint_8c_source.html#l00423">dmxConfigPrint()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00391">dmxConfigReadFile()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00364">dmxConfigSetupCnamemenu()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html
index 2e564ce87..86b195a03 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigFullDim.html
@@ -6,18 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigFullDim Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigFullDim Struct Reference</h1><!-- doxytag: class="_DMXConfigFullDim" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigFullDim.html#a3fec14505c810d9566a4369187f4ce6b">scrn</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigFullDim.html#a8bc74265fe442d142a610378dabc8afa">root</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores a pair of geometry specifications. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores a pair of geometry specifications. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a8bc74265fe442d142a610378dabc8afa"></a><!-- doxytag: member="_DMXConfigFullDim::root" ref="a8bc74265fe442d142a610378dabc8afa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> <a class="el" href="struct__DMXConfigFullDim.html#a8bc74265fe442d142a610378dabc8afa">_DMXConfigFullDim::root</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3fec14505c810d9566a4369187f4ce6b"></a><!-- doxytag: member="_DMXConfigFullDim::scrn" ref="a3fec14505c810d9566a4369187f4ce6b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPartDim.html">DMXConfigPartDimPtr</a> <a class="el" href="struct__DMXConfigFullDim.html#a3fec14505c810d9566a4369187f4ce6b">_DMXConfigFullDim::scrn</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00226">dmxConfigCreateFullDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00235">dmxConfigFreeFullDim()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html
index f60e11c63..9698660b2 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigNumber.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigNumber Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigNumber Struct Reference</h1><!-- doxytag: class="_DMXConfigNumber" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigNumber.html#a289fd0e588b62964013d3fd435710e92">token</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigNumber.html#a66c727de8b2853e70cb5f58f2ab62762">line</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigNumber.html#aa42b9cbe7decdbe3af0249eaae1f0d56">comment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigNumber.html#a719e274551cdc47c62fd43f44717df27">number</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed numbers. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed numbers. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="aa42b9cbe7decdbe3af0249eaae1f0d56"></a><!-- doxytag: member="_DMXConfigNumber::comment" ref="aa42b9cbe7decdbe3af0249eaae1f0d56" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigNumber.html#aa42b9cbe7decdbe3af0249eaae1f0d56">_DMXConfigNumber::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>, and <a class="el" href="dmxparse_8c_source.html#l00160">dmxConfigFreeNumber()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a66c727de8b2853e70cb5f58f2ab62762"></a><!-- doxytag: member="_DMXConfigNumber::line" ref="a66c727de8b2853e70cb5f58f2ab62762" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigNumber.html#a66c727de8b2853e70cb5f58f2ab62762">_DMXConfigNumber::line</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a719e274551cdc47c62fd43f44717df27"></a><!-- doxytag: member="_DMXConfigNumber::number" ref="a719e274551cdc47c62fd43f44717df27" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigNumber.html#a719e274551cdc47c62fd43f44717df27">_DMXConfigNumber::number</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a289fd0e588b62964013d3fd435710e92"></a><!-- doxytag: member="_DMXConfigNumber::token" ref="a289fd0e588b62964013d3fd435710e92" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigNumber.html#a289fd0e588b62964013d3fd435710e92">_DMXConfigNumber::token</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00147">dmxConfigCreateNumber()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html
index 1ae073674..343bf018c 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigOption.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigOption Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigOption Struct Reference</h1><!-- doxytag: class="_DMXConfigOption" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigOption.html#aaed6fb5c802ae023ca5bff07fab01a55">string</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigOption.html#a0dd287594420b7027c63d2ce5b029449">start</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigOption.html#aaed667e170cec49dce35060feff00a09">option</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigOption.html#a09999687e48be6f09f3fd94125b169a0">end</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed option information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed option information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a09999687e48be6f09f3fd94125b169a0"></a><!-- doxytag: member="_DMXConfigOption::end" ref="a09999687e48be6f09f3fd94125b169a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigOption.html#a09999687e48be6f09f3fd94125b169a0">_DMXConfigOption::end</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, and <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaed667e170cec49dce35060feff00a09"></a><!-- doxytag: member="_DMXConfigOption::option" ref="aaed667e170cec49dce35060feff00a09" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> <a class="el" href="struct__DMXConfigOption.html#aaed667e170cec49dce35060feff00a09">_DMXConfigOption::option</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00300">dmxConfigCopyFromOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, and <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0dd287594420b7027c63d2ce5b029449"></a><!-- doxytag: member="_DMXConfigOption::start" ref="a0dd287594420b7027c63d2ce5b029449" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigOption.html#a0dd287594420b7027c63d2ce5b029449">_DMXConfigOption::start</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, and <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaed6fb5c802ae023ca5bff07fab01a55"></a><!-- doxytag: member="_DMXConfigOption::string" ref="aaed6fb5c802ae023ca5bff07fab01a55" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="struct__DMXConfigOption.html#aaed6fb5c802ae023ca5bff07fab01a55">_DMXConfigOption::string</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00300">dmxConfigCopyFromOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00370">dmxConfigFreeOption()</a>, and <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html
index bd0454be6..a50556e73 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPair.html
@@ -6,18 +6,148 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigPair Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigPair Struct Reference</h1><!-- doxytag: class="_DMXConfigPair" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a530882670c820cc229355ce750e5173a">token</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a6da615bada6472447bb009d108cdc5d4">line</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a0f38d4d9feafd30ee2e54d14c15ee72d">comment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a0e280ace6ccfae354457b60d38f21454">x</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a0dea17faf035dfdcbf0862760285fdee">y</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a4fd6b9063fe2f5790805ce64f8cbfd11">xsign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPair.html#a40ec327f714f589c6aa08fd6db4af93a">ysign</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed pairs (e.g., x y) 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed pairs (e.g., x y) </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a0f38d4d9feafd30ee2e54d14c15ee72d"></a><!-- doxytag: member="_DMXConfigPair::comment" ref="a0f38d4d9feafd30ee2e54d14c15ee72d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigPair.html#a0f38d4d9feafd30ee2e54d14c15ee72d">_DMXConfigPair::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00184">dmxConfigFreePair()</a>, and <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6da615bada6472447bb009d108cdc5d4"></a><!-- doxytag: member="_DMXConfigPair::line" ref="a6da615bada6472447bb009d108cdc5d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a6da615bada6472447bb009d108cdc5d4">_DMXConfigPair::line</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a530882670c820cc229355ce750e5173a"></a><!-- doxytag: member="_DMXConfigPair::token" ref="a530882670c820cc229355ce750e5173a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a530882670c820cc229355ce750e5173a">_DMXConfigPair::token</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, and <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0e280ace6ccfae354457b60d38f21454"></a><!-- doxytag: member="_DMXConfigPair::x" ref="a0e280ace6ccfae354457b60d38f21454" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a0e280ace6ccfae354457b60d38f21454">_DMXConfigPair::x</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4fd6b9063fe2f5790805ce64f8cbfd11"></a><!-- doxytag: member="_DMXConfigPair::xsign" ref="a4fd6b9063fe2f5790805ce64f8cbfd11" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a4fd6b9063fe2f5790805ce64f8cbfd11">_DMXConfigPair::xsign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0dea17faf035dfdcbf0862760285fdee"></a><!-- doxytag: member="_DMXConfigPair::y" ref="a0dea17faf035dfdcbf0862760285fdee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a0dea17faf035dfdcbf0862760285fdee">_DMXConfigPair::y</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a40ec327f714f589c6aa08fd6db4af93a"></a><!-- doxytag: member="_DMXConfigPair::ysign" ref="a40ec327f714f589c6aa08fd6db4af93a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigPair.html#a40ec327f714f589c6aa08fd6db4af93a">_DMXConfigPair::ysign</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00167">dmxConfigCreatePair()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, and <a class="el" href="dmxprint_8c_source.html#l00224">dmxConfigPrintPair()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html
index 90f017e20..9d855aae8 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigParam.html
@@ -6,18 +6,164 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigParam Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigParam Struct Reference</h1><!-- doxytag: class="_DMXConfigParam" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">argc</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">argv</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a51a0d65a06aabf172eff81c5f01018ca">start</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#ab5378c0fd40d3c8c6768c758067e0085">open</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#af635f42c0d12b9b73c71e0eaa666ec0f">param</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a6214d2e4937870d17a82da9e9f64c81d">close</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a115fb02cb41560fcd5b52914a8cb4baa">end</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigParam.html#a1e70ee5873aabc8c015330ae0ce3b92f">next</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed param information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed param information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a076a5bd8457ac6c95b9114f522209bb1"></a><!-- doxytag: member="_DMXConfigParam::argc" ref="a076a5bd8457ac6c95b9114f522209bb1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigParam.html#a076a5bd8457ac6c95b9114f522209bb1">_DMXConfigParam::argc</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, and <a class="el" href="dmxparse_8c_source.html#l00380">dmxConfigLookupParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a57a37acc8299265678a138da2902947b"></a><!-- doxytag: member="_DMXConfigParam::argv" ref="a57a37acc8299265678a138da2902947b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char** <a class="el" href="struct__DMXConfigParam.html#a57a37acc8299265678a138da2902947b">_DMXConfigParam::argv</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxparse_8c_source.html#l00380">dmxConfigLookupParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6214d2e4937870d17a82da9e9f64c81d"></a><!-- doxytag: member="_DMXConfigParam::close" ref="a6214d2e4937870d17a82da9e9f64c81d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigParam.html#a6214d2e4937870d17a82da9e9f64c81d">_DMXConfigParam::close</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a115fb02cb41560fcd5b52914a8cb4baa"></a><!-- doxytag: member="_DMXConfigParam::end" ref="a115fb02cb41560fcd5b52914a8cb4baa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigParam.html#a115fb02cb41560fcd5b52914a8cb4baa">_DMXConfigParam::end</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1e70ee5873aabc8c015330ae0ce3b92f"></a><!-- doxytag: member="_DMXConfigParam::next" ref="a1e70ee5873aabc8c015330ae0ce3b92f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="struct__DMXConfigParam.html">_DMXConfigParam</a>* <a class="el" href="struct__DMXConfigParam.html#a1e70ee5873aabc8c015330ae0ce3b92f">_DMXConfigParam::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00380">dmxConfigLookupParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab5378c0fd40d3c8c6768c758067e0085"></a><!-- doxytag: member="_DMXConfigParam::open" ref="ab5378c0fd40d3c8c6768c758067e0085" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigParam.html#ab5378c0fd40d3c8c6768c758067e0085">_DMXConfigParam::open</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af635f42c0d12b9b73c71e0eaa666ec0f"></a><!-- doxytag: member="_DMXConfigParam::param" ref="af635f42c0d12b9b73c71e0eaa666ec0f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> <a class="el" href="struct__DMXConfigParam.html#af635f42c0d12b9b73c71e0eaa666ec0f">_DMXConfigParam::param</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a51a0d65a06aabf172eff81c5f01018ca"></a><!-- doxytag: member="_DMXConfigParam::start" ref="a51a0d65a06aabf172eff81c5f01018ca" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigParam.html#a51a0d65a06aabf172eff81c5f01018ca">_DMXConfigParam::start</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00425">dmxConfigFreeParam()</a>, and <a class="el" href="dmxprint_8c_source.html#l00356">dmxConfigPrintParam()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html
index 07f4c7757..ca1d9a3ec 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigPartDim.html
@@ -6,18 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigPartDim Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigPartDim Struct Reference</h1><!-- doxytag: class="_DMXConfigPartDim" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPartDim.html#a82c99c55e14ce5ef7d5fe33b76a9810e">dim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigPartDim.html#aab23301813036d4ccb096565865e43ee">offset</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores a geometry specification. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores a geometry specification. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a82c99c55e14ce5ef7d5fe33b76a9810e"></a><!-- doxytag: member="_DMXConfigPartDim::dim" ref="a82c99c55e14ce5ef7d5fe33b76a9810e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigPartDim.html#a82c99c55e14ce5ef7d5fe33b76a9810e">_DMXConfigPartDim::dim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aab23301813036d4ccb096565865e43ee"></a><!-- doxytag: member="_DMXConfigPartDim::offset" ref="aab23301813036d4ccb096565865e43ee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigPartDim.html#aab23301813036d4ccb096565865e43ee">_DMXConfigPartDim::offset</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00209">dmxConfigCreatePartDim()</a>, <a class="el" href="dmxparse_8c_source.html#l00218">dmxConfigFreePartDim()</a>, and <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html
index a70f1a51a..93f1980f9 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigString.html
@@ -6,18 +6,116 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigString Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigString Struct Reference</h1><!-- doxytag: class="_DMXConfigString" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html#a8a9d70fddf92c8b21c1fc22c14bc11dc">token</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html#ae38fed90a55176e6c33013fa06da5c59">line</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html#a68a3812610093891aa3f6ac9c84a25e9">comment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html#abf71ceee99527eccff9a76622390e89d">string</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigString.html#af123e2436273aa9d19799bf8d6d5e2a6">next</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed strings. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed strings. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a68a3812610093891aa3f6ac9c84a25e9"></a><!-- doxytag: member="_DMXConfigString::comment" ref="a68a3812610093891aa3f6ac9c84a25e9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigString.html#a68a3812610093891aa3f6ac9c84a25e9">_DMXConfigString::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, and <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae38fed90a55176e6c33013fa06da5c59"></a><!-- doxytag: member="_DMXConfigString::line" ref="ae38fed90a55176e6c33013fa06da5c59" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigString.html#ae38fed90a55176e6c33013fa06da5c59">_DMXConfigString::line</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af123e2436273aa9d19799bf8d6d5e2a6"></a><!-- doxytag: member="_DMXConfigString::next" ref="af123e2436273aa9d19799bf8d6d5e2a6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="struct__DMXConfigString.html">_DMXConfigString</a>* <a class="el" href="struct__DMXConfigString.html#af123e2436273aa9d19799bf8d6d5e2a6">_DMXConfigString::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00300">dmxConfigCopyFromOption()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, and <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abf71ceee99527eccff9a76622390e89d"></a><!-- doxytag: member="_DMXConfigString::string" ref="abf71ceee99527eccff9a76622390e89d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigString.html#abf71ceee99527eccff9a76622390e89d">_DMXConfigString::string</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00300">dmxConfigCopyFromOption()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00243">dmxConfigCreateDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00338">dmxConfigCreateOption()</a>, <a class="el" href="dmxparse_8c_source.html#l00395">dmxConfigCreateParam()</a>, <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="dmxparse_8c_source.html#l00134">dmxConfigFreeString()</a>, <a class="el" href="dmxprint_8c_source.html#l00247">dmxConfigPrintDisplay()</a>, <a class="el" href="dmxprint_8c_source.html#l00343">dmxConfigPrintOption()</a>, <a class="el" href="dmxprint_8c_source.html#l00209">dmxConfigPrintString()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8a9d70fddf92c8b21c1fc22c14bc11dc"></a><!-- doxytag: member="_DMXConfigString::token" ref="a8a9d70fddf92c8b21c1fc22c14bc11dc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigString.html#a8a9d70fddf92c8b21c1fc22c14bc11dc">_DMXConfigString::token</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00121">dmxConfigCreateString()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html
index a27630540..b2b903eab 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigSub.html
@@ -6,18 +6,148 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigSub Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigSub Struct Reference</h1><!-- doxytag: class="_DMXConfigSub" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#a459065584f3b92566855167e989f72ab">type</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#a0c2d9c89e5fd8292b690181b3cd09c93">comment</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#ab881a6a0ca612057e889742dd5aaf20e">display</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#a247f530f0328126dc2467c9f4d40861f">wall</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#ab98f85159fb67ee2fd6a1523e513ef62">option</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#a5719f3b418be1c7e00f2886ae09175d3">param</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigSub.html#aeb9e7e1226bc01cdc1f256b49e826d43">next</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores options under an entry (subentry). 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores options under an entry (subentry). </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a0c2d9c89e5fd8292b690181b3cd09c93"></a><!-- doxytag: member="_DMXConfigSub::comment" ref="a0c2d9c89e5fd8292b690181b3cd09c93" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigComment.html">DMXConfigCommentPtr</a> <a class="el" href="struct__DMXConfigSub.html#a0c2d9c89e5fd8292b690181b3cd09c93">_DMXConfigSub::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab881a6a0ca612057e889742dd5aaf20e"></a><!-- doxytag: member="_DMXConfigSub::display" ref="ab881a6a0ca612057e889742dd5aaf20e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigDisplay.html">DMXConfigDisplayPtr</a> <a class="el" href="struct__DMXConfigSub.html#ab881a6a0ca612057e889742dd5aaf20e">_DMXConfigSub::display</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aeb9e7e1226bc01cdc1f256b49e826d43"></a><!-- doxytag: member="_DMXConfigSub::next" ref="aeb9e7e1226bc01cdc1f256b49e826d43" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="struct__DMXConfigSub.html">_DMXConfigSub</a>* <a class="el" href="struct__DMXConfigSub.html#aeb9e7e1226bc01cdc1f256b49e826d43">_DMXConfigSub::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00508">dmxConfigAddSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab98f85159fb67ee2fd6a1523e513ef62"></a><!-- doxytag: member="_DMXConfigSub::option" ref="ab98f85159fb67ee2fd6a1523e513ef62" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigOption.html">DMXConfigOptionPtr</a> <a class="el" href="struct__DMXConfigSub.html#ab98f85159fb67ee2fd6a1523e513ef62">_DMXConfigSub::option</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5719f3b418be1c7e00f2886ae09175d3"></a><!-- doxytag: member="_DMXConfigSub::param" ref="a5719f3b418be1c7e00f2886ae09175d3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigParam.html">DMXConfigParamPtr</a> <a class="el" href="struct__DMXConfigSub.html#a5719f3b418be1c7e00f2886ae09175d3">_DMXConfigSub::param</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a459065584f3b92566855167e989f72ab"></a><!-- doxytag: member="_DMXConfigSub::type" ref="a459065584f3b92566855167e989f72ab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxparse_8h.html#a8a6db2b610b57c53d4a4c0e7aeec5f88">DMXConfigType</a> <a class="el" href="struct__DMXConfigSub.html#a459065584f3b92566855167e989f72ab">_DMXConfigSub::type</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a247f530f0328126dc2467c9f4d40861f"></a><!-- doxytag: member="_DMXConfigSub::wall" ref="a247f530f0328126dc2467c9f4d40861f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigWall.html">DMXConfigWallPtr</a> <a class="el" href="struct__DMXConfigSub.html#a247f530f0328126dc2467c9f4d40861f">_DMXConfigSub::wall</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00442">dmxConfigCreateSub()</a>, <a class="el" href="dmxparse_8c_source.html#l00462">dmxConfigFreeSub()</a>, and <a class="el" href="dmxprint_8c_source.html#l00379">dmxConfigPrintSub()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html
index a7705deb9..c321bf658 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigToken.html
@@ -6,18 +6,84 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigToken Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigToken Struct Reference</h1><!-- doxytag: class="_DMXConfigToken" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigToken.html#a1b38f07f74ea8969f6690894b1a55bc9">token</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigToken.html#a620f9948af21b7d71d0e2593052efbdb">line</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigToken.html#a5d6e98d74416a8cc9cfe453618bc8f60">comment</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores tokens not stored in other structures (e.g., keywords and ;) 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores tokens not stored in other structures (e.g., keywords and ;) </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a5d6e98d74416a8cc9cfe453618bc8f60"></a><!-- doxytag: member="_DMXConfigToken::comment" ref="a5d6e98d74416a8cc9cfe453618bc8f60" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigToken.html#a5d6e98d74416a8cc9cfe453618bc8f60">_DMXConfigToken::comment</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00104">dmxConfigCreateToken()</a>, <a class="el" href="dmxparse_8c_source.html#l00114">dmxConfigFreeToken()</a>, and <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a620f9948af21b7d71d0e2593052efbdb"></a><!-- doxytag: member="_DMXConfigToken::line" ref="a620f9948af21b7d71d0e2593052efbdb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigToken.html#a620f9948af21b7d71d0e2593052efbdb">_DMXConfigToken::line</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00104">dmxConfigCreateToken()</a>, and <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1b38f07f74ea8969f6690894b1a55bc9"></a><!-- doxytag: member="_DMXConfigToken::token" ref="a1b38f07f74ea8969f6690894b1a55bc9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigToken.html#a1b38f07f74ea8969f6690894b1a55bc9">_DMXConfigToken::token</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00104">dmxConfigCreateToken()</a>, and <a class="el" href="dmxprint_8c_source.html#l00146">dmxConfigPrintTokenFlag()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html
index d221fa816..7f613920b 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigVirtual.html
@@ -6,18 +6,180 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigVirtual Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigVirtual Struct Reference</h1><!-- doxytag: class="_DMXConfigVirtual" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a8478674f4416debdfbdb7bff088c0b3b">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a9f35c8d1f58fdcbc85a2bdfb14a31d71">width</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a47c8c908e8f4090be638de0560dc36c3">height</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#ab70a6b20679f559200b44949fcc9c131">start</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#afe71a0e5dd4a384ec05e4cd6f1d53fb1">vname</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#abff549a2e1cb399ab859cb7626660539">dim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a5198b357593cc6aee669887be1b377cb">open</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a49c54be6010a37e78bd137a3c30707c6">subentry</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigVirtual.html#a18d1aff81158655dd4b7b16afe3078ce">close</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed virtual information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed virtual information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a18d1aff81158655dd4b7b16afe3078ce"></a><!-- doxytag: member="_DMXConfigVirtual::close" ref="a18d1aff81158655dd4b7b16afe3078ce" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#a18d1aff81158655dd4b7b16afe3078ce">_DMXConfigVirtual::close</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abff549a2e1cb399ab859cb7626660539"></a><!-- doxytag: member="_DMXConfigVirtual::dim" ref="abff549a2e1cb399ab859cb7626660539" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#abff549a2e1cb399ab859cb7626660539">_DMXConfigVirtual::dim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a47c8c908e8f4090be638de0560dc36c3"></a><!-- doxytag: member="_DMXConfigVirtual::height" ref="a47c8c908e8f4090be638de0560dc36c3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigVirtual.html#a47c8c908e8f4090be638de0560dc36c3">_DMXConfigVirtual::height</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00596">dmxConfigECCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00666">dmxConfigECOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8478674f4416debdfbdb7bff088c0b3b"></a><!-- doxytag: member="_DMXConfigVirtual::name" ref="a8478674f4416debdfbdb7bff088c0b3b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXConfigVirtual.html#a8478674f4416debdfbdb7bff088c0b3b">_DMXConfigVirtual::name</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00182">dmxConfigDataUpdate()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00596">dmxConfigECCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00666">dmxConfigECOkCallback()</a>, <a class="el" href="dmxconfig_8c_source.html#l00163">dmxConfigMatch()</a>, <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>, and <a class="el" href="xdmxconfig_8c_source.html#l00364">dmxConfigSetupCnamemenu()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5198b357593cc6aee669887be1b377cb"></a><!-- doxytag: member="_DMXConfigVirtual::open" ref="a5198b357593cc6aee669887be1b377cb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#a5198b357593cc6aee669887be1b377cb">_DMXConfigVirtual::open</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab70a6b20679f559200b44949fcc9c131"></a><!-- doxytag: member="_DMXConfigVirtual::start" ref="ab70a6b20679f559200b44949fcc9c131" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#ab70a6b20679f559200b44949fcc9c131">_DMXConfigVirtual::start</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a49c54be6010a37e78bd137a3c30707c6"></a><!-- doxytag: member="_DMXConfigVirtual::subentry" ref="a49c54be6010a37e78bd137a3c30707c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigSub.html">DMXConfigSubPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#a49c54be6010a37e78bd137a3c30707c6">_DMXConfigVirtual::subentry</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="xdmxconfig_8c_source.html#l00249">dmxConfigCanvasUpdate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00342">dmxConfigCopyData()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00332">dmxConfigCopystrings()</a>, <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00741">dmxConfigDDCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00437">dmxConfigFindDisplay()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00719">dmxConfigNDCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afe71a0e5dd4a384ec05e4cd6f1d53fb1"></a><!-- doxytag: member="_DMXConfigVirtual::vname" ref="afe71a0e5dd4a384ec05e4cd6f1d53fb1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> <a class="el" href="struct__DMXConfigVirtual.html#afe71a0e5dd4a384ec05e4cd6f1d53fb1">_DMXConfigVirtual::vname</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9f35c8d1f58fdcbc85a2bdfb14a31d71"></a><!-- doxytag: member="_DMXConfigVirtual::width" ref="a9f35c8d1f58fdcbc85a2bdfb14a31d71" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigVirtual.html#a9f35c8d1f58fdcbc85a2bdfb14a31d71">_DMXConfigVirtual::width</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00519">dmxConfigCreateVirtual()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00596">dmxConfigECCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00666">dmxConfigECOkCallback()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00139">dmxConfigGetDims()</a>, <a class="el" href="xdmxconfig_8c_source.html#l00612">dmxConfigNCCallback()</a>, and <a class="el" href="dmxprint_8c_source.html#l00398">dmxConfigPrintVirtual()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html b/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html
index fcb27db04..2716c5cbb 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXConfigWall.html
@@ -6,18 +6,180 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXConfigWall Struct Reference</h1><code>#include &lt;<a class="el" href="dmxparse_8h-source.html">dmxparse.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXConfigWall Struct Reference</h1><!-- doxytag: class="_DMXConfigWall" -->
+<p><code>#include &lt;<a class="el" href="dmxparse_8h_source.html">dmxparse.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a59d29322c1ad5e4f64fc9fe664dc8971">width</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#ac7426ee8a3094cd592448f5c974c34b4">height</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a614b6db00d9553c064ba1f86cedac6f0">xwall</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a48eefc8187f8f8df72a50010a8875ccd">ywall</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a937d924ff899f484342d19cce6361ffb">start</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a7f260abe78baa2c27ebbf7bc2a5cec42">wallDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a8e1cebc88545b248717bcd180b520550">displayDim</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#af9c21a05c99a613e29e0c5e715dd3253">nameList</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXConfigWall.html#a4901fad68a8f34db23e33f26a01ceef7">end</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores parsed wall information. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxparse_8h-source.html">dmxparse.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores parsed wall information. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a8e1cebc88545b248717bcd180b520550"></a><!-- doxytag: member="_DMXConfigWall::displayDim" ref="a8e1cebc88545b248717bcd180b520550" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigWall.html#a8e1cebc88545b248717bcd180b520550">_DMXConfigWall::displayDim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4901fad68a8f34db23e33f26a01ceef7"></a><!-- doxytag: member="_DMXConfigWall::end" ref="a4901fad68a8f34db23e33f26a01ceef7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigWall.html#a4901fad68a8f34db23e33f26a01ceef7">_DMXConfigWall::end</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac7426ee8a3094cd592448f5c974c34b4"></a><!-- doxytag: member="_DMXConfigWall::height" ref="ac7426ee8a3094cd592448f5c974c34b4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigWall.html#ac7426ee8a3094cd592448f5c974c34b4">_DMXConfigWall::height</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, and <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af9c21a05c99a613e29e0c5e715dd3253"></a><!-- doxytag: member="_DMXConfigWall::nameList" ref="af9c21a05c99a613e29e0c5e715dd3253" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigString.html">DMXConfigStringPtr</a> <a class="el" href="struct__DMXConfigWall.html#af9c21a05c99a613e29e0c5e715dd3253">_DMXConfigWall::nameList</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a937d924ff899f484342d19cce6361ffb"></a><!-- doxytag: member="_DMXConfigWall::start" ref="a937d924ff899f484342d19cce6361ffb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigToken.html">DMXConfigTokenPtr</a> <a class="el" href="struct__DMXConfigWall.html#a937d924ff899f484342d19cce6361ffb">_DMXConfigWall::start</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7f260abe78baa2c27ebbf7bc2a5cec42"></a><!-- doxytag: member="_DMXConfigWall::wallDim" ref="a7f260abe78baa2c27ebbf7bc2a5cec42" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXConfigPair.html">DMXConfigPairPtr</a> <a class="el" href="struct__DMXConfigWall.html#a7f260abe78baa2c27ebbf7bc2a5cec42">_DMXConfigWall::wallDim</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>, <a class="el" href="dmxparse_8c_source.html#l00327">dmxConfigFreeWall()</a>, and <a class="el" href="dmxprint_8c_source.html#l00334">dmxConfigPrintWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a59d29322c1ad5e4f64fc9fe664dc8971"></a><!-- doxytag: member="_DMXConfigWall::width" ref="a59d29322c1ad5e4f64fc9fe664dc8971" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigWall.html#a59d29322c1ad5e4f64fc9fe664dc8971">_DMXConfigWall::width</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, and <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a614b6db00d9553c064ba1f86cedac6f0"></a><!-- doxytag: member="_DMXConfigWall::xwall" ref="a614b6db00d9553c064ba1f86cedac6f0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigWall.html#a614b6db00d9553c064ba1f86cedac6f0">_DMXConfigWall::xwall</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, and <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a48eefc8187f8f8df72a50010a8875ccd"></a><!-- doxytag: member="_DMXConfigWall::ywall" ref="a48eefc8187f8f8df72a50010a8875ccd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXConfigWall.html#a48eefc8187f8f8df72a50010a8875ccd">_DMXConfigWall::ywall</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, and <a class="el" href="dmxparse_8c_source.html#l00305">dmxConfigCreateWall()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxparse_8h_source.html">dmxparse.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html b/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html
index 41ae5b368..ea95b9c0b 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXEventMap.html
@@ -6,68 +6,70 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXEventMap Struct Reference</h1><code>#include &lt;<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXEventMap.html#o0">remote</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXEventMap.html#o1">server</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXEventMap Struct Reference</h1><!-- doxytag: class="_DMXEventMap" -->
+<p><code>#include &lt;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXEventMap.html#aafea1b880cf1b362c7e600b4285c08c3">remote</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXEventMap.html#a6f3626351411d6a9555a16969761ec17">server</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores a mapping between the device id on the remote X server and the id on the DMX server 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0" doxytag="_DMXEventMap::remote" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores a mapping between the device id on the remote X server and the id on the DMX server </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="aafea1b880cf1b362c7e600b4285c08c3"></a><!-- doxytag: member="_DMXEventMap::remote" ref="aafea1b880cf1b362c7e600b4285c08c3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXEventMap.html#o0">_DMXEventMap::remote</a>
+          <td class="memname">int <a class="el" href="struct__DMXEventMap.html#aafea1b880cf1b362c7e600b4285c08c3">_DMXEventMap::remote</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Event number on remote X server </p>
 
-<p>
-Event number on remote X server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_DMXEventMap::server" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00091">dmxMapClear()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6f3626351411d6a9555a16969761ec17"></a><!-- doxytag: member="_DMXEventMap::server" ref="a6f3626351411d6a9555a16969761ec17" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXEventMap.html#o1">_DMXEventMap::server</a>
+          <td class="memname">int <a class="el" href="struct__DMXEventMap.html#a6f3626351411d6a9555a16969761ec17">_DMXEventMap::server</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Event number (unbiased) on DMX server </p>
 
-<p>
-Event number (unbiased) on DMX server     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a></ul>
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html
index a89e01f5b..3ee6c6b58 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXInputInfo.html
@@ -6,476 +6,391 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXInputInfo Struct Reference</h1><code>#include &lt;<a class="el" href="dmxinput_8h-source.html">dmxinput.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o0">name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o1">freename</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o2">detached</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o3">inputIdx</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o4">scrnIdx</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o5">core</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o6">console</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o7">windows</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="dmxinput_8h.html#a31">dmxSigioState</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o10">sigioState</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o11">sigioFdCount</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o12">sigioFd</a> [DMX_MAX_SIGIO_FDS]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o13">sigioAdded</a> [DMX_MAX_SIGIO_FDS]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o14">vt_switch_pending</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o15">vt_switched</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o16">numDevs</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o17">devs</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o18">keycodes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o19">symbols</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXInputInfo.html#o20">geometry</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-DMXInputInfo is typedef'd in #dmx.h so that all routines can have access to the global pointers. However, the elements are only available to input-related routines. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o6" doxytag="_DMXInputInfo::console" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXInputInfo Struct Reference</h1><!-- doxytag: class="_DMXInputInfo" -->
+<p><code>#include &lt;<a class="el" href="dmxinput_8h_source.html">dmxinput.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a2336d1b16bdcaa9bc17cc510357de463">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a22fa4a87ad87fef6957a9e2bd251a87d">freename</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a0341ff4f1c3424c95e28aac6f80163bb">detached</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#abf7ccee011844f0cd3af58672f7a6afc">inputIdx</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#aaa7ac94b94f2bab1aff58a44dc0dad68">scrnIdx</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a2d84397e241ad4eb146b038f611e2322">core</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#ad967ada8c438519bcd788edd8db2b24a">console</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a44bbc55fb7a2fef1a88144825755d3ed">windows</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a4e91aaec0f0cbcd0d7e2896ac918c667">processInputEvents</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#ad4a7bc0976bf853d45ea5043a66ade55">updateWindowInfo</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#ab7e0499d483754c4a1a9c567edb1c167">sigioState</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a0ba936a9c99af68fa838e45eb7af1c68">sigioFdCount</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a2d75d5540ff0a95d822bbb8dfbec197b">sigioFd</a> [DMX_MAX_SIGIO_FDS]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a94aafbe9fd94083dc4e1469bec29d9ea">sigioAdded</a> [DMX_MAX_SIGIO_FDS]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#ad834410a8c4c7225cd91c9bc96a0344e">vt_switch_pending</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a1592eb7fde735ef649c06b6b3f52b632">vt_switched</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a25d88463a7385bc47bed58bb4a662f6d">numDevs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a70e88af10d1862603d4dbc65ba936d16">devs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a04331378ac5aa4ce803982f3af18428c">keycodes</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#a1795d72d7dda09bd241382129a82202f">symbols</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXInputInfo.html#ac1ce3fe307cdee42f3f4caf86f58a26c">geometry</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>DMXInputInfo is typedef'd in <em><a class="el" href="dmx_8h.html">dmx.h</a></em> so that all routines can have access to the global pointers. However, the elements are only available to input-related routines. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="ad967ada8c438519bcd788edd8db2b24a"></a><!-- doxytag: member="_DMXInputInfo::console" ref="ad967ada8c438519bcd788edd8db2b24a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o6">_DMXInputInfo::console</a>
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#ad967ada8c438519bcd788edd8db2b24a">_DMXInputInfo::console</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if console and backend input share the same backend display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o5" doxytag="_DMXInputInfo::core" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if console and backend input share the same backend display </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d84397e241ad4eb146b038f611e2322"></a><!-- doxytag: member="_DMXInputInfo::core" ref="a2d84397e241ad4eb146b038f611e2322" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o5">_DMXInputInfo::core</a>
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#a2d84397e241ad4eb146b038f611e2322">_DMXInputInfo::core</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If True, initialize these devices as devices that send core events     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_DMXInputInfo::detached" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>If True, initialize these devices as devices that send core events </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0341ff4f1c3424c95e28aac6f80163bb"></a><!-- doxytag: member="_DMXInputInfo::detached" ref="a0341ff4f1c3424c95e28aac6f80163bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o2">_DMXInputInfo::detached</a>
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#a0341ff4f1c3424c95e28aac6f80163bb">_DMXInputInfo::detached</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If true, input screen is detached     </td>
-  </tr>
-</table>
-<a class="anchor" name="o17" doxytag="_DMXInputInfo::devs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>If true, input screen is detached </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00225">dmxAdjustCursorBoundaries()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a70e88af10d1862603d4dbc65ba936d16"></a><!-- doxytag: member="_DMXInputInfo::devs" ref="a70e88af10d1862603d4dbc65ba936d16" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>* <a class="el" href="struct__DMXInputInfo.html#o17">_DMXInputInfo::devs</a>
+          <td class="memname"><a class="el" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>* <a class="el" href="struct__DMXInputInfo.html#a70e88af10d1862603d4dbc65ba936d16">_DMXInputInfo::devs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of actual input devices. Each _DMXInputInfo structure can refer to more than one device. For example, the keyboard and the pointer of a backend display; or all of the XInput extension devices on a backend display.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_DMXInputInfo::freename" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of actual input devices. Each <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> structure can refer to more than one device. For example, the keyboard and the pointer of a backend display; or all of the XInput extension devices on a backend display. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00950">dmxInputLateReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00937">dmxInputReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a22fa4a87ad87fef6957a9e2bd251a87d"></a><!-- doxytag: member="_DMXInputInfo::freename" ref="a22fa4a87ad87fef6957a9e2bd251a87d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o1">_DMXInputInfo::freename</a>
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#a22fa4a87ad87fef6957a9e2bd251a87d">_DMXInputInfo::freename</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If true, free name on destroy     </td>
-  </tr>
-</table>
-<a class="anchor" name="o20" doxytag="_DMXInputInfo::geometry" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>If true, free name on destroy </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac1ce3fe307cdee42f3f4caf86f58a26c"></a><!-- doxytag: member="_DMXInputInfo::geometry" ref="ac1ce3fe307cdee42f3f4caf86f58a26c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> char* <a class="el" href="struct__DMXInputInfo.html#o20">_DMXInputInfo::geometry</a>
+          <td class="memname">char* <a class="el" href="struct__DMXInputInfo.html#ac1ce3fe307cdee42f3f4caf86f58a26c">_DMXInputInfo::geometry</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XKB geometry from command line     </td>
-  </tr>
-</table>
-<a class="anchor" name="o3" doxytag="_DMXInputInfo::inputIdx" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>XKB geometry from command line </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abf7ccee011844f0cd3af58672f7a6afc"></a><!-- doxytag: member="_DMXInputInfo::inputIdx" ref="abf7ccee011844f0cd3af58672f7a6afc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o3">_DMXInputInfo::inputIdx</a>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#abf7ccee011844f0cd3af58672f7a6afc">_DMXInputInfo::inputIdx</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Index into <a class="el" href="dmxinput_8h.html#a5">dmxInputs</a> global     </td>
-  </tr>
-</table>
-<a class="anchor" name="o18" doxytag="_DMXInputInfo::keycodes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Index into <a class="el" href="dmxinput_8h.html#a067017d9e67716c251357e9edf917e59">dmxInputs</a> global </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a04331378ac5aa4ce803982f3af18428c"></a><!-- doxytag: member="_DMXInputInfo::keycodes" ref="a04331378ac5aa4ce803982f3af18428c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> char* <a class="el" href="struct__DMXInputInfo.html#o18">_DMXInputInfo::keycodes</a>
+          <td class="memname">char* <a class="el" href="struct__DMXInputInfo.html#a04331378ac5aa4ce803982f3af18428c">_DMXInputInfo::keycodes</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XKB keycodes from command line     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0" doxytag="_DMXInputInfo::name" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>XKB keycodes from command line </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2336d1b16bdcaa9bc17cc510357de463"></a><!-- doxytag: member="_DMXInputInfo::name" ref="a2336d1b16bdcaa9bc17cc510357de463" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* <a class="el" href="struct__DMXInputInfo.html#o0">_DMXInputInfo::name</a>
+          <td class="memname">const char* <a class="el" href="struct__DMXInputInfo.html#a2336d1b16bdcaa9bc17cc510357de463">_DMXInputInfo::name</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Name of input display or device (from command line or config file)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o16" doxytag="_DMXInputInfo::numDevs" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Name of input display or device (from command line or config file) </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25d88463a7385bc47bed58bb4a662f6d"></a><!-- doxytag: member="_DMXInputInfo::numDevs" ref="a25d88463a7385bc47bed58bb4a662f6d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o16">_DMXInputInfo::numDevs</a>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#a25d88463a7385bc47bed58bb4a662f6d">_DMXInputInfo::numDevs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of devices handled in this _DMXInputInfo structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o4" doxytag="_DMXInputInfo::scrnIdx" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of devices handled in this <a class="el" href="struct__DMXInputInfo.html">_DMXInputInfo</a> structure. </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00950">dmxInputLateReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00937">dmxInputReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4e91aaec0f0cbcd0d7e2896ac918c667"></a><!-- doxytag: member="_DMXInputInfo::processInputEvents" ref="a4e91aaec0f0cbcd0d7e2896ac918c667" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o4">_DMXInputInfo::scrnIdx</a>
+          <td class="memname"><a class="el" href="dmxinput_8h.html#acb2c7d7b4029ad06b7bf51b71c37a638">ProcessInputEventsProc</a> <a class="el" href="struct__DMXInputInfo.html#a4e91aaec0f0cbcd0d7e2896ac918c667">_DMXInputInfo::processInputEvents</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Index into <a class="el" href="dmxinit_8c.html#a2">dmxScreens</a> global     </td>
-  </tr>
-</table>
-<a class="anchor" name="o13" doxytag="_DMXInputInfo::sigioAdded" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinput_8c_source.html#l00081">ProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaa7ac94b94f2bab1aff58a44dc0dad68"></a><!-- doxytag: member="_DMXInputInfo::scrnIdx" ref="aaa7ac94b94f2bab1aff58a44dc0dad68" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o13">_DMXInputInfo::sigioAdded</a>[DMX_MAX_SIGIO_FDS]
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#aaa7ac94b94f2bab1aff58a44dc0dad68">_DMXInputInfo::scrnIdx</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Active fds     </td>
-  </tr>
-</table>
-<a class="anchor" name="o12" doxytag="_DMXInputInfo::sigioFd" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Index into <a class="el" href="dmxinit_8c.html#a3e242a6818df05e547a4776919e3827f">dmxScreens</a> global </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00211">dmxConfigAddInput()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01264">dmxInputAttachConsole()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94aafbe9fd94083dc4e1469bec29d9ea"></a><!-- doxytag: member="_DMXInputInfo::sigioAdded" ref="a94aafbe9fd94083dc4e1469bec29d9ea" args="[DMX_MAX_SIGIO_FDS]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o12">_DMXInputInfo::sigioFd</a>[DMX_MAX_SIGIO_FDS]
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#a94aafbe9fd94083dc4e1469bec29d9ea">_DMXInputInfo::sigioAdded</a>[DMX_MAX_SIGIO_FDS]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of fds     </td>
-  </tr>
-</table>
-<a class="anchor" name="o11" doxytag="_DMXInputInfo::sigioFdCount" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Active fds </p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2d75d5540ff0a95d822bbb8dfbec197b"></a><!-- doxytag: member="_DMXInputInfo::sigioFd" ref="a2d75d5540ff0a95d822bbb8dfbec197b" args="[DMX_MAX_SIGIO_FDS]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o11">_DMXInputInfo::sigioFdCount</a>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#a2d75d5540ff0a95d822bbb8dfbec197b">_DMXInputInfo::sigioFd</a>[DMX_MAX_SIGIO_FDS]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of fds in use     </td>
-  </tr>
-</table>
-<a class="anchor" name="o10" doxytag="_DMXInputInfo::sigioState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of fds </p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0ba936a9c99af68fa838e45eb7af1c68"></a><!-- doxytag: member="_DMXInputInfo::sigioFdCount" ref="a0ba936a9c99af68fa838e45eb7af1c68" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="dmxinput_8h.html#a31">dmxSigioState</a> <a class="el" href="struct__DMXInputInfo.html#o10">_DMXInputInfo::sigioState</a>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#a0ba936a9c99af68fa838e45eb7af1c68">_DMXInputInfo::sigioFdCount</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Current stat     </td>
-  </tr>
-</table>
-<a class="anchor" name="o19" doxytag="_DMXInputInfo::symbols" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of fds in use </p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00227">dmxSigioUnregister()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab7e0499d483754c4a1a9c567edb1c167"></a><!-- doxytag: member="_DMXInputInfo::sigioState" ref="ab7e0499d483754c4a1a9c567edb1c167" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> char* <a class="el" href="struct__DMXInputInfo.html#o19">_DMXInputInfo::symbols</a>
+          <td class="memname"><a class="el" href="dmxinput_8h.html#abdcaa3561e4107b3e133d221a881fdd4">dmxSigioState</a> <a class="el" href="struct__DMXInputInfo.html#ab7e0499d483754c4a1a9c567edb1c167">_DMXInputInfo::sigioState</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XKB symbols from command line     </td>
-  </tr>
-</table>
-<a class="anchor" name="o14" doxytag="_DMXInputInfo::vt_switch_pending" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Current stat </p>
+
+<p>Referenced by <a class="el" href="dmxsigio_8c_source.html#l00133">dmxSigioAdd()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, <a class="el" href="dmxsigio_8c_source.html#l00214">dmxSigioRegister()</a>, <a class="el" href="dmxsigio_8c_source.html#l00161">dmxSigioRemove()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00227">dmxSigioUnregister()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1795d72d7dda09bd241382129a82202f"></a><!-- doxytag: member="_DMXInputInfo::symbols" ref="a1795d72d7dda09bd241382129a82202f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o14">_DMXInputInfo::vt_switch_pending</a>
+          <td class="memname">char* <a class="el" href="struct__DMXInputInfo.html#a1795d72d7dda09bd241382129a82202f">_DMXInputInfo::symbols</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if a VT switch is pending, but has not yet happened.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o15" doxytag="_DMXInputInfo::vt_switched" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>XKB symbols from command line </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01098">dmxInputFree()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad4a7bc0976bf853d45ea5043a66ade55"></a><!-- doxytag: member="_DMXInputInfo::updateWindowInfo" ref="ad4a7bc0976bf853d45ea5043a66ade55" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXInputInfo.html#o15">_DMXInputInfo::vt_switched</a>
+          <td class="memname"><a class="el" href="dmxinput_8h.html#a7d3f5360f968ed1d470b03fbee5d03f0">UpdateWindowInfoProc</a> <a class="el" href="struct__DMXInputInfo.html#ad4a7bc0976bf853d45ea5043a66ade55">_DMXInputInfo::updateWindowInfo</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if a VT switch has happened.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7" doxytag="_DMXInputInfo::windows" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, and <a class="el" href="dmxinput_8c_source.html#l00095">dmxUpdateWindowInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad834410a8c4c7225cd91c9bc96a0344e"></a><!-- doxytag: member="_DMXInputInfo::vt_switch_pending" ref="ad834410a8c4c7225cd91c9bc96a0344e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXInputInfo.html#o7">_DMXInputInfo::windows</a>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#ad834410a8c4c7225cd91c9bc96a0344e">_DMXInputInfo::vt_switch_pending</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if window outlines are draw in console     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxinput_8h-source.html">dmxinput.h</a></ul>
+</div>
+<div class="memdoc">
+<p>True if a VT switch is pending, but has not yet happened. </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1592eb7fde735ef649c06b6b3f52b632"></a><!-- doxytag: member="_DMXInputInfo::vt_switched" ref="a1592eb7fde735ef649c06b6b3f52b632" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXInputInfo.html#a1592eb7fde735ef649c06b6b3f52b632">_DMXInputInfo::vt_switched</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>True if a VT switch has happened. </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a44bbc55fb7a2fef1a88144825755d3ed"></a><!-- doxytag: member="_DMXInputInfo::windows" ref="a44bbc55fb7a2fef1a88144825755d3ed" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__DMXInputInfo.html#a44bbc55fb7a2fef1a88144825755d3ed">_DMXInputInfo::windows</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>True if window outlines are draw in console </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxinput_8h_source.html">dmxinput.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html
index 73b3e3ba6..9803358d9 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInitInfo.html
@@ -6,764 +6,557 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXLocalInitInfo Struct Reference</h1><code>#include &lt;<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o0">keyboard</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o1">keyClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>KeySymsRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o2">keySyms</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o3">freemap</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>CARD8&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o4">modMap</a> [MAP_LENGTH]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XkbDescPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o5">xkb</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XkbComponentNamesRec&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o6">names</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o7">freenames</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o8">force</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o9">buttonClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o10">numButtons</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned char&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o11">map</a> [DMX_MAX_BUTTONS]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o12">valuatorClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o13">numRelAxes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o14">numAbsAxes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o15">minval</a> [DMX_MAX_AXES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o16">maxval</a> [DMX_MAX_AXES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o17">res</a> [DMX_MAX_AXES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o18">minres</a> [DMX_MAX_AXES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o19">maxres</a> [DMX_MAX_AXES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o20">focusClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o21">proximityClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o22">kbdFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o23">ptrFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o24">ledFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o25">belFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o26">intFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o27">strFeedbackClass</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o28">maxSymbols</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o29">maxSymbolsSupported</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>KeySym *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInitInfo.html#o30">symbols</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores information from low-level device that is used to initialize the device at the dix level. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o25" doxytag="_DMXLocalInitInfo::belFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXLocalInitInfo Struct Reference</h1><!-- doxytag: class="_DMXLocalInitInfo" -->
+<p><code>#include &lt;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a214969f0843dcb70d8f7577f58bafa48">keyboard</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a06626a99542714bbd032e9e12a8c6b55">keyClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">KeySymsRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a02861e7e9c24381a229567d36e7a68b7">keySyms</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#adf6832408c8ef7c3b25eb408907a1459">freemap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CARD8&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a2e345080abf875ce6f85e63ed631cbcd">modMap</a> [MAP_LENGTH]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XkbDescPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a17f7d8bff60a50d216e77e7511106a34">xkb</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XkbComponentNamesRec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a92de3dbbb88844f90aa431f93e16ee05">names</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a20463b784b2d33db44b377cbbabf8b7b">freenames</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#abb7446114b5bdb0baf52806c9a1d249c">force</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a58b2e6764967add7eda1c1f2f0860abc">buttonClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a9264f367a1c1e252679299b00f94458c">numButtons</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a43d86cc82219794bba7ba1ee66472a45">map</a> [DMX_MAX_BUTTONS]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a9af277d2da1ade2138488a413e9c5ceb">valuatorClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a5e192625179bbed020a720e448c789aa">numRelAxes</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#aa7576ebc7b4f56d51da6a21fcd7b07d4">numAbsAxes</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a0c47ee21909227a1ea5d40ba473e0e25">minval</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a63477e691c43eca2dbf569fb0feb74be">maxval</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#abb910012dc1abde90f954354f8ceb2a1">res</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a139fed62b89a92d80997166c8cfcdebf">minres</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a5de8a5ac80a30840cba0d9f3074289ca">maxres</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a24b09c34e0cf80ec33f093e908206be4">focusClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#ae870549e09c5ae0ccc6b9d6d01b4c3b5">proximityClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#af19caac0e20a9106b73714c9c7991ce5">kbdFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a1c52bc6e1c328ef9e808a111dd050fc2">ptrFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#accf423e8cf2614500108be41ed23492d">ledFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a088c60acc5806ebcc401fa1da108b3f5">belFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#ac0c949f93be45f162c824aae17762dc3">intFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a35ccfe81c3eceefd69abfb7b5ebe02cf">strFeedbackClass</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#ae5dc18536a191e46bfe6682f82afd583">maxSymbols</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a8a8933752768b613acbda0743bbcfbe6">maxSymbolsSupported</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">KeySym *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInitInfo.html#a6b496d0ba54c63d406ef46ddcf714790">symbols</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores information from low-level device that is used to initialize the device at the dix level. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a088c60acc5806ebcc401fa1da108b3f5"></a><!-- doxytag: member="_DMXLocalInitInfo::belFeedbackClass" ref="a088c60acc5806ebcc401fa1da108b3f5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o25">_DMXLocalInitInfo::belFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a088c60acc5806ebcc401fa1da108b3f5">_DMXLocalInitInfo::belFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has a bell     </td>
-  </tr>
-</table>
-<a class="anchor" name="o9" doxytag="_DMXLocalInitInfo::buttonClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has a bell </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a58b2e6764967add7eda1c1f2f0860abc"></a><!-- doxytag: member="_DMXLocalInitInfo::buttonClass" ref="a58b2e6764967add7eda1c1f2f0860abc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o9">_DMXLocalInitInfo::buttonClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a58b2e6764967add7eda1c1f2f0860abc">_DMXLocalInitInfo::buttonClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if buttons are present     </td>
-  </tr>
-</table>
-<a class="anchor" name="o20" doxytag="_DMXLocalInitInfo::focusClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if buttons are present </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a24b09c34e0cf80ec33f093e908206be4"></a><!-- doxytag: member="_DMXLocalInitInfo::focusClass" ref="a24b09c34e0cf80ec33f093e908206be4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o20">_DMXLocalInitInfo::focusClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a24b09c34e0cf80ec33f093e908206be4">_DMXLocalInitInfo::focusClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device can cause focus     </td>
-  </tr>
-</table>
-<a class="anchor" name="o8" doxytag="_DMXLocalInitInfo::force" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device can cause focus </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abb7446114b5bdb0baf52806c9a1d249c"></a><!-- doxytag: member="_DMXLocalInitInfo::force" ref="abb7446114b5bdb0baf52806c9a1d249c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o8">_DMXLocalInitInfo::force</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#abb7446114b5bdb0baf52806c9a1d249c">_DMXLocalInitInfo::force</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Do not allow command line override     </td>
-  </tr>
-</table>
-<a class="anchor" name="o3" doxytag="_DMXLocalInitInfo::freemap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Do not allow command line override </p>
+
+<p>Referenced by <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adf6832408c8ef7c3b25eb408907a1459"></a><!-- doxytag: member="_DMXLocalInitInfo::freemap" ref="adf6832408c8ef7c3b25eb408907a1459" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o3">_DMXLocalInitInfo::freemap</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#adf6832408c8ef7c3b25eb408907a1459">_DMXLocalInitInfo::freemap</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-If non-zero, free keySyms.map     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7" doxytag="_DMXLocalInitInfo::freenames" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>If non-zero, free <a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">keySyms.map</a> </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a20463b784b2d33db44b377cbbabf8b7b"></a><!-- doxytag: member="_DMXLocalInitInfo::freenames" ref="a20463b784b2d33db44b377cbbabf8b7b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o7">_DMXLocalInitInfo::freenames</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a20463b784b2d33db44b377cbbabf8b7b">_DMXLocalInitInfo::freenames</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if names should be free'd     </td>
-  </tr>
-</table>
-<a class="anchor" name="o26" doxytag="_DMXLocalInitInfo::intFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if names should be free'd </p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac0c949f93be45f162c824aae17762dc3"></a><!-- doxytag: member="_DMXLocalInitInfo::intFeedbackClass" ref="ac0c949f93be45f162c824aae17762dc3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o26">_DMXLocalInitInfo::intFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#ac0c949f93be45f162c824aae17762dc3">_DMXLocalInitInfo::intFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has integer feedback     </td>
-  </tr>
-</table>
-<a class="anchor" name="o22" doxytag="_DMXLocalInitInfo::kbdFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has integer feedback </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af19caac0e20a9106b73714c9c7991ce5"></a><!-- doxytag: member="_DMXLocalInitInfo::kbdFeedbackClass" ref="af19caac0e20a9106b73714c9c7991ce5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o22">_DMXLocalInitInfo::kbdFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#af19caac0e20a9106b73714c9c7991ce5">_DMXLocalInitInfo::kbdFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has keyboard feedback     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0" doxytag="_DMXLocalInitInfo::keyboard" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has keyboard feedback </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a214969f0843dcb70d8f7577f58bafa48"></a><!-- doxytag: member="_DMXLocalInitInfo::keyboard" ref="a214969f0843dcb70d8f7577f58bafa48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o0">_DMXLocalInitInfo::keyboard</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a214969f0843dcb70d8f7577f58bafa48">_DMXLocalInitInfo::keyboard</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if the device is a keyboard     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_DMXLocalInitInfo::keyClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if the device is a keyboard </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a06626a99542714bbd032e9e12a8c6b55"></a><!-- doxytag: member="_DMXLocalInitInfo::keyClass" ref="a06626a99542714bbd032e9e12a8c6b55" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o1">_DMXLocalInitInfo::keyClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a06626a99542714bbd032e9e12a8c6b55">_DMXLocalInitInfo::keyClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if keys are present     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_DMXLocalInitInfo::keySyms" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if keys are present </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a02861e7e9c24381a229567d36e7a68b7"></a><!-- doxytag: member="_DMXLocalInitInfo::keySyms" ref="a02861e7e9c24381a229567d36e7a68b7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> KeySymsRec <a class="el" href="struct__DMXLocalInitInfo.html#o2">_DMXLocalInitInfo::keySyms</a>
+          <td class="memname">KeySymsRec <a class="el" href="struct__DMXLocalInitInfo.html#a02861e7e9c24381a229567d36e7a68b7">_DMXLocalInitInfo::keySyms</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Key symbols     </td>
-  </tr>
-</table>
-<a class="anchor" name="o24" doxytag="_DMXLocalInitInfo::ledFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Key symbols </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00050">dmxDummyKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="accf423e8cf2614500108be41ed23492d"></a><!-- doxytag: member="_DMXLocalInitInfo::ledFeedbackClass" ref="accf423e8cf2614500108be41ed23492d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o24">_DMXLocalInitInfo::ledFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#accf423e8cf2614500108be41ed23492d">_DMXLocalInitInfo::ledFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has LED indicators     </td>
-  </tr>
-</table>
-<a class="anchor" name="o11" doxytag="_DMXLocalInitInfo::map" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has LED indicators </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a43d86cc82219794bba7ba1ee66472a45"></a><!-- doxytag: member="_DMXLocalInitInfo::map" ref="a43d86cc82219794bba7ba1ee66472a45" args="[DMX_MAX_BUTTONS]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> unsigned char <a class="el" href="struct__DMXLocalInitInfo.html#o11">_DMXLocalInitInfo::map</a>[DMX_MAX_BUTTONS]
+          <td class="memname">unsigned char <a class="el" href="struct__DMXLocalInitInfo.html#a43d86cc82219794bba7ba1ee66472a45">_DMXLocalInitInfo::map</a>[DMX_MAX_BUTTONS]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Button map     </td>
-  </tr>
-</table>
-<a class="anchor" name="o19" doxytag="_DMXLocalInitInfo::maxres" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Button map </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5de8a5ac80a30840cba0d9f3074289ca"></a><!-- doxytag: member="_DMXLocalInitInfo::maxres" ref="a5de8a5ac80a30840cba0d9f3074289ca" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o19">_DMXLocalInitInfo::maxres</a>[DMX_MAX_AXES]
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a5de8a5ac80a30840cba0d9f3074289ca">_DMXLocalInitInfo::maxres</a>[DMX_MAX_AXES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Maximum resolutions     </td>
-  </tr>
-</table>
-<a class="anchor" name="o28" doxytag="_DMXLocalInitInfo::maxSymbols" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Maximum resolutions </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae5dc18536a191e46bfe6682f82afd583"></a><!-- doxytag: member="_DMXLocalInitInfo::maxSymbols" ref="ae5dc18536a191e46bfe6682f82afd583" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o28">_DMXLocalInitInfo::maxSymbols</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#ae5dc18536a191e46bfe6682f82afd583">_DMXLocalInitInfo::maxSymbols</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Maximum symbols     </td>
-  </tr>
-</table>
-<a class="anchor" name="o29" doxytag="_DMXLocalInitInfo::maxSymbolsSupported" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Maximum symbols </p>
+
+</div>
+</div>
+<a class="anchor" id="a8a8933752768b613acbda0743bbcfbe6"></a><!-- doxytag: member="_DMXLocalInitInfo::maxSymbolsSupported" ref="a8a8933752768b613acbda0743bbcfbe6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o29">_DMXLocalInitInfo::maxSymbolsSupported</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a8a8933752768b613acbda0743bbcfbe6">_DMXLocalInitInfo::maxSymbolsSupported</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Maximum symbols supported     </td>
-  </tr>
-</table>
-<a class="anchor" name="o16" doxytag="_DMXLocalInitInfo::maxval" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Maximum symbols supported </p>
+
+</div>
+</div>
+<a class="anchor" id="a63477e691c43eca2dbf569fb0feb74be"></a><!-- doxytag: member="_DMXLocalInitInfo::maxval" ref="a63477e691c43eca2dbf569fb0feb74be" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o16">_DMXLocalInitInfo::maxval</a>[DMX_MAX_AXES]
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a63477e691c43eca2dbf569fb0feb74be">_DMXLocalInitInfo::maxval</a>[DMX_MAX_AXES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Maximum values     </td>
-  </tr>
-</table>
-<a class="anchor" name="o18" doxytag="_DMXLocalInitInfo::minres" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Maximum values </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a139fed62b89a92d80997166c8cfcdebf"></a><!-- doxytag: member="_DMXLocalInitInfo::minres" ref="a139fed62b89a92d80997166c8cfcdebf" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o18">_DMXLocalInitInfo::minres</a>[DMX_MAX_AXES]
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a139fed62b89a92d80997166c8cfcdebf">_DMXLocalInitInfo::minres</a>[DMX_MAX_AXES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Minimum resolutions     </td>
-  </tr>
-</table>
-<a class="anchor" name="o15" doxytag="_DMXLocalInitInfo::minval" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Minimum resolutions </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0c47ee21909227a1ea5d40ba473e0e25"></a><!-- doxytag: member="_DMXLocalInitInfo::minval" ref="a0c47ee21909227a1ea5d40ba473e0e25" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o15">_DMXLocalInitInfo::minval</a>[DMX_MAX_AXES]
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a0c47ee21909227a1ea5d40ba473e0e25">_DMXLocalInitInfo::minval</a>[DMX_MAX_AXES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Minimum values     </td>
-  </tr>
-</table>
-<a class="anchor" name="o4" doxytag="_DMXLocalInitInfo::modMap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Minimum values </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2e345080abf875ce6f85e63ed631cbcd"></a><!-- doxytag: member="_DMXLocalInitInfo::modMap" ref="a2e345080abf875ce6f85e63ed631cbcd" args="[MAP_LENGTH]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> CARD8 <a class="el" href="struct__DMXLocalInitInfo.html#o4">_DMXLocalInitInfo::modMap</a>[MAP_LENGTH]
+          <td class="memname">CARD8 <a class="el" href="struct__DMXLocalInitInfo.html#a2e345080abf875ce6f85e63ed631cbcd">_DMXLocalInitInfo::modMap</a>[MAP_LENGTH]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Modifier map     </td>
-  </tr>
-</table>
-<a class="anchor" name="o6" doxytag="_DMXLocalInitInfo::names" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Modifier map </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00595">dmxBackendKbdGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00883">dmxConsoleKbdGetInfo()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00983">kbdLinuxGetInfo()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a92de3dbbb88844f90aa431f93e16ee05"></a><!-- doxytag: member="_DMXLocalInitInfo::names" ref="a92de3dbbb88844f90aa431f93e16ee05" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XkbComponentNamesRec <a class="el" href="struct__DMXLocalInitInfo.html#o6">_DMXLocalInitInfo::names</a>
+          <td class="memname">XkbComponentNamesRec <a class="el" href="struct__DMXLocalInitInfo.html#a92de3dbbb88844f90aa431f93e16ee05">_DMXLocalInitInfo::names</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XKB component names     </td>
-  </tr>
-</table>
-<a class="anchor" name="o14" doxytag="_DMXLocalInitInfo::numAbsAxes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>XKB component names </p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00259">dmxCommonKbdGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00372">dmxKeyboardOn()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa7576ebc7b4f56d51da6a21fcd7b07d4"></a><!-- doxytag: member="_DMXLocalInitInfo::numAbsAxes" ref="aa7576ebc7b4f56d51da6a21fcd7b07d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o14">_DMXLocalInitInfo::numAbsAxes</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#aa7576ebc7b4f56d51da6a21fcd7b07d4">_DMXLocalInitInfo::numAbsAxes</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of absolute axes     </td>
-  </tr>
-</table>
-<a class="anchor" name="o10" doxytag="_DMXLocalInitInfo::numButtons" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of absolute axes </p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, and <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9264f367a1c1e252679299b00f94458c"></a><!-- doxytag: member="_DMXLocalInitInfo::numButtons" ref="a9264f367a1c1e252679299b00f94458c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o10">_DMXLocalInitInfo::numButtons</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a9264f367a1c1e252679299b00f94458c">_DMXLocalInitInfo::numButtons</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of buttons     </td>
-  </tr>
-</table>
-<a class="anchor" name="o13" doxytag="_DMXLocalInitInfo::numRelAxes" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of buttons </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5e192625179bbed020a720e448c789aa"></a><!-- doxytag: member="_DMXLocalInitInfo::numRelAxes" ref="a5e192625179bbed020a720e448c789aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o13">_DMXLocalInitInfo::numRelAxes</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a5e192625179bbed020a720e448c789aa">_DMXLocalInitInfo::numRelAxes</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of relative axes     </td>
-  </tr>
-</table>
-<a class="anchor" name="o21" doxytag="_DMXLocalInitInfo::proximityClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Number of relative axes </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae870549e09c5ae0ccc6b9d6d01b4c3b5"></a><!-- doxytag: member="_DMXLocalInitInfo::proximityClass" ref="ae870549e09c5ae0ccc6b9d6d01b4c3b5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o21">_DMXLocalInitInfo::proximityClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#ae870549e09c5ae0ccc6b9d6d01b4c3b5">_DMXLocalInitInfo::proximityClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device causes proximity events     </td>
-  </tr>
-</table>
-<a class="anchor" name="o23" doxytag="_DMXLocalInitInfo::ptrFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device causes proximity events </p>
+
+<p>Referenced by <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c52bc6e1c328ef9e808a111dd050fc2"></a><!-- doxytag: member="_DMXLocalInitInfo::ptrFeedbackClass" ref="a1c52bc6e1c328ef9e808a111dd050fc2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o23">_DMXLocalInitInfo::ptrFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a1c52bc6e1c328ef9e808a111dd050fc2">_DMXLocalInitInfo::ptrFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has pointer feedback     </td>
-  </tr>
-</table>
-<a class="anchor" name="o17" doxytag="_DMXLocalInitInfo::res" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has pointer feedback </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abb910012dc1abde90f954354f8ceb2a1"></a><!-- doxytag: member="_DMXLocalInitInfo::res" ref="abb910012dc1abde90f954354f8ceb2a1" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o17">_DMXLocalInitInfo::res</a>[DMX_MAX_AXES]
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#abb910012dc1abde90f954354f8ceb2a1">_DMXLocalInitInfo::res</a>[DMX_MAX_AXES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Resolution     </td>
-  </tr>
-</table>
-<a class="anchor" name="o27" doxytag="_DMXLocalInitInfo::strFeedbackClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Resolution </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a35ccfe81c3eceefd69abfb7b5ebe02cf"></a><!-- doxytag: member="_DMXLocalInitInfo::strFeedbackClass" ref="a35ccfe81c3eceefd69abfb7b5ebe02cf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o27">_DMXLocalInitInfo::strFeedbackClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a35ccfe81c3eceefd69abfb7b5ebe02cf">_DMXLocalInitInfo::strFeedbackClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if device has string feedback     </td>
-  </tr>
-</table>
-<a class="anchor" name="o30" doxytag="_DMXLocalInitInfo::symbols" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if device has string feedback </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6b496d0ba54c63d406ef46ddcf714790"></a><!-- doxytag: member="_DMXLocalInitInfo::symbols" ref="a6b496d0ba54c63d406ef46ddcf714790" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> KeySym* <a class="el" href="struct__DMXLocalInitInfo.html#o30">_DMXLocalInitInfo::symbols</a>
+          <td class="memname">KeySym* <a class="el" href="struct__DMXLocalInitInfo.html#a6b496d0ba54c63d406ef46ddcf714790">_DMXLocalInitInfo::symbols</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Key symbols     </td>
-  </tr>
-</table>
-<a class="anchor" name="o12" doxytag="_DMXLocalInitInfo::valuatorClass" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Key symbols </p>
+
+</div>
+</div>
+<a class="anchor" id="a9af277d2da1ade2138488a413e9c5ceb"></a><!-- doxytag: member="_DMXLocalInitInfo::valuatorClass" ref="a9af277d2da1ade2138488a413e9c5ceb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInitInfo.html#o12">_DMXLocalInitInfo::valuatorClass</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInitInfo.html#a9af277d2da1ade2138488a413e9c5ceb">_DMXLocalInitInfo::valuatorClass</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if valuators are present     </td>
-  </tr>
-</table>
-<a class="anchor" name="o5" doxytag="_DMXLocalInitInfo::xkb" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if valuators are present </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxcommon_8c_source.html#l00364">dmxCommonOthGetInfo()</a>, <a class="el" href="dmxconsole_8c_source.html#l00862">dmxConsoleMouGetInfo()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>, <a class="el" href="dmxdummy_8c_source.html#l00069">dmxDummyMouGetInfo()</a>, <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>, <a class="el" href="lnx-ms_8c_source.html#l00309">msLinuxGetInfo()</a>, <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00277">ps2LinuxGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a17f7d8bff60a50d216e77e7511106a34"></a><!-- doxytag: member="_DMXLocalInitInfo::xkb" ref="a17f7d8bff60a50d216e77e7511106a34" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XkbDescPtr <a class="el" href="struct__DMXLocalInitInfo.html#o5">_DMXLocalInitInfo::xkb</a>
+          <td class="memname">XkbDescPtr <a class="el" href="struct__DMXLocalInitInfo.html#a17f7d8bff60a50d216e77e7511106a34">_DMXLocalInitInfo::xkb</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XKB description     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a></ul>
+</div>
+<div class="memdoc">
+<p>XKB description </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00430">dmxDeviceOnOff()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html
index 7893e905f..8a3ee7cc4 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXLocalInputInfo.html
@@ -6,982 +6,755 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXLocalInputInfo Struct Reference</h1><code>#include &lt;<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o0">name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>DMXLocalInputType&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o1">type</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>DMXLocalInputExtType&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o2">extType</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o3">binding</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxCreatePrivateProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o4">create_private</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxDestroyPrivateProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o5">destroy_private</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxInitProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o6">init</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxReInitProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o7">reinit</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxLateReInitProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o8">latereinit</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxGetInfoProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o9">get_info</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxOnProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o10">on</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxOffProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o11">off</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxUpdatePositionProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o12">update_position</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxVTPreSwitchProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o13">vt_pre_switch</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxVTPostSwitchProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o14">vt_post_switch</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxVTSwitchProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o15">vt_switch</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxCollectEventsProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o16">collect_events</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxProcessInputProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o17">process_input</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxUpdateInfoProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o19">update_info</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxMCtrlProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o20">mCtrl</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxKBCtrlProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o21">kCtrl</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>dmxKBBellProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o22">kBell</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o23">private</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o24">isCore</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o25">sendsCore</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>KeybdCtrl&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o26">kctrl</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>PtrCtrl&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o27">mctrl</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>DeviceIntPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o28">pDevice</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o29">inputIdx</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o31">lastY</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o32">head</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o33">tail</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned long *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o34">history</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o35">valuators</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o37">savedMotionEvents</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o38">savedSendsCore</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXEventMap.html">DMXEventMap</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o39">map</a> [DMX_MAP_ENTRIES]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o40">mapOptimize</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>long&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o41">deviceId</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXLocalInputInfo.html#o42">deviceName</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c). <dl compact><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> <p>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXLocalInputInfo Struct Reference</h1><!-- doxytag: class="_DMXLocalInputInfo" -->
+<p><code>#include &lt;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a294006d846990bb8cc6dc67ae59a4604">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a65770e9c1265d5765c16028e740b7d88">type</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#ae20bd191af90be478c9f4c036c058102">extType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a1ed7cce8b5eb7d8cf5b1184d4cdf303c">binding</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a55f67eb2e795c4fb5d323fbfd7561b32">create_private</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#af07ddc865b07864b2b33694bc8a2e716">destroy_private</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#ac7d8e55012dcd7fd721802069a4cda7c">init</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#aa6f3438399957a92b7914c12eee23d33">reinit</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#af3e5dd8989b3f33bc2c404bf190c6948">latereinit</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a4d215378947d50a9abc74adcec917313">get_info</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a52fc64a76d0954ed17a1d6ec8abbcce2">on</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#abbc252251f0694ad7754f021c9b0fdd4">off</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a12eb4b3d8237801c42d5042035315035">update_position</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a04beb9f31d342ea399ffcfb7e7f62138">vt_pre_switch</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a82c8765ddfb788835cb4f0e94eca2e84">vt_post_switch</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a4c7d7da1d1a8ebfebb90f3d8e3592c50">vt_switch</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a41e857d61c3f537b0b3df9c8e1870d3b">collect_events</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#aa83350027ea60a4cbf2ca061f66ee9cc">process_input</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a352e7cd1ef0188c6fb17554641c56061">functions</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#aa6c12bcf94eec2868d5cf455ced266c2">update_info</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#af0f567a95d587908d2a8570330d904d9">mCtrl</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a3a55f25979a430029208654302e31a7d">kCtrl</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a8793874f7d6e2674206922ee14ee1d87">kBell</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a25754def501a2713eb09d4ac2401d624">private</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a30914bf4af4280ff250adeb3df5ff648">isCore</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#afc70bb1491ee209bcba538cc9d4972e4">sendsCore</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">KeybdCtrl&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a6f412eb3d02d256f4be20e1143ec914f">kctrl</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">PtrCtrl&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a9583c2a1867b2d3daf428858ba1ae22e">mctrl</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DeviceIntPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#ac126083d907b7c450c94e8317abc20c4">pDevice</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#ad21d501f062199855fdb259ae1c38f6a">inputIdx</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a65e0e7a4d6928067ba63183c7ddbd03c">lastX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#ad19b31d235aed327e6e8871803808ee7">lastY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a41f2eeca657b0ed5e3000a97a965cb44">head</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#aff792bdb6105dd4b58f57107e8e10ddd">tail</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a82f479f4a5f7f12aebcdbd2967ef9a61">history</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a7df8a3276a848aed8937df58755a78ce">valuators</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a27f8606aec1028f80bd9b21c421e78fe">savedMotionProc</a> )(DeviceIntPtr, xTimecoord *, unsigned long, unsigned long, ScreenPtr)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#af6c6062b7601a71a4dc0b97ef918f150">savedMotionEvents</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a258242cde474bdc4ab120d14a3dcd2cb">savedSendsCore</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXEventMap.html">DMXEventMap</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#af8ea073e34c4e927f7f887603aaba17d">map</a> [DMX_MAP_ENTRIES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a5595cf8656f17bceb30699a6d215afa5">mapOptimize</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#a8d7937dfae270e9c0c91dd9518e25dfb">deviceId</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXLocalInputInfo.html#afb6dc5839d4cb4063e550a431a41d07e">deviceName</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This is the device-independent structure used by the low-level input routines. The contents are not exposed to top-level .c files (except dmxextensions.c). </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="dmxinput_8h.html">dmxinput.h</a> </dd>
+<dd>
 dmxextensions.c </dd></dl>
-
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3" doxytag="_DMXLocalInputInfo::binding" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o3">_DMXLocalInputInfo::binding</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Count of how many consecutive structs are bound to the same device     </td>
-  </tr>
-</table>
-<a class="anchor" name="o16" doxytag="_DMXLocalInputInfo::collect_events" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxCollectEventsProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o16">_DMXLocalInputInfo::collect_events</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Collect and enqueue events from the device     </td>
-  </tr>
-</table>
-<a class="anchor" name="o4" doxytag="_DMXLocalInputInfo::create_private" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxCreatePrivateProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o4">_DMXLocalInputInfo::create_private</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create device-dependent private     </td>
-  </tr>
-</table>
-<a class="anchor" name="o5" doxytag="_DMXLocalInputInfo::destroy_private" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxDestroyPrivateProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o5">_DMXLocalInputInfo::destroy_private</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy device-dependent private     </td>
-  </tr>
-</table>
-<a class="anchor" name="o41" doxytag="_DMXLocalInputInfo::deviceId" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> long <a class="el" href="struct__DMXLocalInputInfo.html#o41">_DMXLocalInputInfo::deviceId</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-device id on remote side, if any     </td>
-  </tr>
-</table>
-<a class="anchor" name="o42" doxytag="_DMXLocalInputInfo::deviceName" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> const char* <a class="el" href="struct__DMXLocalInputInfo.html#o42">_DMXLocalInputInfo::deviceName</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-devive name on remote side, if any     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_DMXLocalInputInfo::extType" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> DMXLocalInputExtType <a class="el" href="struct__DMXLocalInputInfo.html#o2">_DMXLocalInputInfo::extType</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Extended device type     </td>
-  </tr>
-</table>
-<a class="anchor" name="o9" doxytag="_DMXLocalInputInfo::get_info" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxGetInfoProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o9">_DMXLocalInputInfo::get_info</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Get device information     </td>
-  </tr>
-</table>
-<a class="anchor" name="o32" doxytag="_DMXLocalInputInfo::head" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o32">_DMXLocalInputInfo::head</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput motion history head     </td>
-  </tr>
-</table>
-<a class="anchor" name="o34" doxytag="_DMXLocalInputInfo::history" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> unsigned long* <a class="el" href="struct__DMXLocalInputInfo.html#o34">_DMXLocalInputInfo::history</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput motion history     </td>
-  </tr>
-</table>
-<a class="anchor" name="o6" doxytag="_DMXLocalInputInfo::init" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxInitProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o6">_DMXLocalInputInfo::init</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize device     </td>
-  </tr>
-</table>
-<a class="anchor" name="o29" doxytag="_DMXLocalInputInfo::inputIdx" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o29">_DMXLocalInputInfo::inputIdx</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-High-level index     </td>
-  </tr>
-</table>
-<a class="anchor" name="o24" doxytag="_DMXLocalInputInfo::isCore" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o24">_DMXLocalInputInfo::isCore</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Is a DMX core device     </td>
-  </tr>
-</table>
-<a class="anchor" name="o22" doxytag="_DMXLocalInputInfo::kBell" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxKBBellProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o22">_DMXLocalInputInfo::kBell</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Bell control     </td>
-  </tr>
-</table>
-<a class="anchor" name="o26" doxytag="_DMXLocalInputInfo::kctrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> KeybdCtrl <a class="el" href="struct__DMXLocalInputInfo.html#o26">_DMXLocalInputInfo::kctrl</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Keyboard control     </td>
-  </tr>
-</table>
-<a class="anchor" name="o21" doxytag="_DMXLocalInputInfo::kCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a1ed7cce8b5eb7d8cf5b1184d4cdf303c"></a><!-- doxytag: member="_DMXLocalInputInfo::binding" ref="a1ed7cce8b5eb7d8cf5b1184d4cdf303c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> dmxKBCtrlProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o21">_DMXLocalInputInfo::kCtrl</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a1ed7cce8b5eb7d8cf5b1184d4cdf303c">_DMXLocalInputInfo::binding</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Keyboard control     </td>
-  </tr>
-</table>
-<a class="anchor" name="o31" doxytag="_DMXLocalInputInfo::lastY" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Count of how many consecutive structs are bound to the same device </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a41e857d61c3f537b0b3df9c8e1870d3b"></a><!-- doxytag: member="_DMXLocalInputInfo::collect_events" ref="a41e857d61c3f537b0b3df9c8e1870d3b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o31">_DMXLocalInputInfo::lastY</a>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#adcfb97363d7c30f429637f857e07ab89">dmxCollectEventsProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a41e857d61c3f537b0b3df9c8e1870d3b">_DMXLocalInputInfo::collect_events</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Last known position; for XInput in <a class="el" href="dmxevents_8c.html">dmxevents.c</a>     </td>
-  </tr>
-</table>
-<a class="anchor" name="o8" doxytag="_DMXLocalInputInfo::latereinit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Collect and enqueue events from the device </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, and <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a55f67eb2e795c4fb5d323fbfd7561b32"></a><!-- doxytag: member="_DMXLocalInputInfo::create_private" ref="a55f67eb2e795c4fb5d323fbfd7561b32" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> dmxLateReInitProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o8">_DMXLocalInputInfo::latereinit</a>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#aee05637c82c5006dc39a8a208e59681d">dmxCreatePrivateProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a55f67eb2e795c4fb5d323fbfd7561b32">_DMXLocalInputInfo::create_private</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reinitialize a device (called very late during a reconfiguration)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o39" doxytag="_DMXLocalInputInfo::map" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Create device-dependent private </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af07ddc865b07864b2b33694bc8a2e716"></a><!-- doxytag: member="_DMXLocalInputInfo::destroy_private" ref="af07ddc865b07864b2b33694bc8a2e716" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXEventMap.html">DMXEventMap</a> <a class="el" href="struct__DMXLocalInputInfo.html#o39">_DMXLocalInputInfo::map</a>[DMX_MAP_ENTRIES]
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput device id map     </td>
-  </tr>
-</table>
-<a class="anchor" name="o40" doxytag="_DMXLocalInputInfo::mapOptimize" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a2da7d7738bd1daf6c24aab0ba07caf54">dmxDestroyPrivateProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#af07ddc865b07864b2b33694bc8a2e716">_DMXLocalInputInfo::destroy_private</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy device-dependent private </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8d7937dfae270e9c0c91dd9518e25dfb"></a><!-- doxytag: member="_DMXLocalInputInfo::deviceId" ref="a8d7937dfae270e9c0c91dd9518e25dfb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o40">_DMXLocalInputInfo::mapOptimize</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput device id map optimization     </td>
-  </tr>
-</table>
-<a class="anchor" name="o27" doxytag="_DMXLocalInputInfo::mctrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+          <td class="memname">long <a class="el" href="struct__DMXLocalInputInfo.html#a8d7937dfae270e9c0c91dd9518e25dfb">_DMXLocalInputInfo::deviceId</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>device id on remote side, if any </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afb6dc5839d4cb4063e550a431a41d07e"></a><!-- doxytag: member="_DMXLocalInputInfo::deviceName" ref="afb6dc5839d4cb4063e550a431a41d07e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXLocalInputInfo.html#afb6dc5839d4cb4063e550a431a41d07e">_DMXLocalInputInfo::deviceName</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>devive name on remote side, if any </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae20bd191af90be478c9f4c036c058102"></a><!-- doxytag: member="_DMXLocalInputInfo::extType" ref="ae20bd191af90be478c9f4c036c058102" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#adb3d11ae6b6d741bc4ac9be219eae9ba">DMXLocalInputExtType</a> <a class="el" href="struct__DMXLocalInputInfo.html#ae20bd191af90be478c9f4c036c058102">_DMXLocalInputInfo::extType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Extended device type </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, and <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a352e7cd1ef0188c6fb17554641c56061"></a><!-- doxytag: member="_DMXLocalInputInfo::functions" ref="a352e7cd1ef0188c6fb17554641c56061" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a8b1303060b18fcc2d85f44d658ae75c4">dmxFunctionsProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a352e7cd1ef0188c6fb17554641c56061">_DMXLocalInputInfo::functions</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4d215378947d50a9abc74adcec917313"></a><!-- doxytag: member="_DMXLocalInputInfo::get_info" ref="a4d215378947d50a9abc74adcec917313" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a26894f455a9a482ea75157931a1458d7">dmxGetInfoProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a4d215378947d50a9abc74adcec917313">_DMXLocalInputInfo::get_info</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Get device information </p>
+
+</div>
+</div>
+<a class="anchor" id="a41f2eeca657b0ed5e3000a97a965cb44"></a><!-- doxytag: member="_DMXLocalInputInfo::head" ref="a41f2eeca657b0ed5e3000a97a965cb44" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a41f2eeca657b0ed5e3000a97a965cb44">_DMXLocalInputInfo::head</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>XInput motion history head </p>
+
+</div>
+</div>
+<a class="anchor" id="a82f479f4a5f7f12aebcdbd2967ef9a61"></a><!-- doxytag: member="_DMXLocalInputInfo::history" ref="a82f479f4a5f7f12aebcdbd2967ef9a61" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long* <a class="el" href="struct__DMXLocalInputInfo.html#a82f479f4a5f7f12aebcdbd2967ef9a61">_DMXLocalInputInfo::history</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>XInput motion history </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac7d8e55012dcd7fd721802069a4cda7c"></a><!-- doxytag: member="_DMXLocalInputInfo::init" ref="ac7d8e55012dcd7fd721802069a4cda7c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> PtrCtrl <a class="el" href="struct__DMXLocalInputInfo.html#o27">_DMXLocalInputInfo::mctrl</a>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a170923459cb2d78f2a9aa623d3af2a5e">dmxInitProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#ac7d8e55012dcd7fd721802069a4cda7c">_DMXLocalInputInfo::init</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize device </p>
+
+</div>
+</div>
+<a class="anchor" id="ad21d501f062199855fdb259ae1c38f6a"></a><!-- doxytag: member="_DMXLocalInputInfo::inputIdx" ref="ad21d501f062199855fdb259ae1c38f6a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#ad21d501f062199855fdb259ae1c38f6a">_DMXLocalInputInfo::inputIdx</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>High-level index </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a30914bf4af4280ff250adeb3df5ff648"></a><!-- doxytag: member="_DMXLocalInputInfo::isCore" ref="a30914bf4af4280ff250adeb3df5ff648" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a30914bf4af4280ff250adeb3df5ff648">_DMXLocalInputInfo::isCore</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Is a DMX core device </p>
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00056">ChangeKeyboardDevice()</a>, <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8793874f7d6e2674206922ee14ee1d87"></a><!-- doxytag: member="_DMXLocalInputInfo::kBell" ref="a8793874f7d6e2674206922ee14ee1d87" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a7e43ef34585bcd2dfb1f6c72b46674b0">dmxKBBellProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a8793874f7d6e2674206922ee14ee1d87">_DMXLocalInputInfo::kBell</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Bell control </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00332">_dmxKeyboardBellProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6f412eb3d02d256f4be20e1143ec914f"></a><!-- doxytag: member="_DMXLocalInputInfo::kctrl" ref="a6f412eb3d02d256f4be20e1143ec914f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">KeybdCtrl <a class="el" href="struct__DMXLocalInputInfo.html#a6f412eb3d02d256f4be20e1143ec914f">_DMXLocalInputInfo::kctrl</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Keyboard control </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00332">_dmxKeyboardBellProc()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00294">_dmxKeyboardKbdCtrlProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3a55f25979a430029208654302e31a7d"></a><!-- doxytag: member="_DMXLocalInputInfo::kCtrl" ref="a3a55f25979a430029208654302e31a7d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#afd1aa8768fbb96900d4a206a33f0fa10">dmxKBCtrlProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a3a55f25979a430029208654302e31a7d">_DMXLocalInputInfo::kCtrl</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Pointer control     </td>
-  </tr>
-</table>
-<a class="anchor" name="o20" doxytag="_DMXLocalInputInfo::mCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxMCtrlProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o20">_DMXLocalInputInfo::mCtrl</a>
+</div>
+<div class="memdoc">
+<p>Keyboard control </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00294">_dmxKeyboardKbdCtrlProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a65e0e7a4d6928067ba63183c7ddbd03c"></a><!-- doxytag: member="_DMXLocalInputInfo::lastX" ref="a65e0e7a4d6928067ba63183c7ddbd03c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a65e0e7a4d6928067ba63183c7ddbd03c">_DMXLocalInputInfo::lastX</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Pointer control     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0" doxytag="_DMXLocalInputInfo::name" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad19b31d235aed327e6e8871803808ee7"></a><!-- doxytag: member="_DMXLocalInputInfo::lastY" ref="ad19b31d235aed327e6e8871803808ee7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* <a class="el" href="struct__DMXLocalInputInfo.html#o0">_DMXLocalInputInfo::name</a>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#ad19b31d235aed327e6e8871803808ee7">_DMXLocalInputInfo::lastY</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Device name     </td>
-  </tr>
-</table>
-<a class="anchor" name="o11" doxytag="_DMXLocalInputInfo::off" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Last known position; for XInput in <a class="el" href="dmxevents_8c.html">dmxevents.c</a> </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af3e5dd8989b3f33bc2c404bf190c6948"></a><!-- doxytag: member="_DMXLocalInputInfo::latereinit" ref="af3e5dd8989b3f33bc2c404bf190c6948" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> dmxOffProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o11">_DMXLocalInputInfo::off</a>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a7710375b1daf4c8a43e1bc45b1459885">dmxLateReInitProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#af3e5dd8989b3f33bc2c404bf190c6948">_DMXLocalInputInfo::latereinit</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn device off     </td>
-  </tr>
-</table>
-<a class="anchor" name="o10" doxytag="_DMXLocalInputInfo::on" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxOnProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o10">_DMXLocalInputInfo::on</a>
+</div>
+<div class="memdoc">
+<p>Reinitialize a device (called very late during a reconfiguration) </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00950">dmxInputLateReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af8ea073e34c4e927f7f887603aaba17d"></a><!-- doxytag: member="_DMXLocalInputInfo::map" ref="af8ea073e34c4e927f7f887603aaba17d" args="[DMX_MAP_ENTRIES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXEventMap.html">DMXEventMap</a> <a class="el" href="struct__DMXLocalInputInfo.html#af8ea073e34c4e927f7f887603aaba17d">_DMXLocalInputInfo::map</a>[DMX_MAP_ENTRIES]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn device on     </td>
-  </tr>
-</table>
-<a class="anchor" name="o28" doxytag="_DMXLocalInputInfo::pDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> DeviceIntPtr <a class="el" href="struct__DMXLocalInputInfo.html#o28">_DMXLocalInputInfo::pDevice</a>
+</div>
+<div class="memdoc">
+<p>XInput device id map </p>
+
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00091">dmxMapClear()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5595cf8656f17bceb30699a6d215afa5"></a><!-- doxytag: member="_DMXLocalInputInfo::mapOptimize" ref="a5595cf8656f17bceb30699a6d215afa5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a5595cf8656f17bceb30699a6d215afa5">_DMXLocalInputInfo::mapOptimize</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-X-level device     </td>
-  </tr>
-</table>
-<a class="anchor" name="o23" doxytag="_DMXLocalInputInfo::private" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> pointer <a class="el" href="struct__DMXLocalInputInfo.html#o23">_DMXLocalInputInfo::private</a>
+</div>
+<div class="memdoc">
+<p>XInput device id map optimization </p>
+
+<p>Referenced by <a class="el" href="dmxmap_8c_source.html#l00091">dmxMapClear()</a>, <a class="el" href="dmxmap_8c_source.html#l00062">dmxMapInsert()</a>, and <a class="el" href="dmxmap_8c_source.html#l00104">dmxMapLookup()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9583c2a1867b2d3daf428858ba1ae22e"></a><!-- doxytag: member="_DMXLocalInputInfo::mctrl" ref="a9583c2a1867b2d3daf428858ba1ae22e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">PtrCtrl <a class="el" href="struct__DMXLocalInputInfo.html#a9583c2a1867b2d3daf428858ba1ae22e">_DMXLocalInputInfo::mctrl</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Device-dependent private     </td>
-  </tr>
-</table>
-<a class="anchor" name="o17" doxytag="_DMXLocalInputInfo::process_input" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxProcessInputProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o17">_DMXLocalInputInfo::process_input</a>
+</div>
+<div class="memdoc">
+<p>Pointer control </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00265">_dmxChangePointerControl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af0f567a95d587908d2a8570330d904d9"></a><!-- doxytag: member="_DMXLocalInputInfo::mCtrl" ref="af0f567a95d587908d2a8570330d904d9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a663082c69800179ce7177163c231ac9c">dmxMCtrlProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#af0f567a95d587908d2a8570330d904d9">_DMXLocalInputInfo::mCtrl</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Process event (from queue)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7" doxytag="_DMXLocalInputInfo::reinit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxReInitProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o7">_DMXLocalInputInfo::reinit</a>
+</div>
+<div class="memdoc">
+<p>Pointer control </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00265">_dmxChangePointerControl()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a294006d846990bb8cc6dc67ae59a4604"></a><!-- doxytag: member="_DMXLocalInputInfo::name" ref="a294006d846990bb8cc6dc67ae59a4604" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="struct__DMXLocalInputInfo.html#a294006d846990bb8cc6dc67ae59a4604">_DMXLocalInputInfo::name</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Reinitialize device (during a reconfiguration)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o37" doxytag="_DMXLocalInputInfo::savedMotionEvents" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o37">_DMXLocalInputInfo::savedMotionEvents</a>
+</div>
+<div class="memdoc">
+<p>Device name </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00765">dmxLookupLocal()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abbc252251f0694ad7754f021c9b0fdd4"></a><!-- doxytag: member="_DMXLocalInputInfo::off" ref="abbc252251f0694ad7754f021c9b0fdd4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a73975f436d350bc9d62310c3aa18b970">dmxOffProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#abbc252251f0694ad7754f021c9b0fdd4">_DMXLocalInputInfo::off</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Saved motion events     </td>
-  </tr>
-</table>
-<a class="anchor" name="o38" doxytag="_DMXLocalInputInfo::savedSendsCore" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o38">_DMXLocalInputInfo::savedSendsCore</a>
+</div>
+<div class="memdoc">
+<p>Turn device off </p>
+
+</div>
+</div>
+<a class="anchor" id="a52fc64a76d0954ed17a1d6ec8abbcce2"></a><!-- doxytag: member="_DMXLocalInputInfo::on" ref="a52fc64a76d0954ed17a1d6ec8abbcce2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#ac047d21e0ad6e06d7e1c8d4ff4bcb689">dmxOnProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a52fc64a76d0954ed17a1d6ec8abbcce2">_DMXLocalInputInfo::on</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Saved sends-core flag     </td>
-  </tr>
-</table>
-<a class="anchor" name="o25" doxytag="_DMXLocalInputInfo::sendsCore" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o25">_DMXLocalInputInfo::sendsCore</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Sends DMX core events     </td>
-  </tr>
-</table>
-<a class="anchor" name="o33" doxytag="_DMXLocalInputInfo::tail" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXLocalInputInfo.html#o33">_DMXLocalInputInfo::tail</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput motion history tail     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_DMXLocalInputInfo::type" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> DMXLocalInputType <a class="el" href="struct__DMXLocalInputInfo.html#o1">_DMXLocalInputInfo::type</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Device type     </td>
-  </tr>
-</table>
-<a class="anchor" name="o19" doxytag="_DMXLocalInputInfo::update_info" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxUpdateInfoProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o19">_DMXLocalInputInfo::update_info</a>
+</div>
+<div class="memdoc">
+<p>Turn device on </p>
+
+</div>
+</div>
+<a class="anchor" id="ac126083d907b7c450c94e8317abc20c4"></a><!-- doxytag: member="_DMXLocalInputInfo::pDevice" ref="ac126083d907b7c450c94e8317abc20c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DeviceIntPtr <a class="el" href="struct__DMXLocalInputInfo.html#ac126083d907b7c450c94e8317abc20c4">_DMXLocalInputInfo::pDevice</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>X-level device </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00265">_dmxChangePointerControl()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00332">_dmxKeyboardBellProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00294">_dmxKeyboardKbdCtrlProc()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00743">dmxCheckSpecialKeys()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00599">dmxCollectAll()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="dmxevents_8c_source.html#l00520">dmxGetButtonMapping()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01232">dmxInputAttachNew()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00950">dmxInputLateReInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01218">dmxInputLocateId()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00937">dmxInputReInit()</a>, <a class="el" href="dmxevents_8c_source.html#l00580">dmxKeyCodeToKeySym()</a>, <a class="el" href="dmxevents_8c_source.html#l00604">dmxKeySymToKeyCode()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxsigio_8c_source.html#l00065">dmxSigioHandler()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25754def501a2713eb09d4ac2401d624"></a><!-- doxytag: member="_DMXLocalInputInfo::private" ref="a25754def501a2713eb09d4ac2401d624" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer <a class="el" href="struct__DMXLocalInputInfo.html#a25754def501a2713eb09d4ac2401d624">_DMXLocalInputInfo::private</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Device-dependent private </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxevents_8c_source.html#l00087">dmxApplyFunctions()</a>, <a class="el" href="dmxcommon_8c_source.html#l00544">dmxCommonCopyPrivate()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>, <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa83350027ea60a4cbf2ca061f66ee9cc"></a><!-- doxytag: member="_DMXLocalInputInfo::process_input" ref="aa83350027ea60a4cbf2ca061f66ee9cc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#ad4cb1ed046822462a5d60edeebcbf586">dmxProcessInputProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#aa83350027ea60a4cbf2ca061f66ee9cc">_DMXLocalInputInfo::process_input</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Process event (from queue) </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00543">dmxProcessInputEvents()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6f3438399957a92b7914c12eee23d33"></a><!-- doxytag: member="_DMXLocalInputInfo::reinit" ref="aa6f3438399957a92b7914c12eee23d33" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#ae9c6f42a280d980b6b99d7e05b27c3c9">dmxReInitProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#aa6f3438399957a92b7914c12eee23d33">_DMXLocalInputInfo::reinit</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Reinitialize device (during a reconfiguration) </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00937">dmxInputReInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af6c6062b7601a71a4dc0b97ef918f150"></a><!-- doxytag: member="_DMXLocalInputInfo::savedMotionEvents" ref="af6c6062b7601a71a4dc0b97ef918f150" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#af6c6062b7601a71a4dc0b97ef918f150">_DMXLocalInputInfo::savedMotionEvents</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Saved motion events </p>
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a27f8606aec1028f80bd9b21c421e78fe"></a><!-- doxytag: member="_DMXLocalInputInfo::savedMotionProc" ref="a27f8606aec1028f80bd9b21c421e78fe" args=")(DeviceIntPtr, xTimecoord *, unsigned long, unsigned long, ScreenPtr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int(* <a class="el" href="struct__DMXLocalInputInfo.html#a27f8606aec1028f80bd9b21c421e78fe">_DMXLocalInputInfo::savedMotionProc</a>)(DeviceIntPtr, xTimecoord *, unsigned long, unsigned long, ScreenPtr)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Update window layout information     </td>
-  </tr>
-</table>
-<a class="anchor" name="o12" doxytag="_DMXLocalInputInfo::update_position" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxUpdatePositionProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o12">_DMXLocalInputInfo::update_position</a>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a258242cde474bdc4ab120d14a3dcd2cb"></a><!-- doxytag: member="_DMXLocalInputInfo::savedSendsCore" ref="a258242cde474bdc4ab120d14a3dcd2cb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#a258242cde474bdc4ab120d14a3dcd2cb">_DMXLocalInputInfo::savedSendsCore</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Called when another device updates the cursor position     </td>
-  </tr>
-</table>
-<a class="anchor" name="o35" doxytag="_DMXLocalInputInfo::valuators" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int* <a class="el" href="struct__DMXLocalInputInfo.html#o35">_DMXLocalInputInfo::valuators</a>
+</div>
+<div class="memdoc">
+<p>Saved sends-core flag </p>
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00056">ChangeKeyboardDevice()</a>, <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afc70bb1491ee209bcba538cc9d4972e4"></a><!-- doxytag: member="_DMXLocalInputInfo::sendsCore" ref="afc70bb1491ee209bcba538cc9d4972e4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#afc70bb1491ee209bcba538cc9d4972e4">_DMXLocalInputInfo::sendsCore</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Cache of previous values     </td>
-  </tr>
-</table>
-<a class="anchor" name="o14" doxytag="_DMXLocalInputInfo::vt_post_switch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxVTPostSwitchProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o14">_DMXLocalInputInfo::vt_post_switch</a>
+</div>
+<div class="memdoc">
+<p>Sends DMX core events </p>
+
+<p>Referenced by <a class="el" href="dmxxinput_8c_source.html#l00056">ChangeKeyboardDevice()</a>, <a class="el" href="dmxxinput_8c_source.html#l00080">ChangePointerDevice()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00276">dmxChangePointerControl()</a>, <a class="el" href="dmxevents_8c_source.html#l00098">dmxCheckFunctionKeys()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01241">dmxInputAttachOld()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00776">dmxInputCopyLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01174">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00343">dmxKeyboardBellProc()</a>, and <a class="el" href="dmxinputinit_8c_source.html#l00314">dmxKeyboardKbdCtrlProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aff792bdb6105dd4b58f57107e8e10ddd"></a><!-- doxytag: member="_DMXLocalInputInfo::tail" ref="aff792bdb6105dd4b58f57107e8e10ddd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXLocalInputInfo.html#aff792bdb6105dd4b58f57107e8e10ddd">_DMXLocalInputInfo::tail</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Called after a VT switch     </td>
-  </tr>
-</table>
-<a class="anchor" name="o13" doxytag="_DMXLocalInputInfo::vt_pre_switch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>XInput motion history tail </p>
+
+</div>
+</div>
+<a class="anchor" id="a65770e9c1265d5765c16028e740b7d88"></a><!-- doxytag: member="_DMXLocalInputInfo::type" ref="a65770e9c1265d5765c16028e740b7d88" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> dmxVTPreSwitchProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o13">_DMXLocalInputInfo::vt_pre_switch</a>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#aa3fce3ce186af0687bc43e0e4930181b">DMXLocalInputType</a> <a class="el" href="struct__DMXLocalInputInfo.html#a65770e9c1265d5765c16028e740b7d88">_DMXLocalInputInfo::type</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Called before a VT switch     </td>
-  </tr>
-</table>
-<a class="anchor" name="o15" doxytag="_DMXLocalInputInfo::vt_switch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> dmxVTSwitchProcPtr <a class="el" href="struct__DMXLocalInputInfo.html#o15">_DMXLocalInputInfo::vt_switch</a>
+</div>
+<div class="memdoc">
+<p>Device type </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00691">dmxAddDevice()</a>, <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00962">dmxInputInit()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00835">dmxInputScanForExtensions()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00668">dmxMakeUniqueDeviceName()</a>, <a class="el" href="dmxinputinit_8c_source.html#l00798">dmxPopulateLocal()</a>, and <a class="el" href="dmxevents_8c_source.html#l00383">dmxTranslateAndEnqueueExtEvent()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa6c12bcf94eec2868d5cf455ced266c2"></a><!-- doxytag: member="_DMXLocalInputInfo::update_info" ref="aa6c12bcf94eec2868d5cf455ced266c2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a85e276bf34bacc668c901e37fd787dfc">dmxUpdateInfoProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#aa6c12bcf94eec2868d5cf455ced266c2">_DMXLocalInputInfo::update_info</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Update window layout information </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00566">dmxUpdateWindowInformation()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a12eb4b3d8237801c42d5042035315035"></a><!-- doxytag: member="_DMXLocalInputInfo::update_position" ref="a12eb4b3d8237801c42d5042035315035" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#a23f7990e959535436e5a29aaf43e09f0">dmxUpdatePositionProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a12eb4b3d8237801c42d5042035315035">_DMXLocalInputInfo::update_position</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Called when another device updates the cursor position </p>
+
+<p>Referenced by <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, and <a class="el" href="dmxevents_8c_source.html#l00281">dmxExtMotion()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7df8a3276a848aed8937df58755a78ce"></a><!-- doxytag: member="_DMXLocalInputInfo::valuators" ref="a7df8a3276a848aed8937df58755a78ce" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int* <a class="el" href="struct__DMXLocalInputInfo.html#a7df8a3276a848aed8937df58755a78ce">_DMXLocalInputInfo::valuators</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Cache of previous values </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01080">dmxInputFreeLocal()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a82c8765ddfb788835cb4f0e94eca2e84"></a><!-- doxytag: member="_DMXLocalInputInfo::vt_post_switch" ref="a82c8765ddfb788835cb4f0e94eca2e84" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#aba1f3ed3e0d93c6fea0448b6f928132b">dmxVTPostSwitchProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a82c8765ddfb788835cb4f0e94eca2e84">_DMXLocalInputInfo::vt_post_switch</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Called after a VT switch </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00625">dmxSwitchReturn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a04beb9f31d342ea399ffcfb7e7f62138"></a><!-- doxytag: member="_DMXLocalInputInfo::vt_pre_switch" ref="a04beb9f31d342ea399ffcfb7e7f62138" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#af7ef16143e5a5fa77c00cacdd710abf0">dmxVTPreSwitchProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a04beb9f31d342ea399ffcfb7e7f62138">_DMXLocalInputInfo::vt_pre_switch</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Called before a VT switch </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4c7d7da1d1a8ebfebb90f3d8e3592c50"></a><!-- doxytag: member="_DMXLocalInputInfo::vt_switch" ref="a4c7d7da1d1a8ebfebb90f3d8e3592c50" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmxinputinit_8h.html#af276a0d0ad01b9c9f8485cdf9b218b92">dmxVTSwitchProcPtr</a> <a class="el" href="struct__DMXLocalInputInfo.html#a4c7d7da1d1a8ebfebb90f3d8e3592c50">_DMXLocalInputInfo::vt_switch</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Causes a VT switch     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a></ul>
+</div>
+<div class="memdoc">
+<p>Causes a VT switch </p>
+
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l00641">dmxWakeupHandler()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html
index c83d3f0aa..365f3fd4f 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXScreenInfo.html
@@ -6,1316 +6,1636 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXScreenInfo Struct Reference</h1><code>#include &lt;<a class="el" href="dmx_8h-source.html">dmx.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o0">name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o1">index</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Display *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o2">beDisplay</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o3">beWidth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o4">beHeight</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o5">beDepth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o6">beBPP</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o7">beXDPI</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o8">beYDPI</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o9">beNumDepths</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o10">beDepths</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o11">beNumPixmapFormats</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XPixmapFormatValues *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o12">bePixmapFormats</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o13">beNumVisuals</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XVisualInfo *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o14">beVisuals</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o15">beDefVisualIndex</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o16">beNumDefColormaps</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Colormap *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o17">beDefColormaps</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Pixel&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o18">beBlackPixel</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Pixel&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o19">beWhitePixel</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Window&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o20">scrnWin</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o21">scrnX</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o22">scrnY</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o23">scrnWidth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o24">scrnHeight</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o25">scrnXSign</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o26">scrnYSign</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Drawable&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o27">scrnDefDrawables</a> [MAXFORMATS]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o28">next</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o29">over</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Window&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o30">rootWin</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o31">rootX</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o32">rootY</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o33">rootWidth</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o34">rootHeight</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o35">rootXOrigin</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o36">rootYOrigin</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o37">shadow</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XlibGC&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o38">shadowGC</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>XImage *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o39">shadowFBImage</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o40">shared</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>PositionType&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o47">where</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o48">whereX</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o49">whereY</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o50">whereRefScreen</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o51">savedTimeout</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o52">dpmsCapable</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXScreenInfo Struct Reference</h1><!-- doxytag: class="_DMXScreenInfo" -->
+<p><code>#include &lt;<a class="el" href="dmx_8h_source.html">dmx.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a5cfc14ffedaafcbe5b00302f972208cf">name</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a28849096f73f9bf14bb7e461dbb5cc94">index</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Display *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a756ade62a55a52f163a42db6de54c244">beDisplay</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aaa160ae9fce9f7c58bb9f6c0a9709861">beWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a713ca6d9bf7a4527f442519554e1fc94">beHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ac435223f6a5921beab567cc23b83f07f">beDepth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a5e865cb99dd73ba18991912af275994f">beBPP</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aef4fb640cf089a1ebbf87a144f25cd80">beXDPI</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a7646aaa7101d53566be4506a2c3b75fb">beYDPI</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a896eeff4d8c92af936bbb1c24b8ad081">beNumDepths</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a4e0c6ff0cf4b00ac0d7d1f3702343033">beDepths</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a6476a8960e2013a9502c326f8851071c">beNumPixmapFormats</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XPixmapFormatValues *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1c13d3cbcad4da61fe677e96cb781543">bePixmapFormats</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a4edb26469ac99eccb762f668615c4b83">beNumVisuals</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XVisualInfo *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a33651a812fe70c8229f395c2bb38b45c">beVisuals</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1288c3902e2e1f871947e854269562e8">beDefVisualIndex</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a3a70f31b272f686b4df2bb98e25f0902">beNumDefColormaps</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Colormap *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#acd24913b53592c9a65bbc52f43f7409a">beDefColormaps</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Pixel&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#adc481961d93d200f67ca722b32d17608">beBlackPixel</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Pixel&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aa57407aa11d2c07346bd6ad5b443a147">beWhitePixel</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a78c03cd265e1c64b0d4028f0b27f99c4">scrnWin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a25e823320e01d5c61c996a9e4f3c2920">scrnX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aec971ffcb8c7970610513deef57da9f0">scrnY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ac4c86f223d149ffda30a32ebaffee23a">scrnWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a2a1733427433e53a0df2575168ad0713">scrnHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a3035698819a0339095cd208595999aaf">scrnXSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aa4018bf5e24b7c3dd02bb8ccc808be2c">scrnYSign</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Drawable&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a0fdddca70b67ca947e663001ac3e398f">scrnDefDrawables</a> [MAXFORMATS]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a24d4641dc02b750b88eb56ced27269d3">next</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ac55a37b29ce99474516995b09f794d9c">over</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ae19c1b45f18c3880dac6fb101fc92127">rootWin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a94bafd201bf311e19fc17772e5ccdc28">rootX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#acd81762e240cca8a57c90ab7f423ca8f">rootY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1edc0ff1f4afd8176c237248da677350">rootWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a021f9c1883ae7d96bd47c53bc0bab428">rootHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aef812b4b6f76c93b8e800e9388330add">rootXOrigin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a89914c5858cebec13b2256ad02d787ac">rootYOrigin</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a873f1776988a437bcf2357e166005c48">shadow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a48314583a4bbbfaa66719330bdf4a91a">shadowGC</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XImage *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ae21672a36b84f8268c5e29d82fa07667">shadowFBImage</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1c960b58b8bb306b5fe14edc8d8c2b8d">shared</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1da213d4ad20ad28127f06632a8202aa">WMRunningOnBE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a148c7073ff8a41bee48e6c375e622bd9">noCursor</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aec1712642a093f935194bfe49d0d4050">curCursor</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CursorPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a7a61b71888a4d7c6eefa3cde29bbd677">cursor</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a68f4dfcb582f9470e09c10a6e21ec5e3">cursorVisible</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a83dd882008eb7e54cc81987a23ab9fd5">cursorNotShared</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a2cb225a5c08ae6ea0ce19d85616f143b">where</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a9d0572de80377c7ad7407dfb0cf22d8a">whereX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#aeb391a900f17b41e18127b4b31026c96">whereY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ae502ef7543f17556ea497ebbef157f41">whereRefScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a187aa2158f3a1e7b021cf1ea6f693c2f">savedTimeout</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a3f540a0bcac0e813a4b7ad3f34a19277">dpmsCapable</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a3ad975d6c25329c21456c1f880dc68f6">dpmsEnabled</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#abf64e2489557ef84c84c1e36b1fccb83">dpmsStandby</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a7dab70abf22a5ec34fced3ba2fbd25d0">dpmsSuspend</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a69a70ba630e23bab0141886f2d49eb31">dpmsOff</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a31fd04698ffcb2b53ffee82468cc2862">stat</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a2c3aa46a8fafabc0a9af28948055fcb0">needsSync</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CloseScreenProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a94a4815bc20535c8946876d2113b109e">CloseScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">SaveScreenProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a357f02026fd7a4d50e682c87554b15a7">SaveScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CreateGCProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a0608031d93f0f78df41e66fc8e8107cf">CreateGC</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CreateWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a19123a8915a37e821ef46bc63f646d8d">CreateWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DestroyWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a0d204177b5df7dab4a89741439728a56">DestroyWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">PositionWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#afad6bda7c2505a7fedabdf055f7838c5">PositionWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ChangeWindowAttributesProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a35d0114e24f9eeff1f5649bcb0b00d71">ChangeWindowAttributes</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RealizeWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a2b3ed1977ce205b1bb518393e1b434f6">RealizeWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">UnrealizeWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a7b72d30e072b0f1a5f1e89ae9c1155f0">UnrealizeWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RestackWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a8c16eedf083215c4076fcd8851cf6bc2">RestackWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">WindowExposuresProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a526c7fea5a2a39d325eab3fd4efb503d">WindowExposures</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CopyWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a8f1472064bae45d6b59bee2580a185aa">CopyWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ResizeWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a949c2799e41ad4f4384cc862df4022fd">ResizeWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ReparentWindowProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a71362d4473da8793f624eaa6a9ac61af">ReparentWindow</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ChangeBorderWidthProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a134b8b97ce93ef4601c972d0fb760e93">ChangeBorderWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GetImageProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ad622affb2a1524a15f9bad149fa88f30">GetImage</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GetSpansProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ad399c770af1784544ede0253593b3700">GetSpans</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CreatePixmapProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a88d8c787b8e05b4d69fa3d91f6456542">CreatePixmap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DestroyPixmapProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#adafeb1337d14d4f650098f3bd06214db">DestroyPixmap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">BitmapToRegionProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a1d29c3ada0aab8fbcd88c5ceaa48cf2d">BitmapToRegion</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">RealizeFontProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a22e93c0020eab3f889c54093ad32348e">RealizeFont</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">UnrealizeFontProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#af46646c951db10afab56244b5345a6d8">UnrealizeFont</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CreateColormapProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a082a4bae927eb9bbbd87cebdfd4d9dfc">CreateColormap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DestroyColormapProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a0a407c422f268db1da74672d572102bb">DestroyColormap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">InstallColormapProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ab5a18ace3bb18cbcc9e127f51c494006">InstallColormap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StoreColorsProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#addce695c56fcc40e89b5c5add6a09205">StoreColors</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">SetShapeProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ad4273ba541b4d7e50c967c42d80733bb">SetShape</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CreatePictureProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#adf17f1a03e6a5a127b02aaa9005d8089">CreatePicture</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DestroyPictureProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a31909a1072cd78345457bd6b0c81ac1c">DestroyPicture</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ChangePictureClipProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a62a21ad708a96cb1653e8d572895b1de">ChangePictureClip</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DestroyPictureClipProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ab643ec0c295421859733b8f654ff8ce7">DestroyPictureClip</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ChangePictureProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a933b5c32ef1671dae5acc1e96b7f34e3">ChangePicture</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">ValidatePictureProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a627ae18aeaa92da0923ab49803470c71">ValidatePicture</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CompositeProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a5e70f79e08b658092d83d266686c9a67">Composite</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GlyphsProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#ab2bf09e1d055cad3ecfb1b00ddadc89e">Glyphs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CompositeRectsProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a2b5509668e39153253b7d7d945dddecb">CompositeRects</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">InitIndexedProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#adaae790d6f5dd1dec98e57e2e669e3fd">InitIndexed</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CloseIndexedProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a99c75513907782d2679bd9e2ed327621">CloseIndexed</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">UpdateIndexedProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#afa11a2993fe14ec90db2de382cdeb25c">UpdateIndexed</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">TrapezoidsProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a4008b17ac4eb89816a8c2d3ce2e14421">Trapezoids</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">TrianglesProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#af37150652184c4865700576504ec9df9">Triangles</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">TriStripProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a5918dec3813c47c24f52f076f1b05dc4">TriStrip</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">TriFanProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXScreenInfo.html#a0829ea4299b5afcb1d2f2894334fed69">TriFan</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Global structure containing information about each backend screen. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="adc481961d93d200f67ca722b32d17608"></a><!-- doxytag: member="_DMXScreenInfo::beBlackPixel" ref="adc481961d93d200f67ca722b32d17608" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Pixel <a class="el" href="struct__DMXScreenInfo.html#adc481961d93d200f67ca722b32d17608">_DMXScreenInfo::beBlackPixel</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Default black pixel for BE </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5e865cb99dd73ba18991912af275994f"></a><!-- doxytag: member="_DMXScreenInfo::beBPP" ref="a5e865cb99dd73ba18991912af275994f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a5e865cb99dd73ba18991912af275994f">_DMXScreenInfo::beBPP</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Bits per pixel of BE display </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acd24913b53592c9a65bbc52f43f7409a"></a><!-- doxytag: member="_DMXScreenInfo::beDefColormaps" ref="acd24913b53592c9a65bbc52f43f7409a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Colormap* <a class="el" href="struct__DMXScreenInfo.html#acd24913b53592c9a65bbc52f43f7409a">_DMXScreenInfo::beDefColormaps</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Default colormaps for DMX server </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1288c3902e2e1f871947e854269562e8"></a><!-- doxytag: member="_DMXScreenInfo::beDefVisualIndex" ref="a1288c3902e2e1f871947e854269562e8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a1288c3902e2e1f871947e854269562e8">_DMXScreenInfo::beDefVisualIndex</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Default visual index of BE </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac435223f6a5921beab567cc23b83f07f"></a><!-- doxytag: member="_DMXScreenInfo::beDepth" ref="ac435223f6a5921beab567cc23b83f07f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#ac435223f6a5921beab567cc23b83f07f">_DMXScreenInfo::beDepth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Depth of BE display </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4e0c6ff0cf4b00ac0d7d1f3702343033"></a><!-- doxytag: member="_DMXScreenInfo::beDepths" ref="a4e0c6ff0cf4b00ac0d7d1f3702343033" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int* <a class="el" href="struct__DMXScreenInfo.html#a4e0c6ff0cf4b00ac0d7d1f3702343033">_DMXScreenInfo::beDepths</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Depths from BE server </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a756ade62a55a52f163a42db6de54c244"></a><!-- doxytag: member="_DMXScreenInfo::beDisplay" ref="a756ade62a55a52f163a42db6de54c244" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Display* <a class="el" href="struct__DMXScreenInfo.html#a756ade62a55a52f163a42db6de54c244">_DMXScreenInfo::beDisplay</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Back-end X server's display </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00695">_dmxUnrealizeCursor()</a>, <a class="el" href="dmxinit_8c_source.html#l00837">AbortDDX()</a>, <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00186">dmxBackendPendingMotionEvent()</a>, <a class="el" href="dmxbackend_8c_source.html#l00159">dmxBackendTestEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00168">dmxBackendTestMotionEvent()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>, <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxfont_8c_source.html#l00147">dmxCheckFontPath()</a>, <a class="el" href="dmxfont_8c_source.html#l00098">dmxCheckFontPathElement()</a>, <a class="el" href="dmxinit_8c_source.html#l00476">dmxCheckForWM()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, <a class="el" href="dmxcommon_8c_source.html#l00465">dmxCommonAddEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00471">dmxCommonRemoveEnabledDevice()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxcmap_8c_source.html#l00088">dmxCreateColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxcmap_8c_source.html#l00128">dmxDestroyColormap()</a>, <a class="el" href="dmxgc_8c_source.html#l00329">dmxDestroyGC()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01567">dmxDetachScreen()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>, <a class="el" href="dmxpict_8c_source.html#l00179">dmxFindFormat()</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxgcops_8c_source.html#l00554">dmxGetImage()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxvisual_8c_source.html#l00109">dmxLookupVisualFromID()</a>, <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00512">dmxSaveScreen()</a>, <a class="el" href="dmxfont_8c_source.html#l00114">dmxSetFontPath()</a>, <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>, <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>, <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a713ca6d9bf7a4527f442519554e1fc94"></a><!-- doxytag: member="_DMXScreenInfo::beHeight" ref="a713ca6d9bf7a4527f442519554e1fc94" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a713ca6d9bf7a4527f442519554e1fc94">_DMXScreenInfo::beHeight</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Height of BE display </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3a70f31b272f686b4df2bb98e25f0902"></a><!-- doxytag: member="_DMXScreenInfo::beNumDefColormaps" ref="a3a70f31b272f686b4df2bb98e25f0902" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a3a70f31b272f686b4df2bb98e25f0902">_DMXScreenInfo::beNumDefColormaps</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Number of default colormaps </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, and <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a896eeff4d8c92af936bbb1c24b8ad081"></a><!-- doxytag: member="_DMXScreenInfo::beNumDepths" ref="a896eeff4d8c92af936bbb1c24b8ad081" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a896eeff4d8c92af936bbb1c24b8ad081">_DMXScreenInfo::beNumDepths</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Number of depths on BE server </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6476a8960e2013a9502c326f8851071c"></a><!-- doxytag: member="_DMXScreenInfo::beNumPixmapFormats" ref="a6476a8960e2013a9502c326f8851071c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a6476a8960e2013a9502c326f8851071c">_DMXScreenInfo::beNumPixmapFormats</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Number of pixmap formats on BE </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, and <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4edb26469ac99eccb762f668615c4b83"></a><!-- doxytag: member="_DMXScreenInfo::beNumVisuals" ref="a4edb26469ac99eccb762f668615c4b83" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a4edb26469ac99eccb762f668615c4b83">_DMXScreenInfo::beNumVisuals</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Number of visuals on BE </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c13d3cbcad4da61fe677e96cb781543"></a><!-- doxytag: member="_DMXScreenInfo::bePixmapFormats" ref="a1c13d3cbcad4da61fe677e96cb781543" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XPixmapFormatValues* <a class="el" href="struct__DMXScreenInfo.html#a1c13d3cbcad4da61fe677e96cb781543">_DMXScreenInfo::bePixmapFormats</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Pixmap formats on BE </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00433">dmxGetPixmapFormats()</a>, and <a class="el" href="dmxinit_8c_source.html#l00444">dmxSetPixmapFormats()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a33651a812fe70c8229f395c2bb38b45c"></a><!-- doxytag: member="_DMXScreenInfo::beVisuals" ref="a33651a812fe70c8229f395c2bb38b45c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XVisualInfo* <a class="el" href="struct__DMXScreenInfo.html#a33651a812fe70c8229f395c2bb38b45c">_DMXScreenInfo::beVisuals</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Visuals from BE server </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, <a class="el" href="dmxvisual_8c_source.html#l00128">dmxColormapFromDefaultVisual()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxcb_8c_source.html#l00111">dmxConnectionBlockCallback()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>, <a class="el" href="dmxinit_8c_source.html#l00362">dmxGetVisualInfo()</a>, <a class="el" href="dmxvisual_8c_source.html#l00077">dmxLookupVisual()</a>, <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa57407aa11d2c07346bd6ad5b443a147"></a><!-- doxytag: member="_DMXScreenInfo::beWhitePixel" ref="aa57407aa11d2c07346bd6ad5b443a147" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Pixel <a class="el" href="struct__DMXScreenInfo.html#aa57407aa11d2c07346bd6ad5b443a147">_DMXScreenInfo::beWhitePixel</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Default white pixel for BE </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, and <a class="el" href="dmxinit_8c_source.html#l00412">dmxGetColormaps()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aaa160ae9fce9f7c58bb9f6c0a9709861"></a><!-- doxytag: member="_DMXScreenInfo::beWidth" ref="aaa160ae9fce9f7c58bb9f6c0a9709861" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aaa160ae9fce9f7c58bb9f6c0a9709861">_DMXScreenInfo::beWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Width of BE display </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00576">dmxBackendMouGetInfo()</a>, <a class="el" href="dmxextension_8c_source.html#l01010">dmxCompareScreens()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aef4fb640cf089a1ebbf87a144f25cd80"></a><!-- doxytag: member="_DMXScreenInfo::beXDPI" ref="aef4fb640cf089a1ebbf87a144f25cd80" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aef4fb640cf089a1ebbf87a144f25cd80">_DMXScreenInfo::beXDPI</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Horizontal dots per inch of BE </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>, and <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7646aaa7101d53566be4506a2c3b75fb"></a><!-- doxytag: member="_DMXScreenInfo::beYDPI" ref="a7646aaa7101d53566be4506a2c3b75fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a7646aaa7101d53566be4506a2c3b75fb">_DMXScreenInfo::beYDPI</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Vertical dots per inch of BE </p>
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, and <a class="el" href="dmxextension_8c_source.html#l00299">dmxUpdateScreenResources()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1d29c3ada0aab8fbcd88c5ceaa48cf2d"></a><!-- doxytag: member="_DMXScreenInfo::BitmapToRegion" ref="a1d29c3ada0aab8fbcd88c5ceaa48cf2d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">BitmapToRegionProcPtr <a class="el" href="struct__DMXScreenInfo.html#a1d29c3ada0aab8fbcd88c5ceaa48cf2d">_DMXScreenInfo::BitmapToRegion</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a134b8b97ce93ef4601c972d0fb760e93"></a><!-- doxytag: member="_DMXScreenInfo::ChangeBorderWidth" ref="a134b8b97ce93ef4601c972d0fb760e93" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">ChangeBorderWidthProcPtr <a class="el" href="struct__DMXScreenInfo.html#a134b8b97ce93ef4601c972d0fb760e93">_DMXScreenInfo::ChangeBorderWidth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a933b5c32ef1671dae5acc1e96b7f34e3"></a><!-- doxytag: member="_DMXScreenInfo::ChangePicture" ref="a933b5c32ef1671dae5acc1e96b7f34e3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">ChangePictureProcPtr <a class="el" href="struct__DMXScreenInfo.html#a933b5c32ef1671dae5acc1e96b7f34e3">_DMXScreenInfo::ChangePicture</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a62a21ad708a96cb1653e8d572895b1de"></a><!-- doxytag: member="_DMXScreenInfo::ChangePictureClip" ref="a62a21ad708a96cb1653e8d572895b1de" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">ChangePictureClipProcPtr <a class="el" href="struct__DMXScreenInfo.html#a62a21ad708a96cb1653e8d572895b1de">_DMXScreenInfo::ChangePictureClip</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a35d0114e24f9eeff1f5649bcb0b00d71"></a><!-- doxytag: member="_DMXScreenInfo::ChangeWindowAttributes" ref="a35d0114e24f9eeff1f5649bcb0b00d71" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">ChangeWindowAttributesProcPtr <a class="el" href="struct__DMXScreenInfo.html#a35d0114e24f9eeff1f5649bcb0b00d71">_DMXScreenInfo::ChangeWindowAttributes</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a99c75513907782d2679bd9e2ed327621"></a><!-- doxytag: member="_DMXScreenInfo::CloseIndexed" ref="a99c75513907782d2679bd9e2ed327621" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CloseIndexedProcPtr <a class="el" href="struct__DMXScreenInfo.html#a99c75513907782d2679bd9e2ed327621">_DMXScreenInfo::CloseIndexed</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a94a4815bc20535c8946876d2113b109e"></a><!-- doxytag: member="_DMXScreenInfo::CloseScreen" ref="a94a4815bc20535c8946876d2113b109e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CloseScreenProcPtr <a class="el" href="struct__DMXScreenInfo.html#a94a4815bc20535c8946876d2113b109e">_DMXScreenInfo::CloseScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Function pointers to wrapped screen functions </p>
+
+</div>
+</div>
+<a class="anchor" id="a5e70f79e08b658092d83d266686c9a67"></a><!-- doxytag: member="_DMXScreenInfo::Composite" ref="a5e70f79e08b658092d83d266686c9a67" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CompositeProcPtr <a class="el" href="struct__DMXScreenInfo.html#a5e70f79e08b658092d83d266686c9a67">_DMXScreenInfo::Composite</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2b5509668e39153253b7d7d945dddecb"></a><!-- doxytag: member="_DMXScreenInfo::CompositeRects" ref="a2b5509668e39153253b7d7d945dddecb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CompositeRectsProcPtr <a class="el" href="struct__DMXScreenInfo.html#a2b5509668e39153253b7d7d945dddecb">_DMXScreenInfo::CompositeRects</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8f1472064bae45d6b59bee2580a185aa"></a><!-- doxytag: member="_DMXScreenInfo::CopyWindow" ref="a8f1472064bae45d6b59bee2580a185aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CopyWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a8f1472064bae45d6b59bee2580a185aa">_DMXScreenInfo::CopyWindow</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a082a4bae927eb9bbbd87cebdfd4d9dfc"></a><!-- doxytag: member="_DMXScreenInfo::CreateColormap" ref="a082a4bae927eb9bbbd87cebdfd4d9dfc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CreateColormapProcPtr <a class="el" href="struct__DMXScreenInfo.html#a082a4bae927eb9bbbd87cebdfd4d9dfc">_DMXScreenInfo::CreateColormap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0608031d93f0f78df41e66fc8e8107cf"></a><!-- doxytag: member="_DMXScreenInfo::CreateGC" ref="a0608031d93f0f78df41e66fc8e8107cf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CreateGCProcPtr <a class="el" href="struct__DMXScreenInfo.html#a0608031d93f0f78df41e66fc8e8107cf">_DMXScreenInfo::CreateGC</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adf17f1a03e6a5a127b02aaa9005d8089"></a><!-- doxytag: member="_DMXScreenInfo::CreatePicture" ref="adf17f1a03e6a5a127b02aaa9005d8089" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CreatePictureProcPtr <a class="el" href="struct__DMXScreenInfo.html#adf17f1a03e6a5a127b02aaa9005d8089">_DMXScreenInfo::CreatePicture</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a88d8c787b8e05b4d69fa3d91f6456542"></a><!-- doxytag: member="_DMXScreenInfo::CreatePixmap" ref="a88d8c787b8e05b4d69fa3d91f6456542" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CreatePixmapProcPtr <a class="el" href="struct__DMXScreenInfo.html#a88d8c787b8e05b4d69fa3d91f6456542">_DMXScreenInfo::CreatePixmap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a19123a8915a37e821ef46bc63f646d8d"></a><!-- doxytag: member="_DMXScreenInfo::CreateWindow" ref="a19123a8915a37e821ef46bc63f646d8d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CreateWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a19123a8915a37e821ef46bc63f646d8d">_DMXScreenInfo::CreateWindow</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aec1712642a093f935194bfe49d0d4050"></a><!-- doxytag: member="_DMXScreenInfo::curCursor" ref="aec1712642a093f935194bfe49d0d4050" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Cursor <a class="el" href="struct__DMXScreenInfo.html#aec1712642a093f935194bfe49d0d4050">_DMXScreenInfo::curCursor</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o53">dpmsEnabled</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o54">dpmsStandby</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a7a61b71888a4d7c6eefa3cde29bbd677"></a><!-- doxytag: member="_DMXScreenInfo::cursor" ref="a7a61b71888a4d7c6eefa3cde29bbd677" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CursorPtr <a class="el" href="struct__DMXScreenInfo.html#a7a61b71888a4d7c6eefa3cde29bbd677">_DMXScreenInfo::cursor</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o55">dpmsSuspend</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o56">dpmsOff</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a83dd882008eb7e54cc81987a23ab9fd5"></a><!-- doxytag: member="_DMXScreenInfo::cursorNotShared" ref="a83dd882008eb7e54cc81987a23ab9fd5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a83dd882008eb7e54cc81987a23ab9fd5">_DMXScreenInfo::cursorNotShared</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o57">stat</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o58">needsSync</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a68f4dfcb582f9470e09c10a6e21ec5e3"></a><!-- doxytag: member="_DMXScreenInfo::cursorVisible" ref="a68f4dfcb582f9470e09c10a6e21ec5e3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a68f4dfcb582f9470e09c10a6e21ec5e3">_DMXScreenInfo::cursorVisible</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>CloseScreenProcPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__DMXScreenInfo.html#o59">CloseScreen</a></td></tr>
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>.</p>
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Global structure containing information about each backend screen. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o18" doxytag="_DMXScreenInfo::beBlackPixel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Pixel <a class="el" href="struct__DMXScreenInfo.html#o18">_DMXScreenInfo::beBlackPixel</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default black pixel for BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o6" doxytag="_DMXScreenInfo::beBPP" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a0a407c422f268db1da74672d572102bb"></a><!-- doxytag: member="_DMXScreenInfo::DestroyColormap" ref="a0a407c422f268db1da74672d572102bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o6">_DMXScreenInfo::beBPP</a>
+          <td class="memname">DestroyColormapProcPtr <a class="el" href="struct__DMXScreenInfo.html#a0a407c422f268db1da74672d572102bb">_DMXScreenInfo::DestroyColormap</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Bits per pixel of BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o17" doxytag="_DMXScreenInfo::beDefColormaps" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a31909a1072cd78345457bd6b0c81ac1c"></a><!-- doxytag: member="_DMXScreenInfo::DestroyPicture" ref="a31909a1072cd78345457bd6b0c81ac1c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Colormap* <a class="el" href="struct__DMXScreenInfo.html#o17">_DMXScreenInfo::beDefColormaps</a>
+          <td class="memname">DestroyPictureProcPtr <a class="el" href="struct__DMXScreenInfo.html#a31909a1072cd78345457bd6b0c81ac1c">_DMXScreenInfo::DestroyPicture</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default colormaps for DMX server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o15" doxytag="_DMXScreenInfo::beDefVisualIndex" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab643ec0c295421859733b8f654ff8ce7"></a><!-- doxytag: member="_DMXScreenInfo::DestroyPictureClip" ref="ab643ec0c295421859733b8f654ff8ce7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o15">_DMXScreenInfo::beDefVisualIndex</a>
+          <td class="memname">DestroyPictureClipProcPtr <a class="el" href="struct__DMXScreenInfo.html#ab643ec0c295421859733b8f654ff8ce7">_DMXScreenInfo::DestroyPictureClip</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default visual index of BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o5" doxytag="_DMXScreenInfo::beDepth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="adafeb1337d14d4f650098f3bd06214db"></a><!-- doxytag: member="_DMXScreenInfo::DestroyPixmap" ref="adafeb1337d14d4f650098f3bd06214db" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o5">_DMXScreenInfo::beDepth</a>
+          <td class="memname">DestroyPixmapProcPtr <a class="el" href="struct__DMXScreenInfo.html#adafeb1337d14d4f650098f3bd06214db">_DMXScreenInfo::DestroyPixmap</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Depth of BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o10" doxytag="_DMXScreenInfo::beDepths" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0d204177b5df7dab4a89741439728a56"></a><!-- doxytag: member="_DMXScreenInfo::DestroyWindow" ref="a0d204177b5df7dab4a89741439728a56" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int* <a class="el" href="struct__DMXScreenInfo.html#o10">_DMXScreenInfo::beDepths</a>
+          <td class="memname">DestroyWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a0d204177b5df7dab4a89741439728a56">_DMXScreenInfo::DestroyWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Depths from BE server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_DMXScreenInfo::beDisplay" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3f540a0bcac0e813a4b7ad3f34a19277"></a><!-- doxytag: member="_DMXScreenInfo::dpmsCapable" ref="a3f540a0bcac0e813a4b7ad3f34a19277" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Display* <a class="el" href="struct__DMXScreenInfo.html#o2">_DMXScreenInfo::beDisplay</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a3f540a0bcac0e813a4b7ad3f34a19277">_DMXScreenInfo::dpmsCapable</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Back-end X server's display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o4" doxytag="_DMXScreenInfo::beHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if backend is DPMS capable </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3ad975d6c25329c21456c1f880dc68f6"></a><!-- doxytag: member="_DMXScreenInfo::dpmsEnabled" ref="a3ad975d6c25329c21456c1f880dc68f6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o4">_DMXScreenInfo::beHeight</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a3ad975d6c25329c21456c1f880dc68f6">_DMXScreenInfo::dpmsEnabled</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Height of BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o16" doxytag="_DMXScreenInfo::beNumDefColormaps" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if DPMS enabled </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a69a70ba630e23bab0141886f2d49eb31"></a><!-- doxytag: member="_DMXScreenInfo::dpmsOff" ref="a69a70ba630e23bab0141886f2d49eb31" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o16">_DMXScreenInfo::beNumDefColormaps</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a69a70ba630e23bab0141886f2d49eb31">_DMXScreenInfo::dpmsOff</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of default colormaps     </td>
-  </tr>
-</table>
-<a class="anchor" name="o9" doxytag="_DMXScreenInfo::beNumDepths" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Original DPMS off value </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abf64e2489557ef84c84c1e36b1fccb83"></a><!-- doxytag: member="_DMXScreenInfo::dpmsStandby" ref="abf64e2489557ef84c84c1e36b1fccb83" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o9">_DMXScreenInfo::beNumDepths</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#abf64e2489557ef84c84c1e36b1fccb83">_DMXScreenInfo::dpmsStandby</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of depths on BE server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o11" doxytag="_DMXScreenInfo::beNumPixmapFormats" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Original DPMS standby value </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7dab70abf22a5ec34fced3ba2fbd25d0"></a><!-- doxytag: member="_DMXScreenInfo::dpmsSuspend" ref="a7dab70abf22a5ec34fced3ba2fbd25d0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o11">_DMXScreenInfo::beNumPixmapFormats</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a7dab70abf22a5ec34fced3ba2fbd25d0">_DMXScreenInfo::dpmsSuspend</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of pixmap formats on BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o13" doxytag="_DMXScreenInfo::beNumVisuals" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Original DPMS suspend value </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00059">_dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad622affb2a1524a15f9bad149fa88f30"></a><!-- doxytag: member="_DMXScreenInfo::GetImage" ref="ad622affb2a1524a15f9bad149fa88f30" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o13">_DMXScreenInfo::beNumVisuals</a>
+          <td class="memname">GetImageProcPtr <a class="el" href="struct__DMXScreenInfo.html#ad622affb2a1524a15f9bad149fa88f30">_DMXScreenInfo::GetImage</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Number of visuals on BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o12" doxytag="_DMXScreenInfo::bePixmapFormats" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad399c770af1784544ede0253593b3700"></a><!-- doxytag: member="_DMXScreenInfo::GetSpans" ref="ad399c770af1784544ede0253593b3700" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XPixmapFormatValues* <a class="el" href="struct__DMXScreenInfo.html#o12">_DMXScreenInfo::bePixmapFormats</a>
+          <td class="memname">GetSpansProcPtr <a class="el" href="struct__DMXScreenInfo.html#ad399c770af1784544ede0253593b3700">_DMXScreenInfo::GetSpans</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Pixmap formats on BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o14" doxytag="_DMXScreenInfo::beVisuals" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab2bf09e1d055cad3ecfb1b00ddadc89e"></a><!-- doxytag: member="_DMXScreenInfo::Glyphs" ref="ab2bf09e1d055cad3ecfb1b00ddadc89e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XVisualInfo* <a class="el" href="struct__DMXScreenInfo.html#o14">_DMXScreenInfo::beVisuals</a>
+          <td class="memname">GlyphsProcPtr <a class="el" href="struct__DMXScreenInfo.html#ab2bf09e1d055cad3ecfb1b00ddadc89e">_DMXScreenInfo::Glyphs</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Visuals from BE server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o19" doxytag="_DMXScreenInfo::beWhitePixel" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a28849096f73f9bf14bb7e461dbb5cc94"></a><!-- doxytag: member="_DMXScreenInfo::index" ref="a28849096f73f9bf14bb7e461dbb5cc94" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Pixel <a class="el" href="struct__DMXScreenInfo.html#o19">_DMXScreenInfo::beWhitePixel</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a28849096f73f9bf14bb7e461dbb5cc94">_DMXScreenInfo::index</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default white pixel for BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o3" doxytag="_DMXScreenInfo::beWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Index into dmxScreens global </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxbackend_8c_source.html#l00552">dmxBackendInit()</a>, <a class="el" href="dmxbackend_8c_source.html#l00120">dmxBackendTestScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxcursor_8c_source.html#l00920">dmxHideCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxdetach_8c_source.html#l00045">dmxInputDetach()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01198">dmxInputDetachAll()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adaae790d6f5dd1dec98e57e2e669e3fd"></a><!-- doxytag: member="_DMXScreenInfo::InitIndexed" ref="adaae790d6f5dd1dec98e57e2e669e3fd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o3">_DMXScreenInfo::beWidth</a>
+          <td class="memname">InitIndexedProcPtr <a class="el" href="struct__DMXScreenInfo.html#adaae790d6f5dd1dec98e57e2e669e3fd">_DMXScreenInfo::InitIndexed</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Width of BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7" doxytag="_DMXScreenInfo::beXDPI" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab5a18ace3bb18cbcc9e127f51c494006"></a><!-- doxytag: member="_DMXScreenInfo::InstallColormap" ref="ab5a18ace3bb18cbcc9e127f51c494006" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o7">_DMXScreenInfo::beXDPI</a>
+          <td class="memname">InstallColormapProcPtr <a class="el" href="struct__DMXScreenInfo.html#ab5a18ace3bb18cbcc9e127f51c494006">_DMXScreenInfo::InstallColormap</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Horizontal dots per inch of BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o8" doxytag="_DMXScreenInfo::beYDPI" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5cfc14ffedaafcbe5b00302f972208cf"></a><!-- doxytag: member="_DMXScreenInfo::name" ref="a5cfc14ffedaafcbe5b00302f972208cf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o8">_DMXScreenInfo::beYDPI</a>
+          <td class="memname">const char* <a class="el" href="struct__DMXScreenInfo.html#a5cfc14ffedaafcbe5b00302f972208cf">_DMXScreenInfo::name</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Vertical dots per inch of BE     </td>
-  </tr>
-</table>
-<a class="anchor" name="o59" doxytag="_DMXScreenInfo::CloseScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Name from command line or config file </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxinit_8c_source.html#l00492">dmxDisplayInit()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxlog_8c_source.html#l00114">dmxHeader()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxinputinit_8c_source.html#l01287">dmxInputAttachBackend()</a>, <a class="el" href="dmxinit_8c_source.html#l00195">dmxOpenDisplay()</a>, <a class="el" href="dmxcursor_8c_source.html#l00469">dmxPrintOverlap()</a>, <a class="el" href="dmxprop_8c_source.html#l00122">dmxPropertyCheckOtherServers()</a>, <a class="el" href="dmxprop_8c_source.html#l00181">dmxPropertyCheckOtherWindows()</a>, <a class="el" href="dmxprop_8c_source.html#l00253">dmxPropertySameDisplay()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, and <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2c3aa46a8fafabc0a9af28948055fcb0"></a><!-- doxytag: member="_DMXScreenInfo::needsSync" ref="a2c3aa46a8fafabc0a9af28948055fcb0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> CloseScreenProcPtr <a class="el" href="struct__DMXScreenInfo.html#o59">_DMXScreenInfo::CloseScreen</a>
+          <td class="memname">Bool <a class="el" href="struct__DMXScreenInfo.html#a2c3aa46a8fafabc0a9af28948055fcb0">_DMXScreenInfo::needsSync</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Function pointers to wrapped screen functions     </td>
-  </tr>
-</table>
-<a class="anchor" name="o52" doxytag="_DMXScreenInfo::dpmsCapable" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>True if an XSync is pending </p>
+
+<p>Referenced by <a class="el" href="dmxsync_8c_source.html#l00063">dmxDoSync()</a>, <a class="el" href="dmxsync_8c_source.html#l00150">dmxSync()</a>, and <a class="el" href="dmxsync_8c_source.html#l00082">dmxSyncCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a24d4641dc02b750b88eb56ced27269d3"></a><!-- doxytag: member="_DMXScreenInfo::next" ref="a24d4641dc02b750b88eb56ced27269d3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o52">_DMXScreenInfo::dpmsCapable</a>
+          <td class="memname">struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#a24d4641dc02b750b88eb56ced27269d3">_DMXScreenInfo::next</a><code> [read]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if backend is DPMS capable     </td>
-  </tr>
-</table>
-<a class="anchor" name="o53" doxytag="_DMXScreenInfo::dpmsEnabled" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of "screens" on same display </p>
+
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00098">dmxPropertyIterate()</a>, and <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a148c7073ff8a41bee48e6c375e622bd9"></a><!-- doxytag: member="_DMXScreenInfo::noCursor" ref="a148c7073ff8a41bee48e6c375e622bd9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o53">_DMXScreenInfo::dpmsEnabled</a>
+          <td class="memname">Cursor <a class="el" href="struct__DMXScreenInfo.html#a148c7073ff8a41bee48e6c375e622bd9">_DMXScreenInfo::noCursor</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if DPMS enabled     </td>
-  </tr>
-</table>
-<a class="anchor" name="o56" doxytag="_DMXScreenInfo::dpmsOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac55a37b29ce99474516995b09f794d9c"></a><!-- doxytag: member="_DMXScreenInfo::over" ref="ac55a37b29ce99474516995b09f794d9c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o56">_DMXScreenInfo::dpmsOff</a>
+          <td class="memname">struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#ac55a37b29ce99474516995b09f794d9c">_DMXScreenInfo::over</a><code> [read]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Original DPMS off value     </td>
-  </tr>
-</table>
-<a class="anchor" name="o54" doxytag="_DMXScreenInfo::dpmsStandby" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>List of "screens" that overlap </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, <a class="el" href="dmxcursor_8c_source.html#l00793">dmxFindCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00515">dmxInitOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00484">dmxIterateOverlap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00757">dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00775">dmxUnrealizeCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afad6bda7c2505a7fedabdf055f7838c5"></a><!-- doxytag: member="_DMXScreenInfo::PositionWindow" ref="afad6bda7c2505a7fedabdf055f7838c5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o54">_DMXScreenInfo::dpmsStandby</a>
+          <td class="memname">PositionWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#afad6bda7c2505a7fedabdf055f7838c5">_DMXScreenInfo::PositionWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Original DPMS standby value     </td>
-  </tr>
-</table>
-<a class="anchor" name="o55" doxytag="_DMXScreenInfo::dpmsSuspend" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a22e93c0020eab3f889c54093ad32348e"></a><!-- doxytag: member="_DMXScreenInfo::RealizeFont" ref="a22e93c0020eab3f889c54093ad32348e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o55">_DMXScreenInfo::dpmsSuspend</a>
+          <td class="memname">RealizeFontProcPtr <a class="el" href="struct__DMXScreenInfo.html#a22e93c0020eab3f889c54093ad32348e">_DMXScreenInfo::RealizeFont</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Original DPMS suspend value     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_DMXScreenInfo::index" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2b3ed1977ce205b1bb518393e1b434f6"></a><!-- doxytag: member="_DMXScreenInfo::RealizeWindow" ref="a2b3ed1977ce205b1bb518393e1b434f6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o1">_DMXScreenInfo::index</a>
+          <td class="memname">RealizeWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a2b3ed1977ce205b1bb518393e1b434f6">_DMXScreenInfo::RealizeWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Index into dmxScreens global     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0" doxytag="_DMXScreenInfo::name" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a71362d4473da8793f624eaa6a9ac61af"></a><!-- doxytag: member="_DMXScreenInfo::ReparentWindow" ref="a71362d4473da8793f624eaa6a9ac61af" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char* <a class="el" href="struct__DMXScreenInfo.html#o0">_DMXScreenInfo::name</a>
+          <td class="memname">ReparentWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a71362d4473da8793f624eaa6a9ac61af">_DMXScreenInfo::ReparentWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Name from command line or config file     </td>
-  </tr>
-</table>
-<a class="anchor" name="o58" doxytag="_DMXScreenInfo::needsSync" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a949c2799e41ad4f4384cc862df4022fd"></a><!-- doxytag: member="_DMXScreenInfo::ResizeWindow" ref="a949c2799e41ad4f4384cc862df4022fd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__DMXScreenInfo.html#o58">_DMXScreenInfo::needsSync</a>
+          <td class="memname">ResizeWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a949c2799e41ad4f4384cc862df4022fd">_DMXScreenInfo::ResizeWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if an XSync is pending     </td>
-  </tr>
-</table>
-<a class="anchor" name="o28" doxytag="_DMXScreenInfo::next" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8c16eedf083215c4076fcd8851cf6bc2"></a><!-- doxytag: member="_DMXScreenInfo::RestackWindow" ref="a8c16eedf083215c4076fcd8851cf6bc2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#o28">_DMXScreenInfo::next</a>
+          <td class="memname">RestackWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a8c16eedf083215c4076fcd8851cf6bc2">_DMXScreenInfo::RestackWindow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of "screens" on same display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o29" doxytag="_DMXScreenInfo::over" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a021f9c1883ae7d96bd47c53bc0bab428"></a><!-- doxytag: member="_DMXScreenInfo::rootHeight" ref="a021f9c1883ae7d96bd47c53bc0bab428" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> struct <a class="el" href="struct__DMXScreenInfo.html">_DMXScreenInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#o29">_DMXScreenInfo::over</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a021f9c1883ae7d96bd47c53bc0bab428">_DMXScreenInfo::rootHeight</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-List of "screens" that overlap     </td>
-  </tr>
-</table>
-<a class="anchor" name="o34" doxytag="_DMXScreenInfo::rootHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Height of "root" window </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1edc0ff1f4afd8176c237248da677350"></a><!-- doxytag: member="_DMXScreenInfo::rootWidth" ref="a1edc0ff1f4afd8176c237248da677350" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o34">_DMXScreenInfo::rootHeight</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a1edc0ff1f4afd8176c237248da677350">_DMXScreenInfo::rootWidth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Height of "root" window     </td>
-  </tr>
-</table>
-<a class="anchor" name="o33" doxytag="_DMXScreenInfo::rootWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Width of "root" window </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae19c1b45f18c3880dac6fb101fc92127"></a><!-- doxytag: member="_DMXScreenInfo::rootWin" ref="ae19c1b45f18c3880dac6fb101fc92127" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o33">_DMXScreenInfo::rootWidth</a>
+          <td class="memname">Window <a class="el" href="struct__DMXScreenInfo.html#ae19c1b45f18c3880dac6fb101fc92127">_DMXScreenInfo::rootWin</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Width of "root" window     </td>
-  </tr>
-</table>
-<a class="anchor" name="o30" doxytag="_DMXScreenInfo::rootWin" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>"Root" window on backend display </p>
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94bafd201bf311e19fc17772e5ccdc28"></a><!-- doxytag: member="_DMXScreenInfo::rootX" ref="a94bafd201bf311e19fc17772e5ccdc28" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Window <a class="el" href="struct__DMXScreenInfo.html#o30">_DMXScreenInfo::rootWin</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a94bafd201bf311e19fc17772e5ccdc28">_DMXScreenInfo::rootX</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-"Root" window on backend display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o31" doxytag="_DMXScreenInfo::rootX" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>X offset of "root" window WRT "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aef812b4b6f76c93b8e800e9388330add"></a><!-- doxytag: member="_DMXScreenInfo::rootXOrigin" ref="aef812b4b6f76c93b8e800e9388330add" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o31">_DMXScreenInfo::rootX</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aef812b4b6f76c93b8e800e9388330add">_DMXScreenInfo::rootXOrigin</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-X offset of "root" window WRT "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o35" doxytag="_DMXScreenInfo::rootXOrigin" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Global X origin of "root" window </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acd81762e240cca8a57c90ab7f423ca8f"></a><!-- doxytag: member="_DMXScreenInfo::rootY" ref="acd81762e240cca8a57c90ab7f423ca8f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o35">_DMXScreenInfo::rootXOrigin</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#acd81762e240cca8a57c90ab7f423ca8f">_DMXScreenInfo::rootY</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Global X origin of "root" window     </td>
-  </tr>
-</table>
-<a class="anchor" name="o32" doxytag="_DMXScreenInfo::rootY" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Y offset of "root" window WRT "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a89914c5858cebec13b2256ad02d787ac"></a><!-- doxytag: member="_DMXScreenInfo::rootYOrigin" ref="a89914c5858cebec13b2256ad02d787ac" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o32">_DMXScreenInfo::rootY</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a89914c5858cebec13b2256ad02d787ac">_DMXScreenInfo::rootYOrigin</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Y offset of "root" window WRT "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o36" doxytag="_DMXScreenInfo::rootYOrigin" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Global Y origin of "root" window </p>
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxcursor_8c_source.html#l00931">dmxCheckCursor()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxevents_8c_source.html#l00194">dmxCoreMotion()</a>, <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00817">dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00864">dmxSetCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a187aa2158f3a1e7b021cf1ea6f693c2f"></a><!-- doxytag: member="_DMXScreenInfo::savedTimeout" ref="a187aa2158f3a1e7b021cf1ea6f693c2f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o36">_DMXScreenInfo::rootYOrigin</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a187aa2158f3a1e7b021cf1ea6f693c2f">_DMXScreenInfo::savedTimeout</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Global Y origin of "root" window     </td>
-  </tr>
-</table>
-<a class="anchor" name="o51" doxytag="_DMXScreenInfo::savedTimeout" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Original screen saver timeout </p>
+
+<p>Referenced by <a class="el" href="dmxdpms_8c_source.html#l00130">dmxDPMSInit()</a>, and <a class="el" href="dmxdpms_8c_source.html#l00151">dmxDPMSTerm()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a357f02026fd7a4d50e682c87554b15a7"></a><!-- doxytag: member="_DMXScreenInfo::SaveScreen" ref="a357f02026fd7a4d50e682c87554b15a7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o51">_DMXScreenInfo::savedTimeout</a>
+          <td class="memname">SaveScreenProcPtr <a class="el" href="struct__DMXScreenInfo.html#a357f02026fd7a4d50e682c87554b15a7">_DMXScreenInfo::SaveScreen</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Original screen saver timeout     </td>
-  </tr>
-</table>
-<a class="anchor" name="o27" doxytag="_DMXScreenInfo::scrnDefDrawables" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0fdddca70b67ca947e663001ac3e398f"></a><!-- doxytag: member="_DMXScreenInfo::scrnDefDrawables" ref="a0fdddca70b67ca947e663001ac3e398f" args="[MAXFORMATS]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Drawable <a class="el" href="struct__DMXScreenInfo.html#o27">_DMXScreenInfo::scrnDefDrawables</a>[MAXFORMATS]
+          <td class="memname">Drawable <a class="el" href="struct__DMXScreenInfo.html#a0fdddca70b67ca947e663001ac3e398f">_DMXScreenInfo::scrnDefDrawables</a>[MAXFORMATS]</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default drawables for "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o24" doxytag="_DMXScreenInfo::scrnHeight" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Default drawables for "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2a1733427433e53a0df2575168ad0713"></a><!-- doxytag: member="_DMXScreenInfo::scrnHeight" ref="a2a1733427433e53a0df2575168ad0713" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o24">_DMXScreenInfo::scrnHeight</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a2a1733427433e53a0df2575168ad0713">_DMXScreenInfo::scrnHeight</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Height of "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o23" doxytag="_DMXScreenInfo::scrnWidth" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Height of "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac4c86f223d149ffda30a32ebaffee23a"></a><!-- doxytag: member="_DMXScreenInfo::scrnWidth" ref="ac4c86f223d149ffda30a32ebaffee23a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o23">_DMXScreenInfo::scrnWidth</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#ac4c86f223d149ffda30a32ebaffee23a">_DMXScreenInfo::scrnWidth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Width of "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o20" doxytag="_DMXScreenInfo::scrnWin" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Width of "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxcb_8c_source.html#l00069">dmxComputeWidthHeight()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxcursor_8c_source.html#l00430">dmxDoesOverlap()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a78c03cd265e1c64b0d4028f0b27f99c4"></a><!-- doxytag: member="_DMXScreenInfo::scrnWin" ref="a78c03cd265e1c64b0d4028f0b27f99c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Window <a class="el" href="struct__DMXScreenInfo.html#o20">_DMXScreenInfo::scrnWin</a>
+          <td class="memname">Window <a class="el" href="struct__DMXScreenInfo.html#a78c03cd265e1c64b0d4028f0b27f99c4">_DMXScreenInfo::scrnWin</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-"Screen" window on backend display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o21" doxytag="_DMXScreenInfo::scrnX" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>"Screen" window on backend display </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00711">_dmxMoveCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxbackend_8c_source.html#l00335">dmxBackendCollectEvents()</a>, <a class="el" href="dmxbackend_8c_source.html#l00508">dmxBackendInitPrivate()</a>, <a class="el" href="dmxbackend_8c_source.html#l00199">dmxBackendTestWindow()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxcommon_8c_source.html#l00458">dmxCommonXSelect()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxprop_8c_source.html#l00315">dmxPropertyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00120">dmxResizeScreenWindow()</a>, and <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25e823320e01d5c61c996a9e4f3c2920"></a><!-- doxytag: member="_DMXScreenInfo::scrnX" ref="a25e823320e01d5c61c996a9e4f3c2920" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o21">_DMXScreenInfo::scrnX</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a25e823320e01d5c61c996a9e4f3c2920">_DMXScreenInfo::scrnX</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-X offset of "screen" WRT BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o25" doxytag="_DMXScreenInfo::scrnXSign" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>X offset of "screen" WRT BE display </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3035698819a0339095cd208595999aaf"></a><!-- doxytag: member="_DMXScreenInfo::scrnXSign" ref="a3035698819a0339095cd208595999aaf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o25">_DMXScreenInfo::scrnXSign</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a3035698819a0339095cd208595999aaf">_DMXScreenInfo::scrnXSign</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-X offset sign of "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o22" doxytag="_DMXScreenInfo::scrnY" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>X offset sign of "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, and <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aec971ffcb8c7970610513deef57da9f0"></a><!-- doxytag: member="_DMXScreenInfo::scrnY" ref="aec971ffcb8c7970610513deef57da9f0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o22">_DMXScreenInfo::scrnY</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aec971ffcb8c7970610513deef57da9f0">_DMXScreenInfo::scrnY</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Y offset of "screen" WRT BE display     </td>
-  </tr>
-</table>
-<a class="anchor" name="o26" doxytag="_DMXScreenInfo::scrnYSign" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Y offset of "screen" WRT BE display </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>, <a class="el" href="dmxextension_8c_source.html#l00075">dmxGetScreenAttributes()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, <a class="el" href="dmxcursor_8c_source.html#l00410">dmxOnScreen()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00343">dmxReInitOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa4018bf5e24b7c3dd02bb8ccc808be2c"></a><!-- doxytag: member="_DMXScreenInfo::scrnYSign" ref="aa4018bf5e24b7c3dd02bb8ccc808be2c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o26">_DMXScreenInfo::scrnYSign</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aa4018bf5e24b7c3dd02bb8ccc808be2c">_DMXScreenInfo::scrnYSign</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Y offset sign of "screen"     </td>
-  </tr>
-</table>
-<a class="anchor" name="o37" doxytag="_DMXScreenInfo::shadow" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Y offset sign of "screen" </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, and <a class="el" href="dmxinit_8c_source.html#l00285">dmxGetScreenAttribs()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad4273ba541b4d7e50c967c42d80733bb"></a><!-- doxytag: member="_DMXScreenInfo::SetShape" ref="ad4273ba541b4d7e50c967c42d80733bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void* <a class="el" href="struct__DMXScreenInfo.html#o37">_DMXScreenInfo::shadow</a>
+          <td class="memname">SetShapeProcPtr <a class="el" href="struct__DMXScreenInfo.html#ad4273ba541b4d7e50c967c42d80733bb">_DMXScreenInfo::SetShape</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Shadow framebuffer data (if enabled)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o39" doxytag="_DMXScreenInfo::shadowFBImage" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a873f1776988a437bcf2357e166005c48"></a><!-- doxytag: member="_DMXScreenInfo::shadow" ref="a873f1776988a437bcf2357e166005c48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XImage* <a class="el" href="struct__DMXScreenInfo.html#o39">_DMXScreenInfo::shadowFBImage</a>
+          <td class="memname">void* <a class="el" href="struct__DMXScreenInfo.html#a873f1776988a437bcf2357e166005c48">_DMXScreenInfo::shadow</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Screen image used by shadow FB code     </td>
-  </tr>
-</table>
-<a class="anchor" name="o38" doxytag="_DMXScreenInfo::shadowGC" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Shadow framebuffer data (if enabled) </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00432">dmxCloseScreen()</a>, and <a class="el" href="dmxscrinit_8c_source.html#l00212">dmxScreenInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae21672a36b84f8268c5e29d82fa07667"></a><!-- doxytag: member="_DMXScreenInfo::shadowFBImage" ref="ae21672a36b84f8268c5e29d82fa07667" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> XlibGC <a class="el" href="struct__DMXScreenInfo.html#o38">_DMXScreenInfo::shadowGC</a>
+          <td class="memname">XImage* <a class="el" href="struct__DMXScreenInfo.html#ae21672a36b84f8268c5e29d82fa07667">_DMXScreenInfo::shadowFBImage</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Default GC used by shadow FB code     </td>
-  </tr>
-</table>
-<a class="anchor" name="o40" doxytag="_DMXScreenInfo::shared" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Screen image used by shadow FB code </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, and <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a48314583a4bbbfaa66719330bdf4a91a"></a><!-- doxytag: member="_DMXScreenInfo::shadowGC" ref="a48314583a4bbbfaa66719330bdf4a91a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o40">_DMXScreenInfo::shared</a>
+          <td class="memname">XlibGC <a class="el" href="struct__DMXScreenInfo.html#a48314583a4bbbfaa66719330bdf4a91a">_DMXScreenInfo::shadowGC</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Non-zero if another Xdmx is running     </td>
-  </tr>
-</table>
-<a class="anchor" name="o57" doxytag="_DMXScreenInfo::stat" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Default GC used by shadow FB code </p>
+
+<p>Referenced by <a class="el" href="dmxscrinit_8c_source.html#l00365">dmxBECloseScreen()</a>, <a class="el" href="dmxscrinit_8c_source.html#l00090">dmxBEScreenInit()</a>, and <a class="el" href="dmxshadow_8c_source.html#l00047">dmxShadowUpdateProc()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1c960b58b8bb306b5fe14edc8d8c2b8d"></a><!-- doxytag: member="_DMXScreenInfo::shared" ref="a1c960b58b8bb306b5fe14edc8d8c2b8d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#o57">_DMXScreenInfo::stat</a>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a1c960b58b8bb306b5fe14edc8d8c2b8d">_DMXScreenInfo::shared</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Statistics about XSync     </td>
-  </tr>
-</table>
-<a class="anchor" name="o47" doxytag="_DMXScreenInfo::where" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Non-zero if another Xdmx is running </p>
+
+<p>Referenced by <a class="el" href="dmxprop_8c_source.html#l00229">dmxPropertyDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a31fd04698ffcb2b53ffee82468cc2862"></a><!-- doxytag: member="_DMXScreenInfo::stat" ref="a31fd04698ffcb2b53ffee82468cc2862" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> PositionType <a class="el" href="struct__DMXScreenInfo.html#o47">_DMXScreenInfo::where</a>
+          <td class="memname"><a class="el" href="struct__DMXStatInfo.html">DMXStatInfo</a>* <a class="el" href="struct__DMXScreenInfo.html#a31fd04698ffcb2b53ffee82468cc2862">_DMXScreenInfo::stat</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Relative layout information     </td>
-  </tr>
-</table>
-<a class="anchor" name="o50" doxytag="_DMXScreenInfo::whereRefScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<p>Statistics about XSync </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00176">dmxConfigAddDisplay()</a>, <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>, and <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="addce695c56fcc40e89b5c5add6a09205"></a><!-- doxytag: member="_DMXScreenInfo::StoreColors" ref="addce695c56fcc40e89b5c5add6a09205" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o50">_DMXScreenInfo::whereRefScreen</a>
+          <td class="memname">StoreColorsProcPtr <a class="el" href="struct__DMXScreenInfo.html#addce695c56fcc40e89b5c5add6a09205">_DMXScreenInfo::StoreColors</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Relative layout information     </td>
-  </tr>
-</table>
-<a class="anchor" name="o48" doxytag="_DMXScreenInfo::whereX" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a4008b17ac4eb89816a8c2d3ce2e14421"></a><!-- doxytag: member="_DMXScreenInfo::Trapezoids" ref="a4008b17ac4eb89816a8c2d3ce2e14421" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o48">_DMXScreenInfo::whereX</a>
+          <td class="memname">TrapezoidsProcPtr <a class="el" href="struct__DMXScreenInfo.html#a4008b17ac4eb89816a8c2d3ce2e14421">_DMXScreenInfo::Trapezoids</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Relative layout information     </td>
-  </tr>
-</table>
-<a class="anchor" name="o49" doxytag="_DMXScreenInfo::whereY" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af37150652184c4865700576504ec9df9"></a><!-- doxytag: member="_DMXScreenInfo::Triangles" ref="af37150652184c4865700576504ec9df9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__DMXScreenInfo.html#o49">_DMXScreenInfo::whereY</a>
+          <td class="memname">TrianglesProcPtr <a class="el" href="struct__DMXScreenInfo.html#af37150652184c4865700576504ec9df9">_DMXScreenInfo::Triangles</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Relative layout information     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmx_8h-source.html">dmx.h</a></ul>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0829ea4299b5afcb1d2f2894334fed69"></a><!-- doxytag: member="_DMXScreenInfo::TriFan" ref="a0829ea4299b5afcb1d2f2894334fed69" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">TriFanProcPtr <a class="el" href="struct__DMXScreenInfo.html#a0829ea4299b5afcb1d2f2894334fed69">_DMXScreenInfo::TriFan</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5918dec3813c47c24f52f076f1b05dc4"></a><!-- doxytag: member="_DMXScreenInfo::TriStrip" ref="a5918dec3813c47c24f52f076f1b05dc4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">TriStripProcPtr <a class="el" href="struct__DMXScreenInfo.html#a5918dec3813c47c24f52f076f1b05dc4">_DMXScreenInfo::TriStrip</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af46646c951db10afab56244b5345a6d8"></a><!-- doxytag: member="_DMXScreenInfo::UnrealizeFont" ref="af46646c951db10afab56244b5345a6d8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">UnrealizeFontProcPtr <a class="el" href="struct__DMXScreenInfo.html#af46646c951db10afab56244b5345a6d8">_DMXScreenInfo::UnrealizeFont</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7b72d30e072b0f1a5f1e89ae9c1155f0"></a><!-- doxytag: member="_DMXScreenInfo::UnrealizeWindow" ref="a7b72d30e072b0f1a5f1e89ae9c1155f0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">UnrealizeWindowProcPtr <a class="el" href="struct__DMXScreenInfo.html#a7b72d30e072b0f1a5f1e89ae9c1155f0">_DMXScreenInfo::UnrealizeWindow</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="afa11a2993fe14ec90db2de382cdeb25c"></a><!-- doxytag: member="_DMXScreenInfo::UpdateIndexed" ref="afa11a2993fe14ec90db2de382cdeb25c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">UpdateIndexedProcPtr <a class="el" href="struct__DMXScreenInfo.html#afa11a2993fe14ec90db2de382cdeb25c">_DMXScreenInfo::UpdateIndexed</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a627ae18aeaa92da0923ab49803470c71"></a><!-- doxytag: member="_DMXScreenInfo::ValidatePicture" ref="a627ae18aeaa92da0923ab49803470c71" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">ValidatePictureProcPtr <a class="el" href="struct__DMXScreenInfo.html#a627ae18aeaa92da0923ab49803470c71">_DMXScreenInfo::ValidatePicture</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2cb225a5c08ae6ea0ce19d85616f143b"></a><!-- doxytag: member="_DMXScreenInfo::where" ref="a2cb225a5c08ae6ea0ce19d85616f143b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="dmx_8h.html#aa80fe4e9a559009407475c9587214b48">PositionType</a> <a class="el" href="struct__DMXScreenInfo.html#a2cb225a5c08ae6ea0ce19d85616f143b">_DMXScreenInfo::where</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Relative layout information </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae502ef7543f17556ea497ebbef157f41"></a><!-- doxytag: member="_DMXScreenInfo::whereRefScreen" ref="ae502ef7543f17556ea497ebbef157f41" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#ae502ef7543f17556ea497ebbef157f41">_DMXScreenInfo::whereRefScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Relative layout information </p>
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00299">dmxComputeScreenOrigins()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d0572de80377c7ad7407dfb0cf22d8a"></a><!-- doxytag: member="_DMXScreenInfo::whereX" ref="a9d0572de80377c7ad7407dfb0cf22d8a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#a9d0572de80377c7ad7407dfb0cf22d8a">_DMXScreenInfo::whereX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Relative layout information </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aeb391a900f17b41e18127b4b31026c96"></a><!-- doxytag: member="_DMXScreenInfo::whereY" ref="aeb391a900f17b41e18127b4b31026c96" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXScreenInfo.html#aeb391a900f17b41e18127b4b31026c96">_DMXScreenInfo::whereY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Relative layout information </p>
+
+<p>Referenced by <a class="el" href="dmxconfig_8c_source.html#l00232">dmxConfigCopyFromDisplay()</a>, <a class="el" href="dmxconfig_8c_source.html#l00248">dmxConfigCopyFromWall()</a>, <a class="el" href="dmxconfig_8c_source.html#l00361">dmxConfigFromCommandLine()</a>, <a class="el" href="dmxcursor_8c_source.html#l00371">dmxInitOrigins()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00231">dmxTryComputeScreenOrigins()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a526c7fea5a2a39d325eab3fd4efb503d"></a><!-- doxytag: member="_DMXScreenInfo::WindowExposures" ref="a526c7fea5a2a39d325eab3fd4efb503d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">WindowExposuresProcPtr <a class="el" href="struct__DMXScreenInfo.html#a526c7fea5a2a39d325eab3fd4efb503d">_DMXScreenInfo::WindowExposures</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a1da213d4ad20ad28127f06632a8202aa"></a><!-- doxytag: member="_DMXScreenInfo::WMRunningOnBE" ref="a1da213d4ad20ad28127f06632a8202aa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__DMXScreenInfo.html#a1da213d4ad20ad28127f06632a8202aa">_DMXScreenInfo::WMRunningOnBE</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00476">dmxCheckForWM()</a>, and <a class="el" href="dmxinit_8c_source.html#l00209">dmxPrintScreenInfo()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmx_8h_source.html">dmx.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html b/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html
index feb264dcb..7fcb44ae7 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXStatAvg.html
@@ -6,16 +6,82 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXStatAvg Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXStatAvg Struct Reference</h1><!-- doxytag: class="_DMXStatAvg" --><table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatAvg.html#a4ee50be7c55ef55ea0e8ca9edaf2ac52">pos</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatAvg.html#a361c10829231fd6805e59232321de2fe">count</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatAvg.html#a621cad02496227c50cc76aca84037b47">value</a> [DMX_STAT_LENGTH]</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Used to compute a running average of value. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxstat_8c.html">dmxstat.c</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Used to compute a running average of value. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a361c10829231fd6805e59232321de2fe"></a><!-- doxytag: member="_DMXStatAvg::count" ref="a361c10829231fd6805e59232321de2fe" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXStatAvg.html#a361c10829231fd6805e59232321de2fe">_DMXStatAvg::count</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00085">avg()</a>, and <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4ee50be7c55ef55ea0e8ca9edaf2ac52"></a><!-- doxytag: member="_DMXStatAvg::pos" ref="a4ee50be7c55ef55ea0e8ca9edaf2ac52" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__DMXStatAvg.html#a4ee50be7c55ef55ea0e8ca9edaf2ac52">_DMXStatAvg::pos</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a621cad02496227c50cc76aca84037b47"></a><!-- doxytag: member="_DMXStatAvg::value" ref="a621cad02496227c50cc76aca84037b47" args="[DMX_STAT_LENGTH]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__DMXStatAvg.html#a621cad02496227c50cc76aca84037b47">_DMXStatAvg::value</a>[DMX_STAT_LENGTH]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00085">avg()</a>, and <a class="el" href="dmxstat_8c_source.html#l00128">dmxStatValue()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxstat_8c.html">dmxstat.c</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html b/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html
index eff756130..3a0fd0540 100644
--- a/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html
+++ b/xorg-server/hw/dmx/doc/html/struct__DMXStatInfo.html
@@ -6,16 +6,114 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_DMXStatInfo Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_DMXStatInfo Struct Reference</h1><!-- doxytag: class="_DMXStatInfo" --><table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html#aa08d83f9455dcc98919fbc0085483aea">syncCount</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html#a06c2832f03e95a2139099bbec7bd4794">oldSyncCount</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html#a4ed02fb0dd6e7e5ac3af88019331a895">usec</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html#a316b8214c93a5762b6dbd06a7617ef3c">pending</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__DMXStatInfo.html#a948f8674bc28129ad022a7678d81b38a">bins</a> [DMX_STAT_BINS]</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Statistical information about XSync calls. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxstat_8c.html">dmxstat.c</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Statistical information about XSync calls. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a948f8674bc28129ad022a7678d81b38a"></a><!-- doxytag: member="_DMXStatInfo::bins" ref="a948f8674bc28129ad022a7678d81b38a" args="[DMX_STAT_BINS]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__DMXStatInfo.html#a948f8674bc28129ad022a7678d81b38a">_DMXStatInfo::bins</a>[DMX_STAT_BINS]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a06c2832f03e95a2139099bbec7bd4794"></a><!-- doxytag: member="_DMXStatInfo::oldSyncCount" ref="a06c2832f03e95a2139099bbec7bd4794" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__DMXStatInfo.html#a06c2832f03e95a2139099bbec7bd4794">_DMXStatInfo::oldSyncCount</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a316b8214c93a5762b6dbd06a7617ef3c"></a><!-- doxytag: member="_DMXStatInfo::pending" ref="a316b8214c93a5762b6dbd06a7617ef3c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> <a class="el" href="struct__DMXStatInfo.html#a316b8214c93a5762b6dbd06a7617ef3c">_DMXStatInfo::pending</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa08d83f9455dcc98919fbc0085483aea"></a><!-- doxytag: member="_DMXStatInfo::syncCount" ref="aa08d83f9455dcc98919fbc0085483aea" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__DMXStatInfo.html#aa08d83f9455dcc98919fbc0085483aea">_DMXStatInfo::syncCount</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4ed02fb0dd6e7e5ac3af88019331a895"></a><!-- doxytag: member="_DMXStatInfo::usec" ref="a4ed02fb0dd6e7e5ac3af88019331a895" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXStatAvg.html">DMXStatAvg</a> <a class="el" href="struct__DMXStatInfo.html#a4ed02fb0dd6e7e5ac3af88019331a895">_DMXStatInfo::usec</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxstat_8c_source.html#l00163">dmxStatCallback()</a>, and <a class="el" href="dmxstat_8c_source.html#l00139">dmxStatSync()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxstat_8c.html">dmxstat.c</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__Event.html b/xorg-server/hw/dmx/doc/html/struct__Event.html
deleted file mode 100644
index cb9b65bc3..000000000
--- a/xorg-server/hw/dmx/doc/html/struct__Event.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_Event Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>xEvent&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__Event.html#o0">event</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>ScreenPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__Event.html#o1">pScreen</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>deviceValuator&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__Event.html#o2">valuator</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Information about the event. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0" doxytag="_Event::event" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> xEvent <a class="el" href="struct__Event.html#o0">_Event::event</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Event.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_Event::pScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> ScreenPtr <a class="el" href="struct__Event.html#o1">_Event::pScreen</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Screen on which event occurred.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_Event::valuator" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> deviceValuator <a class="el" href="struct__Event.html#o2">_Event::valuator</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-XInput device valuator information.     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxeq_8c.html">dmxeq.c</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/struct__EventQueue.html b/xorg-server/hw/dmx/doc/html/struct__EventQueue.html
deleted file mode 100644
index abcc33aa2..000000000
--- a/xorg-server/hw/dmx/doc/html/struct__EventQueue.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_EventQueue Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>HWEventQueueType&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o0">head</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>HWEventQueueType&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o1">tail</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>CARD32&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o2">lastEventTime</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Bool&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o3">lastMotion</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__Event.html">EventRec</a>&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o4">events</a> [QUEUE_SIZE]</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>DevicePtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o6">pPtr</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>ScreenPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o7">pEnqueueScreen</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>ScreenPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__EventQueue.html#o8">pDequeueScreen</a></td></tr>
-
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Event queue. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o4" doxytag="_EventQueue::events" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__Event.html">EventRec</a> <a class="el" href="struct__EventQueue.html#o4">_EventQueue::events</a>[QUEUE_SIZE]
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Static allocation for signals.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0" doxytag="_EventQueue::head" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> HWEventQueueType <a class="el" href="struct__EventQueue.html#o0">_EventQueue::head</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Queue head; must be long for SetInputCheck.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_EventQueue::lastEventTime" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> CARD32 <a class="el" href="struct__EventQueue.html#o2">_EventQueue::lastEventTime</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-To avoid time running backwards.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o3" doxytag="_EventQueue::lastMotion" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> Bool <a class="el" href="struct__EventQueue.html#o3">_EventQueue::lastMotion</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-True if last event was motion.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o8" doxytag="_EventQueue::pDequeueScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> ScreenPtr <a class="el" href="struct__EventQueue.html#o8">_EventQueue::pDequeueScreen</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Screen events are dispatched to.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7" doxytag="_EventQueue::pEnqueueScreen" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> ScreenPtr <a class="el" href="struct__EventQueue.html#o7">_EventQueue::pEnqueueScreen</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Screen events are delivered to.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o6" doxytag="_EventQueue::pPtr" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> DevicePtr <a class="el" href="struct__EventQueue.html#o6">_EventQueue::pPtr</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Device pointers (to get funcs)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_EventQueue::tail" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> HWEventQueueType <a class="el" href="struct__EventQueue.html#o1">_EventQueue::tail</a>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Queue tail; must be long for SetInputCheck.     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxeq_8c.html">dmxeq.c</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxArg.html b/xorg-server/hw/dmx/doc/html/struct__dmxArg.html
index 16ef20aed..1694271bf 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxArg.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxArg.html
@@ -6,90 +6,85 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxArg Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxArg.html#o0">argc</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxArg.html#o1">argm</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>const  char **&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxArg.html#o2">argv</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxArg Struct Reference</h1><!-- doxytag: class="_dmxArg" --><table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxArg.html#aca6cdc10b22ae5fa4b790c0758eb70c9">argc</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxArg.html#aa9baf81a4fabcd2d3f6bbbecd0ebd748">argm</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">const char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxArg.html#aade18557285f464ec800a9ed1fc6c3f5">argv</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Stores the parsed argument list. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0" doxytag="_dmxArg::argc" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Stores the parsed argument list. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="aca6cdc10b22ae5fa4b790c0758eb70c9"></a><!-- doxytag: member="_dmxArg::argc" ref="aca6cdc10b22ae5fa4b790c0758eb70c9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__dmxArg.html#o0">_dmxArg::argc</a>
+          <td class="memname">int <a class="el" href="struct__dmxArg.html#aca6cdc10b22ae5fa4b790c0758eb70c9">_dmxArg::argc</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Number of arguments in argv </p>
 
-<p>
-Number of arguments in argv     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_dmxArg::argm" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00081">dmxArgAdd()</a>, <a class="el" href="dmxarg_8c_source.html#l00099">dmxArgC()</a>, <a class="el" href="dmxarg_8c_source.html#l00060">dmxArgCreate()</a>, <a class="el" href="dmxarg_8c_source.html#l00071">dmxArgFree()</a>, and <a class="el" href="dmxarg_8c_source.html#l00092">dmxArgV()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa9baf81a4fabcd2d3f6bbbecd0ebd748"></a><!-- doxytag: member="_dmxArg::argm" ref="aa9baf81a4fabcd2d3f6bbbecd0ebd748" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__dmxArg.html#o1">_dmxArg::argm</a>
+          <td class="memname">int <a class="el" href="struct__dmxArg.html#aa9baf81a4fabcd2d3f6bbbecd0ebd748">_dmxArg::argm</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Maximum number of arguments store-able in argv </p>
 
-<p>
-Maximum number of arguments store-able in argv     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2" doxytag="_dmxArg::argv" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00081">dmxArgAdd()</a>, and <a class="el" href="dmxarg_8c_source.html#l00060">dmxArgCreate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aade18557285f464ec800a9ed1fc6c3f5"></a><!-- doxytag: member="_dmxArg::argv" ref="aade18557285f464ec800a9ed1fc6c3f5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> const char** <a class="el" href="struct__dmxArg.html#o2">_dmxArg::argv</a>
+          <td class="memname">const char** <a class="el" href="struct__dmxArg.html#aade18557285f464ec800a9ed1fc6c3f5">_dmxArg::argv</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Arguments </p>
 
-<p>
-Arguments     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxarg_8c.html">dmxarg.c</a></ul>
+<p>Referenced by <a class="el" href="dmxarg_8c_source.html#l00081">dmxArgAdd()</a>, <a class="el" href="dmxarg_8c_source.html#l00060">dmxArgCreate()</a>, <a class="el" href="dmxarg_8c_source.html#l00071">dmxArgFree()</a>, and <a class="el" href="dmxarg_8c_source.html#l00092">dmxArgV()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxarg_8c.html">dmxarg.c</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html
index 531e96ee2..72468bbf4 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxColormapPriv.html
@@ -6,18 +6,52 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxColormapPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxColormapPriv Struct Reference</h1><!-- doxytag: class="_dmxColormapPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Colormap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxColormapPriv.html#ac310002aa04b2455910defd155dadad4">cmap</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Colormap private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxcmap_8h-source.html">dmxcmap.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Colormap private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="ac310002aa04b2455910defd155dadad4"></a><!-- doxytag: member="_dmxColormapPriv::cmap" ref="ac310002aa04b2455910defd155dadad4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Colormap <a class="el" href="struct__dmxColormapPriv.html#ac310002aa04b2455910defd155dadad4">_dmxColormapPriv::cmap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcmap_8c_source.html#l00049">dmxAllocateColormapPrivates()</a>, <a class="el" href="dmxcmap_8c_source.html#l00064">dmxBECreateColormap()</a>, <a class="el" href="dmxcmap_8c_source.html#l00111">dmxBEFreeColormap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00178">dmxGetDefaultWindowAttributes()</a>, <a class="el" href="dmxcmap_8c_source.html#l00147">dmxInstallColormap()</a>, and <a class="el" href="dmxcmap_8c_source.html#l00166">dmxStoreColors()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxcmap_8h_source.html">dmxcmap.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html
index 3891b8f3a..13187c67d 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxCursorPriv.html
@@ -6,18 +6,52 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxCursorPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxCursorPriv Struct Reference</h1><!-- doxytag: class="_dmxCursorPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxCursorPriv.html#aa55d93640b2d29175eeaa07b92c83cad">cursor</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Cursor private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxcursor_8h-source.html">dmxcursor.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Cursor private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="aa55d93640b2d29175eeaa07b92c83cad"></a><!-- doxytag: member="_dmxCursorPriv::cursor" ref="aa55d93640b2d29175eeaa07b92c83cad" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Cursor <a class="el" href="struct__dmxCursorPriv.html#aa55d93640b2d29175eeaa07b92c83cad">_dmxCursorPriv::cursor</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00659">_dmxRealizeCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00729">_dmxSetCursor()</a>, <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00681">dmxBEFreeCursor()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxcursor_8h_source.html">dmxcursor.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html
index adff77f04..7b4c457d5 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxFontPriv.html
@@ -6,18 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxFontPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxfont_8h-source.html">dmxfont.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxFontPriv Struct Reference</h1><!-- doxytag: class="_dmxFontPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxfont_8h_source.html">dmxfont.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxFontPriv.html#ae91826e69c75c08b5febfaf97d4f3cad">refcnt</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XFontStruct **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxFontPriv.html#a2676c12db834b65989761a611ae8568f">font</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Font private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxfont_8h-source.html">dmxfont.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Font private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a2676c12db834b65989761a611ae8568f"></a><!-- doxytag: member="_dmxFontPriv::font" ref="a2676c12db834b65989761a611ae8568f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XFontStruct** <a class="el" href="struct__dmxFontPriv.html#a2676c12db834b65989761a611ae8568f">_dmxFontPriv::font</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00469">dmxBEFreeFont()</a>, <a class="el" href="dmxfont_8c_source.html#l00252">dmxBELoadFont()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae91826e69c75c08b5febfaf97d4f3cad"></a><!-- doxytag: member="_dmxFontPriv::refcnt" ref="ae91826e69c75c08b5febfaf97d4f3cad" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__dmxFontPriv.html#ae91826e69c75c08b5febfaf97d4f3cad">_dmxFontPriv::refcnt</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxfont_8c_source.html#l00436">dmxRealizeFont()</a>, and <a class="el" href="dmxfont_8c_source.html#l00485">dmxUnrealizeFont()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxfont_8h_source.html">dmxfont.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html
index 9a7b0fd25..eaa249d5c 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxGCPriv.html
@@ -6,18 +6,100 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxGCPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxgc_8h-source.html">dmxgc.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxGCPriv Struct Reference</h1><!-- doxytag: class="_dmxGCPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxgc_8h_source.html">dmxgc.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GCOps *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">ops</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GCFuncs *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGCPriv.html#a0bcaef15efa842b96d3080342a1018fd">funcs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGCPriv.html#a1df255c2a582d3168868747ecea8055f">gc</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGCPriv.html#afb862aeafa43f8d936f07850b9fd374c">msc</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-GC private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxgc_8h-source.html">dmxgc.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>GC private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a0bcaef15efa842b96d3080342a1018fd"></a><!-- doxytag: member="_dmxGCPriv::funcs" ref="a0bcaef15efa842b96d3080342a1018fd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GCFuncs* <a class="el" href="struct__dmxGCPriv.html#a0bcaef15efa842b96d3080342a1018fd">_dmxGCPriv::funcs</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1df255c2a582d3168868747ecea8055f"></a><!-- doxytag: member="_dmxGCPriv::gc" ref="a1df255c2a582d3168868747ecea8055f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XlibGC <a class="el" href="struct__dmxGCPriv.html#a1df255c2a582d3168868747ecea8055f">_dmxGCPriv::gc</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00094">dmxBECreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00312">dmxBEFreeGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00345">dmxChangeClip()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00171">dmxCopyArea()</a>, <a class="el" href="dmxgc_8c_source.html#l00294">dmxCopyGC()</a>, <a class="el" href="dmxgcops_8c_source.html#l00197">dmxCopyPlane()</a>, <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, <a class="el" href="dmxgc_8c_source.html#l00399">dmxDestroyClip()</a>, <a class="el" href="dmxgcops_8c_source.html#l00325">dmxFillPolygon()</a>, <a class="el" href="dmxgcops_8c_source.html#l00470">dmxImageText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00450">dmxImageText8()</a>, <a class="el" href="dmxgcops_8c_source.html#l00305">dmxPolyArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00365">dmxPolyFillArc()</a>, <a class="el" href="dmxgcops_8c_source.html#l00345">dmxPolyFillRect()</a>, <a class="el" href="dmxgcops_8c_source.html#l00244">dmxPolylines()</a>, <a class="el" href="dmxgcops_8c_source.html#l00224">dmxPolyPoint()</a>, <a class="el" href="dmxgcops_8c_source.html#l00284">dmxPolyRectangle()</a>, <a class="el" href="dmxgcops_8c_source.html#l00264">dmxPolySegment()</a>, <a class="el" href="dmxgcops_8c_source.html#l00417">dmxPolyText16()</a>, <a class="el" href="dmxgcops_8c_source.html#l00385">dmxPolyText8()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00097">dmxPutImage()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afb862aeafa43f8d936f07850b9fd374c"></a><!-- doxytag: member="_dmxGCPriv::msc" ref="afb862aeafa43f8d936f07850b9fd374c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxGCPriv.html#afb862aeafa43f8d936f07850b9fd374c">_dmxGCPriv::msc</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, and <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4c29fc86ae00189d45730dcee79e881a"></a><!-- doxytag: member="_dmxGCPriv::ops" ref="a4c29fc86ae00189d45730dcee79e881a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GCOps* <a class="el" href="struct__dmxGCPriv.html#a4c29fc86ae00189d45730dcee79e881a">_dmxGCPriv::ops</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxgc_8c_source.html#l00119">dmxCreateGC()</a>, and <a class="el" href="dmxgc_8c_source.html#l00153">dmxValidateGC()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxgc_8h_source.html">dmxgc.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html
index c7738a4b6..e113e3710 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxGlyphPriv.html
@@ -6,44 +6,53 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxGlyphPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>GlyphSet *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxGlyphPriv.html#o0">glyphSets</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxGlyphPriv Struct Reference</h1><!-- doxytag: class="_dmxGlyphPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">GlyphSet *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxGlyphPriv.html#a041bb4d62519bb607df0085a06fc5f76">glyphSets</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Glyph Set private structure 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0" doxytag="_dmxGlyphPriv::glyphSets" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Glyph Set private structure </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a041bb4d62519bb607df0085a06fc5f76"></a><!-- doxytag: member="_dmxGlyphPriv::glyphSets" ref="a041bb4d62519bb607df0085a06fc5f76" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> GlyphSet* <a class="el" href="struct__dmxGlyphPriv.html#o0">_dmxGlyphPriv::glyphSets</a>
+          <td class="memname">GlyphSet* <a class="el" href="struct__dmxGlyphPriv.html#a041bb4d62519bb607df0085a06fc5f76">_dmxGlyphPriv::glyphSets</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Glyph Set IDs from back-end server </p>
 
-<p>
-Glyph Set IDs from back-end server     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxpict_8h-source.html">dmxpict.h</a></ul>
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00226">dmxBECreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00210">dmxBEFreeGlyphSet()</a>, <a class="el" href="dmxextension_8c_source.html#l01085">dmxBERestoreRenderGlyph()</a>, <a class="el" href="dmxpict_8c_source.html#l00342">dmxProcRenderAddGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00259">dmxProcRenderCreateGlyphSet()</a>, <a class="el" href="dmxpict_8c_source.html#l00397">dmxProcRenderFreeGlyphs()</a>, and <a class="el" href="dmxpict_8c_source.html#l00311">dmxProcRenderFreeGlyphSet()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxpict_8h_source.html">dmxpict.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html
index c3034eefa..beaf8e3cc 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxPictPriv.html
@@ -6,68 +6,70 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxPictPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxpict_8h-source.html">dmxpict.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>Picture&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxPictPriv.html#o0">pict</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>Mask&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__dmxPictPriv.html#o1">savedMask</a></td></tr>
-
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxPictPriv Struct Reference</h1><!-- doxytag: class="_dmxPictPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxpict_8h_source.html">dmxpict.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Picture&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPictPriv.html#a29ce8f04c93049d70c37ab68c3fb0997">pict</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Mask&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPictPriv.html#a5e1f06f9c1dc3f27729b77a910d388f7">savedMask</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Picture private structure 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0" doxytag="_dmxPictPriv::pict" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Picture private structure </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a29ce8f04c93049d70c37ab68c3fb0997"></a><!-- doxytag: member="_dmxPictPriv::pict" ref="a29ce8f04c93049d70c37ab68c3fb0997" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Picture <a class="el" href="struct__dmxPictPriv.html#o0">_dmxPictPriv::pict</a>
+          <td class="memname">Picture <a class="el" href="struct__dmxPictPriv.html#a29ce8f04c93049d70c37ab68c3fb0997">_dmxPictPriv::pict</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Picture ID from back-end server </p>
 
-<p>
-Picture ID from back-end server     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1" doxytag="_dmxPictPriv::savedMask" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00757">dmxBECreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00797">dmxBEFreePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00851">dmxChangePictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l01041">dmxComposite()</a>, <a class="el" href="dmxpict_8c_source.html#l01100">dmxCompositeRects()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00740">dmxCreatePictureList()</a>, <a class="el" href="dmxpict_8c_source.html#l00916">dmxDestroyPictureClip()</a>, <a class="el" href="dmxpict_8c_source.html#l00437">dmxProcRenderCompositeGlyphs()</a>, <a class="el" href="dmxpict_8c_source.html#l00655">dmxProcRenderSetPictureFilter()</a>, <a class="el" href="dmxpict_8c_source.html#l00616">dmxProcRenderSetPictureTransform()</a>, <a class="el" href="dmxpict_8c_source.html#l01150">dmxTrapezoids()</a>, <a class="el" href="dmxpict_8c_source.html#l01193">dmxTriangles()</a>, <a class="el" href="dmxpict_8c_source.html#l01278">dmxTriFan()</a>, <a class="el" href="dmxpict_8c_source.html#l01236">dmxTriStrip()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5e1f06f9c1dc3f27729b77a910d388f7"></a><!-- doxytag: member="_dmxPictPriv::savedMask" ref="a5e1f06f9c1dc3f27729b77a910d388f7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> Mask <a class="el" href="struct__dmxPictPriv.html#o1">_dmxPictPriv::savedMask</a>
+          <td class="memname">Mask <a class="el" href="struct__dmxPictPriv.html#a5e1f06f9c1dc3f27729b77a910d388f7">_dmxPictPriv::savedMask</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Mask of picture attributes saved for lazy window creation. </p>
 
-<p>
-Mask of picture attributes saved for lazy window creation.     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxpict_8h-source.html">dmxpict.h</a></ul>
+<p>Referenced by <a class="el" href="dmxpict_8c_source.html#l00946">dmxChangePicture()</a>, <a class="el" href="dmxpict_8c_source.html#l00773">dmxCreatePicture()</a>, and <a class="el" href="dmxpict_8c_source.html#l00968">dmxValidatePicture()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxpict_8h_source.html">dmxpict.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html
index a358c0162..67e50903e 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxPixPriv.html
@@ -6,18 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxPixPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxPixPriv Struct Reference</h1><!-- doxytag: class="_dmxPixPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Pixmap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPixPriv.html#a7b3f9090169c50760c7a18e801091c2f">pixmap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XImage *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxPixPriv.html#a54fab045a345e00ee75ab064ce38118e">detachedImage</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Pixmap private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxpixmap_8h-source.html">dmxpixmap.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Pixmap private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a54fab045a345e00ee75ab064ce38118e"></a><!-- doxytag: member="_dmxPixPriv::detachedImage" ref="a54fab045a345e00ee75ab064ce38118e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XImage* <a class="el" href="struct__dmxPixPriv.html#a54fab045a345e00ee75ab064ce38118e">_dmxPixPriv::detachedImage</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, and <a class="el" href="dmxpixmap_8c_source.html#l00154">dmxDestroyPixmap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7b3f9090169c50760c7a18e801091c2f"></a><!-- doxytag: member="_dmxPixPriv::pixmap" ref="a7b3f9090169c50760c7a18e801091c2f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Pixmap <a class="el" href="struct__dmxPixPriv.html#a7b3f9090169c50760c7a18e801091c2f">_dmxPixPriv::pixmap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxpixmap_8c_source.html#l00059">dmxBECreatePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00138">dmxBEFreePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l00775">dmxBERestorePixmap()</a>, <a class="el" href="dmxextension_8c_source.html#l01406">dmxBESavePixmap()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00191">dmxBitmapToRegion()</a>, <a class="el" href="dmxgc_8c_source.html#l00190">dmxChangeGC()</a>, <a class="el" href="dmxpixmap_8c_source.html#l00084">dmxCreatePixmap()</a>, <a class="el" href="dmxwindow_8c_source.html#l00475">dmxDoChangeWindowAttributes()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, and <a class="el" href="dmxgcops_8c_source.html#l00517">dmxFindAlternatePixmap()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxpixmap_8h_source.html">dmxpixmap.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html b/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html
index c51978e8f..3601baa07 100644
--- a/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html
+++ b/xorg-server/hw/dmx/doc/html/struct__dmxWinPriv.html
@@ -6,18 +6,180 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_dmxWinPriv Struct Reference</h1><code>#include &lt;<a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_dmxWinPriv Struct Reference</h1><!-- doxytag: class="_dmxWinPriv" -->
+<p><code>#include &lt;<a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Window&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a9e9f2544f80c5f6988afbc36be92f71f">window</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a6c19fce485c4b7c630e5af24ac8d2b64">offscreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a71a163660368e9309d1369164246946f">mapped</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a408078f183c5a02daa555c9df1f310f2">restacked</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">attribMask</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Colormap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a852246cf86eff5c476e79915828a976f">cmap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Visual *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#a19177a0167fccfd592c7f45c929c2be9">visual</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#af0c3737de0bf15b112b7d9aba3774196">isShaped</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__dmxWinPriv.html#aada5c9737655b65fcd384446a5bb8906">hasPict</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Window private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxwindow_8h-source.html">dmxwindow.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Window private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="ab0ef36129e8d26e958e0094e41bceebe"></a><!-- doxytag: member="_dmxWinPriv::attribMask" ref="ab0ef36129e8d26e958e0094e41bceebe" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__dmxWinPriv.html#ab0ef36129e8d26e958e0094e41bceebe">_dmxWinPriv::attribMask</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00072">dmxCreateRootWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a852246cf86eff5c476e79915828a976f"></a><!-- doxytag: member="_dmxWinPriv::cmap" ref="a852246cf86eff5c476e79915828a976f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Colormap <a class="el" href="struct__dmxWinPriv.html#a852246cf86eff5c476e79915828a976f">_dmxWinPriv::cmap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aada5c9737655b65fcd384446a5bb8906"></a><!-- doxytag: member="_dmxWinPriv::hasPict" ref="aada5c9737655b65fcd384446a5bb8906" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxWinPriv.html#aada5c9737655b65fcd384446a5bb8906">_dmxWinPriv::hasPict</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af0c3737de0bf15b112b7d9aba3774196"></a><!-- doxytag: member="_dmxWinPriv::isShaped" ref="af0c3737de0bf15b112b7d9aba3774196" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxWinPriv.html#af0c3737de0bf15b112b7d9aba3774196">_dmxWinPriv::isShaped</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a71a163660368e9309d1369164246946f"></a><!-- doxytag: member="_dmxWinPriv::mapped" ref="a71a163660368e9309d1369164246946f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxWinPriv.html#a71a163660368e9309d1369164246946f">_dmxWinPriv::mapped</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6c19fce485c4b7c630e5af24ac8d2b64"></a><!-- doxytag: member="_dmxWinPriv::offscreen" ref="a6c19fce485c4b7c630e5af24ac8d2b64" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxWinPriv.html#a6c19fce485c4b7c630e5af24ac8d2b64">_dmxWinPriv::offscreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a408078f183c5a02daa555c9df1f310f2"></a><!-- doxytag: member="_dmxWinPriv::restacked" ref="a408078f183c5a02daa555c9df1f310f2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Bool <a class="el" href="struct__dmxWinPriv.html#a408078f183c5a02daa555c9df1f310f2">_dmxWinPriv::restacked</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a19177a0167fccfd592c7f45c929c2be9"></a><!-- doxytag: member="_dmxWinPriv::visual" ref="a19177a0167fccfd592c7f45c929c2be9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Visual* <a class="el" href="struct__dmxWinPriv.html#a19177a0167fccfd592c7f45c929c2be9">_dmxWinPriv::visual</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9e9f2544f80c5f6988afbc36be92f71f"></a><!-- doxytag: member="_dmxWinPriv::window" ref="a9e9f2544f80c5f6988afbc36be92f71f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Window <a class="el" href="struct__dmxWinPriv.html#a9e9f2544f80c5f6988afbc36be92f71f">_dmxWinPriv::window</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00918">dmxBECreateWindowTree()</a>, <a class="el" href="dmxwindow_8c_source.html#l00379">dmxBEDestroyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00910">dmxChangeBorderWidth()</a>, <a class="el" href="dmxwindow_8c_source.html#l00566">dmxChangeWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00794">dmxCopyWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00280">dmxCreateAndRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00209">dmxCreateNonRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00303">dmxCreateWindow()</a>, <a class="el" href="dmxpict_8c_source.html#l00696">dmxDoCreatePicture()</a>, <a class="el" href="dmxwindow_8c_source.html#l00675">dmxDoRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00938">dmxDoSetShape()</a>, <a class="el" href="dmxextension_8c_source.html#l00285">dmxForceWindowCreation()</a>, <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, <a class="el" href="dmxwindow_8c_source.html#l00431">dmxPositionWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00601">dmxRealizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00879">dmxReparentWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00143">dmxResizeRootWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00835">dmxResizeWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l00723">dmxRestackWindow()</a>, <a class="el" href="dmxwindow_8c_source.html#l01002">dmxSetShape()</a>, <a class="el" href="dmxwindow_8c_source.html#l00640">dmxUnrealizeWindow()</a>, and <a class="el" href="dmxwindow_8c_source.html#l00758">dmxWindowExposures()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmxwindow_8h_source.html">dmxwindow.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/struct__myPrivate.html b/xorg-server/hw/dmx/doc/html/struct__myPrivate.html
index 50e532569..2a3cb28e8 100644
--- a/xorg-server/hw/dmx/doc/html/struct__myPrivate.html
+++ b/xorg-server/hw/dmx/doc/html/struct__myPrivate.html
@@ -6,258 +6,1096 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>_myPrivate Struct Reference</h1><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o37">fd</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>_myPrivate Struct Reference</h1><!-- doxytag: class="_myPrivate" -->
+<p><code>#include &lt;<a class="el" href="usb-private_8h_source.html">usb-private.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Public Types</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom">{ <br/>
+&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a">button1</a> =  0x0001, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0">button2</a> =  0x0002, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395">button3</a> =  0x0004, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0">button4</a> =  0x0008, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469">button5</a> =  0x0010
+<br/>
+ }</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom">{ <br/>
+&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a">button1</a> =  0x0001, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0">button2</a> =  0x0002, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395">button3</a> =  0x0004, 
+<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0">button4</a> =  0x0008, 
+<br/>
+&nbsp;&nbsp;<a class="el" href="struct__myPrivate.html#ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469">button5</a> =  0x0010
+<br/>
+ }</td></tr>
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a83c7e1a18938a3186ff337ed3a1a6b92">DMX_COMMON_PRIVATE</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a2097f51728e0db5f4fdc91e7d0613bf7">myScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a0018b915c37ea1c6f329efebbb03f297">grabbedScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#aeb80240bdd4d585ecf2ab890a2e74369">lastX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a25344ec18eba85efb5017bf848f152f4">lastY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a6e729bd1a19bb488a215d22e8cdc5bdc">centerX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ae9759d71e19697ba4ab27cf944deab9c">centerY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a8e9a33e0e90a65241cf26f3c03e8b629">relative</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ad3ad48a8cbc0038ae091dbd8bd9e55a1">newscreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a7a3f2b74b35ff19e8f00857d34e892f3">initialized</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevicePtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ab5f8fb12758800c1fbcd95b731ebbee8">mou</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DevicePtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a8247a272435f00e939e150d7dd7db1e0">kbd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ab7925907f71458986fba416d8c9b36e1">entered</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac1dfcacdf4e49a146bb96f5e6ad0e5ab">offX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a3969310e24e8d98d0456e41d7b10bd6d">offY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac5d2265df9e523e1bd4a0c81506b82cb">globalX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#afbe8cb18da83776018a774b99eb17c14">globalY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#aaefe49f1fcf601c454ca47cb30227856">curX</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#adb85f2dced703990e83c3a7067308223">curY</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#af746fe4a014fddf10bfeb6c64a543918">width</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ad45b674e1ab04442ec268ea80cc8c439">height</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#acedad74bc71aef05c22a25b63a435f02">consWidth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ab0fb948041c7994127e526d6904a1c93">consHeight</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a9f848bc9be43096be0590740a9531c4c">xScale</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a9d41da04ff8e8b84f9ee138edffb16c7">yScale</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a309900033b471a595518e7949e741a78">gc</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac1cc93ea7cc6840242aea4afd1654812">gcDet</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#af2293e0e10fbb8014f4d5634c24e9d44">gcRev</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">XlibGC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac926e46006665b40b4189f3a62172fa2">gcCur</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a9d7f5ad2b2066a328c982a2ed051cd94">grabbed</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a77d289afcee06f9959065231a116b2a4">fine</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a9a4d5563651c4cdda4472c78afb06b1b">captured</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a5e949540b57f13f311f6e32847bc9ad1">cursorNormal</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a82b111d9769d9ca67449808c86effd49">cursorGrabbed</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Cursor&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a78c2f55261e44ab6a5f7fd7a3c03a887">cursorEmpty</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">Pixmap&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a6384e7e09282c2d561b987b972ec41fb">pixmap</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CloseScreenProcPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a2686564b0b207181c342b8751f15d54e">CloseScreen</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct <a class="el" href="struct__myPrivate.html">_myPrivate</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a6e7a5e6234e0718d5f0d8ba03d902fcd">next</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a6b26eb0acc0b932c8dee8277501e6273">fd</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a463f3cda6fa6032ea0d976d35cd11c30">vtno</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#abac94345370dae8caaf80f882ef14c8c">vtcurrent</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ade5d3520bc20cf979894ab2e2faf4903">kbdtrans</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct termios&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a3151cfbe868cf35d0e070d554ac21ee0">kbdtty</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ae0dbb095f346fd577827af796f70cfe8">kbdType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">CARD32&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a35c7b19223e75cef1eebc0467fb2514d">kbdState</a> [NUM_STATE_ENTRIES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DeviceIntPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a1f72c73bb97bf77b8f5359eabf81fb79">pKeyboard</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a35c7eda9702b723812312689bf412424">prefix</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a7b46718db81521ae01ffbbe8f32a0203">switched</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">SWITCHRETPROC&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ab4797772b07f0fc6aca12ca15bf58b26">switch_return</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a263e4371987e44a409cae181d97ce60b">switch_return_data</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac184b2b8c6283dc678512c5f5990c0f2">pitch</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a6a27aa80849de66952d95ab65914d6da">duration</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DeviceIntPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a3e46e1ccb546bbadfa5ebb165a8b11d4">pMouse</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct termios&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a94623d180c53cc9a3902ce2c1f75529b">tty</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum _myPrivate:: { ... } &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a8e004313d6a4cb5e86c02c2b32576af5">buttons</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum _myPrivate:: { ... } &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ac202904614deb8a72aa309f152950e6b">buttons</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">DeviceIntPtr&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ae08ddb2f15fe104faf25f51f05c26033">pDevice</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a5e71754533023837d932a24bd25ff602">mask</a> [EV_MAX/8+1]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#af4532a0338cfa7325e8e3b2e3deb770f">numRel</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a2ef864f533851d1c4a2a9f6c44400692">numAbs</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a06ca4d02bb8f2a1795251f496ffd3cb2">numLeds</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#ad2d732244cdd84a0cc50bec620d50846">relmap</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">absmap</a> [DMX_MAX_AXES]</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">dmxInput</a></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Each device has a private area that is visible only from inside the driver code. </p>
+<hr/><h2>Member Enumeration Documentation</h2>
+<a class="anchor" id="af1a1a0435d59396c7e2235842cffb6b9"></a><!-- doxytag: member="_myPrivate::@0" ref="af1a1a0435d59396c7e2235842cffb6b9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">anonymous enum</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a"></a><!-- doxytag: member="button1" ref="ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a" args="" -->button1</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0"></a><!-- doxytag: member="button2" ref="ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0" args="" -->button2</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395"></a><!-- doxytag: member="button3" ref="ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395" args="" -->button3</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0"></a><!-- doxytag: member="button4" ref="ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0" args="" -->button4</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469"></a><!-- doxytag: member="button5" ref="ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469" args="" -->button5</em>&nbsp;</td><td>
+</td></tr>
+</table>
+</dd>
+</dl>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>CARD32&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o43">kbdState</a> [NUM_STATE_ENTRIES]</td></tr>
+</div>
+</div>
+<a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45"></a><!-- doxytag: member="_myPrivate::@1" ref="ad7747ddf42978fb5e40c383bd85bcc45" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">anonymous enum</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a"></a><!-- doxytag: member="button1" ref="ad7747ddf42978fb5e40c383bd85bcc45a70d1e40b6c587d484e6e3d4c11d3040a" args="" -->button1</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0"></a><!-- doxytag: member="button2" ref="ad7747ddf42978fb5e40c383bd85bcc45a61b8d27f01d3717a6cfe90924197bcb0" args="" -->button2</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395"></a><!-- doxytag: member="button3" ref="ad7747ddf42978fb5e40c383bd85bcc45a54c59f9aec5d977b6d24c4b99e231395" args="" -->button3</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0"></a><!-- doxytag: member="button4" ref="ad7747ddf42978fb5e40c383bd85bcc45a057f70c74cc98a84ce5ee712a4da49d0" args="" -->button4</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469"></a><!-- doxytag: member="button5" ref="ad7747ddf42978fb5e40c383bd85bcc45aa3a302e413ac7ef9acf3ba6fc7d8b469" args="" -->button5</em>&nbsp;</td><td>
+</td></tr>
+</table>
+</dd>
+</dl>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o49">pitch</a></td></tr>
+</div>
+</div>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="afc48f38bcefc200e681475c06fdacad6"></a><!-- doxytag: member="_myPrivate::absmap" ref="afc48f38bcefc200e681475c06fdacad6" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">_myPrivate::absmap</a>[DMX_MAX_AXES]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Absolute axis map </p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned long&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o50">duration</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ac202904614deb8a72aa309f152950e6b"></a><!-- doxytag: member="_myPrivate::buttons" ref="ac202904614deb8a72aa309f152950e6b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum { ... }                <a class="el" href="struct__myPrivate.html#a8e004313d6a4cb5e86c02c2b32576af5">_myPrivate::buttons</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>DeviceIntPtr&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o55">pDevice</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="a8e004313d6a4cb5e86c02c2b32576af5"></a><!-- doxytag: member="_myPrivate::buttons" ref="a8e004313d6a4cb5e86c02c2b32576af5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">enum { ... }                <a class="el" href="struct__myPrivate.html#a8e004313d6a4cb5e86c02c2b32576af5">_myPrivate::buttons</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>unsigned char&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o56">mask</a> [EV_MAX/8+1]</td></tr>
+</div>
+</div>
+<a class="anchor" id="a9a4d5563651c4cdda4472c78afb06b1b"></a><!-- doxytag: member="_myPrivate::captured" ref="a9a4d5563651c4cdda4472c78afb06b1b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a9a4d5563651c4cdda4472c78afb06b1b">_myPrivate::captured</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o59">numLeds</a></td></tr>
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, and <a class="el" href="dmxconsole_8c_source.html#l01015">dmxConsoleUncapture()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o60">relmap</a> [DMX_MAX_AXES]</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6e729bd1a19bb488a215d22e8cdc5bdc"></a><!-- doxytag: member="_myPrivate::centerX" ref="a6e729bd1a19bb488a215d22e8cdc5bdc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a6e729bd1a19bb488a215d22e8cdc5bdc">_myPrivate::centerX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o61">absmap</a> [DMX_MAX_AXES]</td></tr>
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>.</p>
 
-<tr><td class="memItemLeft" nowrap align=right valign=top><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a> *&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html#o62">dmxInput</a></td></tr>
+</div>
+</div>
+<a class="anchor" id="ae9759d71e19697ba4ab27cf944deab9c"></a><!-- doxytag: member="_myPrivate::centerY" ref="ae9759d71e19697ba4ab27cf944deab9c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ae9759d71e19697ba4ab27cf944deab9c">_myPrivate::centerY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Each device has a private area that is visible only from inside the driver code. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o61" doxytag="_myPrivate::absmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__myPrivate.html#o61">_myPrivate::absmap</a>[DMX_MAX_AXES]
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Absolute axis map     </td>
-  </tr>
-</table>
-<a class="anchor" name="o62" doxytag="_myPrivate::dmxInput" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00491">dmxBackendComputeCenter()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2686564b0b207181c342b8751f15d54e"></a><!-- doxytag: member="_myPrivate::CloseScreen" ref="a2686564b0b207181c342b8751f15d54e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> <a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="struct__myPrivate.html#o62">_myPrivate::dmxInput</a>
+          <td class="memname">CloseScreenProcPtr <a class="el" href="struct__myPrivate.html#a2686564b0b207181c342b8751f15d54e">_myPrivate::CloseScreen</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-For pretty-printing     </td>
-  </tr>
-</table>
-<a class="anchor" name="o50" doxytag="_myPrivate::duration" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab0fb948041c7994127e526d6904a1c93"></a><!-- doxytag: member="_myPrivate::consHeight" ref="ab0fb948041c7994127e526d6904a1c93" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> unsigned long <a class="el" href="struct__myPrivate.html#o50">_myPrivate::duration</a>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ab0fb948041c7994127e526d6904a1c93">_myPrivate::consHeight</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Bell duration     </td>
-  </tr>
-</table>
-<a class="anchor" name="o37" doxytag="_myPrivate::fd" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acedad74bc71aef05c22a25b63a435f02"></a><!-- doxytag: member="_myPrivate::consWidth" ref="acedad74bc71aef05c22a25b63a435f02" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__myPrivate.html#o37">_myPrivate::fd</a>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#acedad74bc71aef05c22a25b63a435f02">_myPrivate::consWidth</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-File descriptor     </td>
-  </tr>
-</table>
-<a class="anchor" name="o43" doxytag="_myPrivate::kbdState" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a78c2f55261e44ab6a5f7fd7a3c03a887"></a><!-- doxytag: member="_myPrivate::cursorEmpty" ref="a78c2f55261e44ab6a5f7fd7a3c03a887" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> CARD32 <a class="el" href="struct__myPrivate.html#o43">_myPrivate::kbdState</a>
+          <td class="memname">Cursor <a class="el" href="struct__myPrivate.html#a78c2f55261e44ab6a5f7fd7a3c03a887">_myPrivate::cursorEmpty</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Keyboard state     </td>
-  </tr>
-</table>
-<a class="anchor" name="o56" doxytag="_myPrivate::mask" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a82b111d9769d9ca67449808c86effd49"></a><!-- doxytag: member="_myPrivate::cursorGrabbed" ref="a82b111d9769d9ca67449808c86effd49" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> unsigned char <a class="el" href="struct__myPrivate.html#o56">_myPrivate::mask</a>[EV_MAX/8 + 1]
+          <td class="memname">Cursor <a class="el" href="struct__myPrivate.html#a82b111d9769d9ca67449808c86effd49">_myPrivate::cursorGrabbed</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Mask     </td>
-  </tr>
-</table>
-<a class="anchor" name="o59" doxytag="_myPrivate::numLeds" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5e949540b57f13f311f6e32847bc9ad1"></a><!-- doxytag: member="_myPrivate::cursorNormal" ref="a5e949540b57f13f311f6e32847bc9ad1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__myPrivate.html#o59">_myPrivate::numLeds</a>
+          <td class="memname">Cursor <a class="el" href="struct__myPrivate.html#a5e949540b57f13f311f6e32847bc9ad1">_myPrivate::cursorNormal</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Counts     </td>
-  </tr>
-</table>
-<a class="anchor" name="o55" doxytag="_myPrivate::pDevice" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aaefe49f1fcf601c454ca47cb30227856"></a><!-- doxytag: member="_myPrivate::curX" ref="aaefe49f1fcf601c454ca47cb30227856" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> DeviceIntPtr <a class="el" href="struct__myPrivate.html#o55">_myPrivate::pDevice</a>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#aaefe49f1fcf601c454ca47cb30227856">_myPrivate::curX</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Device (mouse or other)     </td>
-  </tr>
-</table>
-<a class="anchor" name="o49" doxytag="_myPrivate::pitch" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adb85f2dced703990e83c3a7067308223"></a><!-- doxytag: member="_myPrivate::curY" ref="adb85f2dced703990e83c3a7067308223" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__myPrivate.html#o49">_myPrivate::pitch</a>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#adb85f2dced703990e83c3a7067308223">_myPrivate::curY</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Bell pitch     </td>
-  </tr>
-</table>
-<a class="anchor" name="o60" doxytag="_myPrivate::relmap" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00385">dmxConsoleMoveAbsolute()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a83c7e1a18938a3186ff337ed3a1a6b92"></a><!-- doxytag: member="_myPrivate::DMX_COMMON_PRIVATE" ref="a83c7e1a18938a3186ff337ed3a1a6b92" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int <a class="el" href="struct__myPrivate.html#o60">_myPrivate::relmap</a>[DMX_MAX_AXES]
+          <td class="memname"><a class="el" href="struct__myPrivate.html#a83c7e1a18938a3186ff337ed3a1a6b92">_myPrivate::DMX_COMMON_PRIVATE</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Relative axis map     </td>
-  </tr>
-</table>
-<hr>The documentation for this struct was generated from the following files:<ul>
-<li><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a><li><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a><li><a class="el" href="dmxconsole_8c.html">dmxconsole.c</a><li><a class="el" href="lnx-keyboard_8c.html">lnx-keyboard.c</a><li><a class="el" href="lnx-ms_8c.html">lnx-ms.c</a><li><a class="el" href="lnx-ps2_8c.html">lnx-ps2.c</a><li><a class="el" href="usb-private_8h-source.html">usb-private.h</a></ul>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a0d76644b5072fa20b8470cc0f7bb8958"></a><!-- doxytag: member="_myPrivate::dmxInput" ref="a0d76644b5072fa20b8470cc0f7bb8958" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXInputInfo.html">DMXInputInfo</a>* <a class="el" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">_myPrivate::dmxInput</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>For pretty-printing </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00963">dmxDump()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a27aa80849de66952d95ab65914d6da"></a><!-- doxytag: member="_myPrivate::duration" ref="a6a27aa80849de66952d95ab65914d6da" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long <a class="el" href="struct__myPrivate.html#a6a27aa80849de66952d95ab65914d6da">_myPrivate::duration</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Bell duration </p>
+
+</div>
+</div>
+<a class="anchor" id="ab7925907f71458986fba416d8c9b36e1"></a><!-- doxytag: member="_myPrivate::entered" ref="ab7925907f71458986fba416d8c9b36e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ab7925907f71458986fba416d8c9b36e1">_myPrivate::entered</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a6b26eb0acc0b932c8dee8277501e6273"></a><!-- doxytag: member="_myPrivate::fd" ref="a6b26eb0acc0b932c8dee8277501e6273" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a6b26eb0acc0b932c8dee8277501e6273">_myPrivate::fd</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>File descriptor </p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00360">kbdLinuxCreatePrivate()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>, <a class="el" href="lnx-ms_8c_source.html#l00293">msLinuxCreatePrivate()</a>, <a class="el" href="lnx-ps2_8c_source.html#l00261">ps2LinuxCreatePrivate()</a>, <a class="el" href="usb-common_8c_source.html#l00369">usbCreatePrivate()</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a77d289afcee06f9959065231a116b2a4"></a><!-- doxytag: member="_myPrivate::fine" ref="a77d289afcee06f9959065231a116b2a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a77d289afcee06f9959065231a116b2a4">_myPrivate::fine</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00986">dmxConsoleCapture()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a309900033b471a595518e7949e741a78"></a><!-- doxytag: member="_myPrivate::gc" ref="a309900033b471a595518e7949e741a78" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XlibGC <a class="el" href="struct__myPrivate.html#a309900033b471a595518e7949e741a78">_myPrivate::gc</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxcursor_8c_source.html#l00578">dmxBECreateCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac926e46006665b40b4189f3a62172fa2"></a><!-- doxytag: member="_myPrivate::gcCur" ref="ac926e46006665b40b4189f3a62172fa2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XlibGC <a class="el" href="struct__myPrivate.html#ac926e46006665b40b4189f3a62172fa2">_myPrivate::gcCur</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac1cc93ea7cc6840242aea4afd1654812"></a><!-- doxytag: member="_myPrivate::gcDet" ref="ac1cc93ea7cc6840242aea4afd1654812" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XlibGC <a class="el" href="struct__myPrivate.html#ac1cc93ea7cc6840242aea4afd1654812">_myPrivate::gcDet</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af2293e0e10fbb8014f4d5634c24e9d44"></a><!-- doxytag: member="_myPrivate::gcRev" ref="af2293e0e10fbb8014f4d5634c24e9d44" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">XlibGC <a class="el" href="struct__myPrivate.html#af2293e0e10fbb8014f4d5634c24e9d44">_myPrivate::gcRev</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00596">dmxCloseConsole()</a>, <a class="el" href="dmxconsole_8c_source.html#l00287">dmxConsoleClearCursor()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac5d2265df9e523e1bd4a0c81506b82cb"></a><!-- doxytag: member="_myPrivate::globalX" ref="ac5d2265df9e523e1bd4a0c81506b82cb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ac5d2265df9e523e1bd4a0c81506b82cb">_myPrivate::globalX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afbe8cb18da83776018a774b99eb17c14"></a><!-- doxytag: member="_myPrivate::globalY" ref="afbe8cb18da83776018a774b99eb17c14" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#afbe8cb18da83776018a774b99eb17c14">_myPrivate::globalY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>, and <a class="el" href="dmxcursor_8c_source.html#l00124">dmxCursorOffScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d7f5ad2b2066a328c982a2ed051cd94"></a><!-- doxytag: member="_myPrivate::grabbed" ref="a9d7f5ad2b2066a328c982a2ed051cd94" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a9d7f5ad2b2066a328c982a2ed051cd94">_myPrivate::grabbed</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0018b915c37ea1c6f329efebbb03f297"></a><!-- doxytag: member="_myPrivate::grabbedScreen" ref="a0018b915c37ea1c6f329efebbb03f297" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="struct__DMXScreenInfo.html">DMXScreenInfo</a>* <a class="el" href="struct__myPrivate.html#a0018b915c37ea1c6f329efebbb03f297">_myPrivate::grabbedScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad45b674e1ab04442ec268ea80cc8c439"></a><!-- doxytag: member="_myPrivate::height" ref="ad45b674e1ab04442ec268ea80cc8c439" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ad45b674e1ab04442ec268ea80cc8c439">_myPrivate::height</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7a3f2b74b35ff19e8f00857d34e892f3"></a><!-- doxytag: member="_myPrivate::initialized" ref="a7a3f2b74b35ff19e8f00857d34e892f3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a7a3f2b74b35ff19e8f00857d34e892f3">_myPrivate::initialized</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8247a272435f00e939e150d7dd7db1e0"></a><!-- doxytag: member="_myPrivate::kbd" ref="a8247a272435f00e939e150d7dd7db1e0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevicePtr <a class="el" href="struct__myPrivate.html#a8247a272435f00e939e150d7dd7db1e0">_myPrivate::kbd</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a35c7b19223e75cef1eebc0467fb2514d"></a><!-- doxytag: member="_myPrivate::kbdState" ref="a35c7b19223e75cef1eebc0467fb2514d" args="[NUM_STATE_ENTRIES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">CARD32 <a class="el" href="struct__myPrivate.html#a35c7b19223e75cef1eebc0467fb2514d">_myPrivate::kbdState</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Keyboard state </p>
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00202">kbdLinuxKeyDown()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00211">kbdLinuxKeyState()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00245">kbdUSBKeyDown()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00254">kbdUSBKeyState()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ade5d3520bc20cf979894ab2e2faf4903"></a><!-- doxytag: member="_myPrivate::kbdtrans" ref="ade5d3520bc20cf979894ab2e2faf4903" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ade5d3520bc20cf979894ab2e2faf4903">_myPrivate::kbdtrans</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3151cfbe868cf35d0e070d554ac21ee0"></a><!-- doxytag: member="_myPrivate::kbdtty" ref="a3151cfbe868cf35d0e070d554ac21ee0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct termios <a class="el" href="struct__myPrivate.html#a3151cfbe868cf35d0e070d554ac21ee0">_myPrivate::kbdtty</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ae0dbb095f346fd577827af796f70cfe8"></a><!-- doxytag: member="_myPrivate::kbdType" ref="ae0dbb095f346fd577827af796f70cfe8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ae0dbb095f346fd577827af796f70cfe8">_myPrivate::kbdType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aeb80240bdd4d585ecf2ab890a2e74369"></a><!-- doxytag: member="_myPrivate::lastX" ref="aeb80240bdd4d585ecf2ab890a2e74369" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#aeb80240bdd4d585ecf2ab890a2e74369">_myPrivate::lastX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00402">dmxConsoleMoveRelative()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a25344ec18eba85efb5017bf848f152f4"></a><!-- doxytag: member="_myPrivate::lastY" ref="a25344ec18eba85efb5017bf848f152f4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a25344ec18eba85efb5017bf848f152f4">_myPrivate::lastY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00402">dmxConsoleMoveRelative()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5e71754533023837d932a24bd25ff602"></a><!-- doxytag: member="_myPrivate::mask" ref="a5e71754533023837d932a24bd25ff602" args="[EV_MAX/8+1]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned char <a class="el" href="struct__myPrivate.html#a5e71754533023837d932a24bd25ff602">_myPrivate::mask</a>[EV_MAX/8+1]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Mask </p>
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00718">dmxConsoleInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab5f8fb12758800c1fbcd95b731ebbee8"></a><!-- doxytag: member="_myPrivate::mou" ref="ab5f8fb12758800c1fbcd95b731ebbee8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DevicePtr <a class="el" href="struct__myPrivate.html#ab5f8fb12758800c1fbcd95b731ebbee8">_myPrivate::mou</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a2097f51728e0db5f4fdc91e7d0613bf7"></a><!-- doxytag: member="_myPrivate::myScreen" ref="a2097f51728e0db5f4fdc91e7d0613bf7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a2097f51728e0db5f4fdc91e7d0613bf7">_myPrivate::myScreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxbackend_8c_source.html#l00215">dmxBackendFindOverlapping()</a>, and <a class="el" href="dmxbackend_8c_source.html#l00133">dmxBackendSameDisplay()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad3ad48a8cbc0038ae091dbd8bd9e55a1"></a><!-- doxytag: member="_myPrivate::newscreen" ref="ad3ad48a8cbc0038ae091dbd8bd9e55a1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ad3ad48a8cbc0038ae091dbd8bd9e55a1">_myPrivate::newscreen</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a6e7a5e6234e0718d5f0d8ba03d902fcd"></a><!-- doxytag: member="_myPrivate::next" ref="a6e7a5e6234e0718d5f0d8ba03d902fcd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>* <a class="el" href="struct__myPrivate.html#a6e7a5e6234e0718d5f0d8ba03d902fcd">_myPrivate::next</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00610">dmxCloseConsoleScreen()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2ef864f533851d1c4a2a9f6c44400692"></a><!-- doxytag: member="_myPrivate::numAbs" ref="a2ef864f533851d1c4a2a9f6c44400692" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a2ef864f533851d1c4a2a9f6c44400692">_myPrivate::numAbs</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a06ca4d02bb8f2a1795251f496ffd3cb2"></a><!-- doxytag: member="_myPrivate::numLeds" ref="a06ca4d02bb8f2a1795251f496ffd3cb2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a06ca4d02bb8f2a1795251f496ffd3cb2">_myPrivate::numLeds</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Counts </p>
+
+</div>
+</div>
+<a class="anchor" id="af4532a0338cfa7325e8e3b2e3deb770f"></a><!-- doxytag: member="_myPrivate::numRel" ref="af4532a0338cfa7325e8e3b2e3deb770f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#af4532a0338cfa7325e8e3b2e3deb770f">_myPrivate::numRel</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ac1dfcacdf4e49a146bb96f5e6ad0e5ab"></a><!-- doxytag: member="_myPrivate::offX" ref="ac1dfcacdf4e49a146bb96f5e6ad0e5ab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ac1dfcacdf4e49a146bb96f5e6ad0e5ab">_myPrivate::offX</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a3969310e24e8d98d0456e41d7b10bd6d"></a><!-- doxytag: member="_myPrivate::offY" ref="a3969310e24e8d98d0456e41d7b10bd6d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a3969310e24e8d98d0456e41d7b10bd6d">_myPrivate::offY</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ae08ddb2f15fe104faf25f51f05c26033"></a><!-- doxytag: member="_myPrivate::pDevice" ref="ae08ddb2f15fe104faf25f51f05c26033" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DeviceIntPtr <a class="el" href="struct__myPrivate.html#ae08ddb2f15fe104faf25f51f05c26033">_myPrivate::pDevice</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Device (mouse or other) </p>
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00369">usbCreatePrivate()</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac184b2b8c6283dc678512c5f5990c0f2"></a><!-- doxytag: member="_myPrivate::pitch" ref="ac184b2b8c6283dc678512c5f5990c0f2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ac184b2b8c6283dc678512c5f5990c0f2">_myPrivate::pitch</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Keyboard device Bell pitch </p>
+
+</div>
+</div>
+<a class="anchor" id="a6384e7e09282c2d561b987b972ec41fb"></a><!-- doxytag: member="_myPrivate::pixmap" ref="a6384e7e09282c2d561b987b972ec41fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">Pixmap <a class="el" href="struct__myPrivate.html#a6384e7e09282c2d561b987b972ec41fb">_myPrivate::pixmap</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00623">dmxConsoleCreateEmptyCursor()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, <a class="el" href="dmxconsole_8c_source.html#l00154">dmxConsoleDrawFineCursor()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1f72c73bb97bf77b8f5359eabf81fb79"></a><!-- doxytag: member="_myPrivate::pKeyboard" ref="a1f72c73bb97bf77b8f5359eabf81fb79" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DeviceIntPtr <a class="el" href="struct__myPrivate.html#a1f72c73bb97bf77b8f5359eabf81fb79">_myPrivate::pKeyboard</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00360">kbdLinuxCreatePrivate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3e46e1ccb546bbadfa5ebb165a8b11d4"></a><!-- doxytag: member="_myPrivate::pMouse" ref="a3e46e1ccb546bbadfa5ebb165a8b11d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">DeviceIntPtr <a class="el" href="struct__myPrivate.html#a3e46e1ccb546bbadfa5ebb165a8b11d4">_myPrivate::pMouse</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-ms_8c_source.html#l00293">msLinuxCreatePrivate()</a>, and <a class="el" href="lnx-ps2_8c_source.html#l00261">ps2LinuxCreatePrivate()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a35c7eda9702b723812312689bf412424"></a><!-- doxytag: member="_myPrivate::prefix" ref="a35c7eda9702b723812312689bf412424" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned char <a class="el" href="struct__myPrivate.html#a35c7eda9702b723812312689bf412424">_myPrivate::prefix</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00621">kbdLinuxPrefixMapping()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8e9a33e0e90a65241cf26f3c03e8b629"></a><!-- doxytag: member="_myPrivate::relative" ref="a8e9a33e0e90a65241cf26f3c03e8b629" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a8e9a33e0e90a65241cf26f3c03e8b629">_myPrivate::relative</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad2d732244cdd84a0cc50bec620d50846"></a><!-- doxytag: member="_myPrivate::relmap" ref="ad2d732244cdd84a0cc50bec620d50846" args="[DMX_MAX_AXES]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#ad2d732244cdd84a0cc50bec620d50846">_myPrivate::relmap</a>[DMX_MAX_AXES]</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Relative axis map </p>
+
+</div>
+</div>
+<a class="anchor" id="ab4797772b07f0fc6aca12ca15bf58b26"></a><!-- doxytag: member="_myPrivate::switch_return" ref="ab4797772b07f0fc6aca12ca15bf58b26" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">SWITCHRETPROC <a class="el" href="struct__myPrivate.html#ab4797772b07f0fc6aca12ca15bf58b26">_myPrivate::switch_return</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a263e4371987e44a409cae181d97ce60b"></a><!-- doxytag: member="_myPrivate::switch_return_data" ref="a263e4371987e44a409cae181d97ce60b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* <a class="el" href="struct__myPrivate.html#a263e4371987e44a409cae181d97ce60b">_myPrivate::switch_return_data</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a7b46718db81521ae01ffbbe8f32a0203"></a><!-- doxytag: member="_myPrivate::switched" ref="a7b46718db81521ae01ffbbe8f32a0203" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a7b46718db81521ae01ffbbe8f32a0203">_myPrivate::switched</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00487">kbdLinuxVTSignalHandler()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a94623d180c53cc9a3902ce2c1f75529b"></a><!-- doxytag: member="_myPrivate::tty" ref="a94623d180c53cc9a3902ce2c1f75529b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">struct termios <a class="el" href="struct__myPrivate.html#a94623d180c53cc9a3902ce2c1f75529b">_myPrivate::tty</a><code> [read]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="abac94345370dae8caaf80f882ef14c8c"></a><!-- doxytag: member="_myPrivate::vtcurrent" ref="abac94345370dae8caaf80f882ef14c8c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#abac94345370dae8caaf80f882ef14c8c">_myPrivate::vtcurrent</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a463f3cda6fa6032ea0d976d35cd11c30"></a><!-- doxytag: member="_myPrivate::vtno" ref="a463f3cda6fa6032ea0d976d35cd11c30" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#a463f3cda6fa6032ea0d976d35cd11c30">_myPrivate::vtno</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00469">kbdLinuxVTSwitch()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af746fe4a014fddf10bfeb6c64a543918"></a><!-- doxytag: member="_myPrivate::width" ref="af746fe4a014fddf10bfeb6c64a543918" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="struct__myPrivate.html#af746fe4a014fddf10bfeb6c64a543918">_myPrivate::width</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00458">dmxConsoleCollectEvents()</a>, <a class="el" href="dmxconsole_8c_source.html#l00253">dmxConsoleDraw()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00306">dmxConsoleUpdateFineCursor()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9f848bc9be43096be0590740a9531c4c"></a><!-- doxytag: member="_myPrivate::xScale" ref="a9f848bc9be43096be0590740a9531c4c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double <a class="el" href="struct__myPrivate.html#a9f848bc9be43096be0590740a9531c4c">_myPrivate::xScale</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00119">scalex()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00129">unscalex()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9d41da04ff8e8b84f9ee138edffb16c7"></a><!-- doxytag: member="_myPrivate::yScale" ref="a9d41da04ff8e8b84f9ee138edffb16c7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double <a class="el" href="struct__myPrivate.html#a9d41da04ff8e8b84f9ee138edffb16c7">_myPrivate::yScale</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxconsole_8c_source.html#l00124">scaley()</a>, and <a class="el" href="dmxconsole_8c_source.html#l00134">unscaley()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following files:<ul>
+<li><a class="el" href="dmxbackend_8c.html">dmxbackend.c</a></li>
+<li><a class="el" href="lnx-ms_8c.html">lnx-ms.c</a></li>
+<li><a class="el" href="lnx-ps2_8c.html">lnx-ps2.c</a></li>
+<li><a class="el" href="dmxcommon_8c.html">dmxcommon.c</a></li>
+<li><a class="el" href="dmxconsole_8c.html">dmxconsole.c</a></li>
+<li><a class="el" href="lnx-keyboard_8c.html">lnx-keyboard.c</a></li>
+<li><a class="el" href="usb-private_8h_source.html">usb-private.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html b/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html
index 2c5584e14..e431d597d 100644
--- a/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html
+++ b/xorg-server/hw/dmx/doc/html/structdmxGlxVisualPrivate.html
@@ -6,18 +6,68 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>dmxGlxVisualPrivate Struct Reference</h1><code>#include &lt;<a class="el" href="dmx__glxvisuals_8h-source.html">dmx_glxvisuals.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structure&nbsp;Index</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dmxGlxVisualPrivate Struct Reference</h1><!-- doxytag: class="dmxGlxVisualPrivate" -->
+<p><code>#include &lt;<a class="el" href="dmx__glxvisuals_8h_source.html">dmx_glxvisuals.h</a>&gt;</code></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdmxGlxVisualPrivate.html#a22b2f774126458d7577f14bc5bdc40fb">x_visual_depth</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdmxGlxVisualPrivate.html#a33df80a1990066d8f5a98977efde76de">x_visual_class</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-GLX Visual private area. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmx__glxvisuals_8h-source.html">dmx_glxvisuals.h</a></ul>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>GLX Visual private area. </p>
+<hr/><h2>Field Documentation</h2>
+<a class="anchor" id="a33df80a1990066d8f5a98977efde76de"></a><!-- doxytag: member="dmxGlxVisualPrivate::x_visual_class" ref="a33df80a1990066d8f5a98977efde76de" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdmxGlxVisualPrivate.html#a33df80a1990066d8f5a98977efde76de">dmxGlxVisualPrivate::x_visual_class</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a22b2f774126458d7577f14bc5bdc40fb"></a><!-- doxytag: member="dmxGlxVisualPrivate::x_visual_depth" ref="a22b2f774126458d7577f14bc5bdc40fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdmxGlxVisualPrivate.html#a22b2f774126458d7577f14bc5bdc40fb">dmxGlxVisualPrivate::x_visual_depth</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="dmxinit_8c_source.html#l00561">InitOutput()</a>.</p>
+
+</div>
+</div>
+<hr/>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="dmx__glxvisuals_8h_source.html">dmx_glxvisuals.h</a></li>
+</ul>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html b/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html
deleted file mode 100644
index 580d1dcc0..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXAddInputReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXAddInput protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html b/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html
deleted file mode 100644
index 8f2a84d5d..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXAddInputReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXAddInputReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXAddInput protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html b/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html
deleted file mode 100644
index 6f1b91d8e..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXAddScreenReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXAddScreen protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html b/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html
deleted file mode 100644
index ec634882d..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXAddScreenReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXAddScreenReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXAddScreen protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html
deleted file mode 100644
index 5ca2fb174..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXChangeDesktopAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXChangeDesktopAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html
deleted file mode 100644
index 9fb5c4cdf..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXChangeDesktopAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXChangeDesktopAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXChangeDesktopAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html
deleted file mode 100644
index f7228665f..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXChangeScreensAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXChangeScreensAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html
deleted file mode 100644
index d744c6a72..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXChangeScreensAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXChangeScreensAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXChangeScreensAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html b/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html
deleted file mode 100644
index 796791499..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXForceWindowCreationReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXForceWindowCreation protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html b/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html
deleted file mode 100644
index b85f6b11c..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXForceWindowCreationReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXForceWindowCreationReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXForceWindowCreation protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html
deleted file mode 100644
index 6637fb12a..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetDesktopAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetDesktopAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html
deleted file mode 100644
index c9ecbc38d..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetDesktopAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetDesktopAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetDesktopAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html
deleted file mode 100644
index 71595c5a1..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetInputAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetInputAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html
deleted file mode 100644
index 6c7fade50..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetInputAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetInputAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html
deleted file mode 100644
index 375b1415c..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetInputCountReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetInputCount protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html
deleted file mode 100644
index 55251bb52..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetInputCountReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetInputCountReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetInputCount protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html
deleted file mode 100644
index 89ca021e7..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetScreenAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetScreenAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html
deleted file mode 100644
index d7d9e9afd..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetScreenAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetScreenAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html
deleted file mode 100644
index e694fc90a..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetScreenCountReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetScreenCount protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html
deleted file mode 100644
index f27e1e05a..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetScreenCountReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetScreenCountReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetScreenCount protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html b/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html
deleted file mode 100644
index 2e381958b..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetWindowAttributesReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetWindowAttributes protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html b/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html
deleted file mode 100644
index 9b3e1c053..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXGetWindowAttributesReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXGetWindowAttributesReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXGetWindowAttributes protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html b/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html
deleted file mode 100644
index c9a4683f1..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXQueryVersionReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXQueryVersion protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html b/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html
deleted file mode 100644
index fdc3c3f97..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXQueryVersionReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXQueryVersionReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXQueryVersion protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html
deleted file mode 100644
index 66c04a373..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXRemoveInputReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXRemoveInput protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html
deleted file mode 100644
index 62f2af182..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveInputReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXRemoveInputReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXRemoveInput protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html
deleted file mode 100644
index c446a3442..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXRemoveScreenReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXRemoveScreen protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html b/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html
deleted file mode 100644
index 3920bff9b..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXRemoveScreenReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXRemoveScreenReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXRemoveScreen protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html b/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html
deleted file mode 100644
index 0a361cf5d..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXSyncReply.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXSyncReply Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXSync protocol reply. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html b/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html
deleted file mode 100644
index a1580095d..000000000
--- a/xorg-server/hw/dmx/doc/html/structxDMXSyncReq.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>xDMXSyncReq Struct Reference</h1><code>#include &lt;<a class="el" href="dmxproto_8h-source.html">dmxproto.h</a>&gt;</code>
-<p>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Wire-level description of DMXSync protocol request. 
-<p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li><a class="el" href="dmxproto_8h-source.html">dmxproto.h</a></ul>
-    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/tree.html b/xorg-server/hw/dmx/doc/html/tree.html
index 59560837e..d85f37403 100644
--- a/xorg-server/hw/dmx/doc/html/tree.html
+++ b/xorg-server/hw/dmx/doc/html/tree.html
@@ -1,70 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/xhtml;charset="iso-8859-1" />
+    <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
     <meta http-equiv="Content-Style-Type" content="text/css" />
     <meta http-equiv="Content-Language" content="en" />
-    <link rel="stylesheet" href="doxygen.css">
+    <link rel="stylesheet" href="doxygen.css"/>
     <title>TreeView</title>
-    <style type="text/css">
-    <!--
-    .directory { font-size: 10pt; font-weight: bold; }
-    .directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
-    .directory p { margin: 0px; white-space: nowrap; }
-    .directory div { display: none; margin: 0px; }
-    .directory img { vertical-align: middle; }
-    -->
-    </style>
     <script type="text/javascript">
     <!-- // Hide script from old browsers
     
-    function findChildNode(node, name) 
-    {
-      var temp;
-      if (node == null) 
-      {
-        return null;
-      } 
-      node = node.firstChild;
-      while (node != null) 
-      {
-        if (node.nodeName == name) 
-        {
-          return node;
-        }
-        temp = findChildNode(node, name);
-        if (temp != null) 
-        {
-          return temp;
-        }
-        node = node.nextSibling;
-      }
-      return null;
-    }
-
     function toggleFolder(id, imageNode) 
     {
       var folder = document.getElementById(id);
-      var l = 0;
-      var vl = "ftv2vertline.png";
-      if (imageNode != null && imageNode.nodeName != "IMG") 
+      var l = imageNode.src.length;
+      if (imageNode.src.substring(l-20,l)=="ftv2folderclosed.png" || 
+          imageNode.src.substring(l-18,l)=="ftv2folderopen.png")
       {
-        imageNode = findChildNode(imageNode, "IMG");
-        if (imageNode!=null) l = imageNode.src.length;
+        imageNode = imageNode.previousSibling;
+        l = imageNode.src.length;
       }
       if (folder == null) 
       {
       } 
       else if (folder.style.display == "block") 
       {
-        while (imageNode != null && 
-               imageNode.src.substring(l-vl.length,l) == vl)
-        {
-          imageNode = imageNode.nextSibling;
-          l = imageNode.src.length;
-        }
         if (imageNode != null) 
         {
-          l = imageNode.src.length;
           imageNode.nextSibling.src = "ftv2folderclosed.png";
           if (imageNode.src.substring(l-13,l) == "ftv2mnode.png")
           {
@@ -79,15 +40,8 @@
       } 
       else 
       {
-        while (imageNode != null && 
-               imageNode.src.substring(l-vl.length,l) == vl)
-        {
-          imageNode = imageNode.nextSibling;
-          l = imageNode.src.length;
-        }
         if (imageNode != null) 
         {
-          l = imageNode.src.length;
           imageNode.nextSibling.src = "ftv2folderopen.png";
           if (imageNode.src.substring(l-13,l) == "ftv2pnode.png")
           {
@@ -106,190 +60,156 @@
     </script>
   </head>
 
-  <body bgcolor="#ffffff">
+  <body class="ftvtree">
     <div class="directory">
-      <h3>Distributed Multihead X</h3>
+      <h3 class="swap"><span>Distributed Multihead X</span></h3>
       <div style="display: block;">
-        <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="main.html" target="basefrm">Main Page</a></p>
-        <p><img src="ftv2pnode.png" alt="o" width=16 height=22 onclick="toggleFolder('folder1', this)"/><img src="ftv2folderclosed.png" alt="+" width=24 height=22 onclick="toggleFolder('folder1', this)"/><a class="el" href="files.html" target="basefrm">File List</a></p>
+        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="main.html" target="basefrm">Main Page</a></p>
+        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder1', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder1', this)"/><a class="el" href="annotated.html" target="basefrm">Data Structures</a></p>
         <div id="folder1">
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="ChkNotMaskEv_8c.html" target="basefrm">ChkNotMaskEv.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="ChkNotMaskEv_8h.html" target="basefrm">ChkNotMaskEv.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="programs_2Xserver_2Xext_2dmx_8c.html" target="basefrm">programs/Xserver/Xext/dmx.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lib_2dmx_2dmx_8c.html" target="basefrm">lib/dmx/dmx.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmx_8h.html" target="basefrm">dmx.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><b>dmx_glxvisuals.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxarg_8c.html" target="basefrm">dmxarg.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxarg_8h.html" target="basefrm">dmxarg.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxbackend_8c.html" target="basefrm">dmxbackend.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxbackend_8h.html" target="basefrm">dmxbackend.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcb_8c.html" target="basefrm">dmxcb.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcb_8h.html" target="basefrm">dmxcb.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxclient_8h.html" target="basefrm">dmxclient.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcmap_8c.html" target="basefrm">dmxcmap.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcmap_8h.html" target="basefrm">dmxcmap.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcommon_8c.html" target="basefrm">dmxcommon.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcommon_8h.html" target="basefrm">dmxcommon.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcompat_8c.html" target="basefrm">dmxcompat.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcompat_8h.html" target="basefrm">dmxcompat.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxconfig_8c.html" target="basefrm">dmxconfig.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxconfig_8h.html" target="basefrm">dmxconfig.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxconsole_8c.html" target="basefrm">dmxconsole.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxconsole_8h.html" target="basefrm">dmxconsole.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcursor_8c.html" target="basefrm">dmxcursor.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxcursor_8h.html" target="basefrm">dmxcursor.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxdetach_8c.html" target="basefrm">dmxdetach.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxdpms_8c.html" target="basefrm">dmxdpms.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxdpms_8h.html" target="basefrm">dmxdpms.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxdummy_8c.html" target="basefrm">dmxdummy.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxdummy_8h.html" target="basefrm">dmxdummy.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxeq_8c.html" target="basefrm">dmxeq.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxeq_8h.html" target="basefrm">dmxeq.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxevents_8c.html" target="basefrm">dmxevents.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxevents_8h.html" target="basefrm">dmxevents.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxext_8h.html" target="basefrm">dmxext.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxextension_8c.html" target="basefrm">dmxextension.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxextension_8h.html" target="basefrm">dmxextension.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxfont_8c.html" target="basefrm">dmxfont.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxfont_8h.html" target="basefrm">dmxfont.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxgc_8c.html" target="basefrm">dmxgc.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxgc_8h.html" target="basefrm">dmxgc.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxgcops_8c.html" target="basefrm">dmxgcops.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxgcops_8h.html" target="basefrm">dmxgcops.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinit_8c.html" target="basefrm">dmxinit.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinit_8h.html" target="basefrm">dmxinit.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinput_8c.html" target="basefrm">dmxinput.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinput_8h.html" target="basefrm">dmxinput.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinputinit_8c.html" target="basefrm">dmxinputinit.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxinputinit_8h.html" target="basefrm">dmxinputinit.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxlog_8c.html" target="basefrm">dmxlog.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxlog_8h.html" target="basefrm">dmxlog.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxmap_8c.html" target="basefrm">dmxmap.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxmap_8h.html" target="basefrm">dmxmap.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxmotion_8c.html" target="basefrm">dmxmotion.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxmotion_8h.html" target="basefrm">dmxmotion.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxparse_8c.html" target="basefrm">dmxparse.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxparse_8h.html" target="basefrm">dmxparse.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxpict_8c.html" target="basefrm">dmxpict.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxpict_8h.html" target="basefrm">dmxpict.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxpixmap_8c.html" target="basefrm">dmxpixmap.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxpixmap_8h.html" target="basefrm">dmxpixmap.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxprint_8c.html" target="basefrm">dmxprint.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxprint_8h.html" target="basefrm">dmxprint.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxprop_8c.html" target="basefrm">dmxprop.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxprop_8h.html" target="basefrm">dmxprop.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxproto_8h.html" target="basefrm">dmxproto.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxscrinit_8c.html" target="basefrm">dmxscrinit.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxscrinit_8h.html" target="basefrm">dmxscrinit.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxshadow_8c.html" target="basefrm">dmxshadow.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxshadow_8h.html" target="basefrm">dmxshadow.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxsigio_8c.html" target="basefrm">dmxsigio.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxsigio_8h.html" target="basefrm">dmxsigio.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxstat_8c.html" target="basefrm">dmxstat.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxstat_8h.html" target="basefrm">dmxstat.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxsync_8c.html" target="basefrm">dmxsync.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxsync_8h.html" target="basefrm">dmxsync.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxvisual_8c.html" target="basefrm">dmxvisual.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxvisual_8h.html" target="basefrm">dmxvisual.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxwindow_8c.html" target="basefrm">dmxwindow.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxwindow_8h.html" target="basefrm">dmxwindow.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="dmxxinput_8c.html" target="basefrm">dmxxinput.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-keyboard_8c.html" target="basefrm">lnx-keyboard.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-keyboard_8h.html" target="basefrm">lnx-keyboard.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-ms_8c.html" target="basefrm">lnx-ms.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-ms_8h.html" target="basefrm">lnx-ms.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-ps2_8c.html" target="basefrm">lnx-ps2.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="lnx-ps2_8h.html" target="basefrm">lnx-ps2.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-common_8c.html" target="basefrm">usb-common.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-common_8h.html" target="basefrm">usb-common.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-keyboard_8c.html" target="basefrm">usb-keyboard.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-keyboard_8h.html" target="basefrm">usb-keyboard.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-mouse_8c.html" target="basefrm">usb-mouse.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-mouse_8h.html" target="basefrm">usb-mouse.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-other_8c.html" target="basefrm">usb-other.c</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-other_8h.html" target="basefrm">usb-other.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="usb-private_8h.html" target="basefrm">usb-private.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxArg.html" target="basefrm">_dmxArg</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxColormapPriv.html" target="basefrm">_dmxColormapPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigComment.html" target="basefrm">_DMXConfigComment</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigDisplay.html" target="basefrm">_DMXConfigDisplay</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigEntry.html" target="basefrm">_DMXConfigEntry</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigFullDim.html" target="basefrm">_DMXConfigFullDim</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigNumber.html" target="basefrm">_DMXConfigNumber</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigOption.html" target="basefrm">_DMXConfigOption</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigPair.html" target="basefrm">_DMXConfigPair</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigParam.html" target="basefrm">_DMXConfigParam</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigPartDim.html" target="basefrm">_DMXConfigPartDim</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigString.html" target="basefrm">_DMXConfigString</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigSub.html" target="basefrm">_DMXConfigSub</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigToken.html" target="basefrm">_DMXConfigToken</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigVirtual.html" target="basefrm">_DMXConfigVirtual</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXConfigWall.html" target="basefrm">_DMXConfigWall</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxCursorPriv.html" target="basefrm">_dmxCursorPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXEventMap.html" target="basefrm">_DMXEventMap</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxFontPriv.html" target="basefrm">_dmxFontPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxGCPriv.html" target="basefrm">_dmxGCPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxGlyphPriv.html" target="basefrm">_dmxGlyphPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXInputInfo.html" target="basefrm">_DMXInputInfo</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXLocalInitInfo.html" target="basefrm">_DMXLocalInitInfo</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXLocalInputInfo.html" target="basefrm">_DMXLocalInputInfo</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxPictPriv.html" target="basefrm">_dmxPictPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxPixPriv.html" target="basefrm">_dmxPixPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXScreenInfo.html" target="basefrm">_DMXScreenInfo</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXStatAvg.html" target="basefrm">_DMXStatAvg</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__DMXStatInfo.html" target="basefrm">_DMXStatInfo</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__dmxWinPriv.html" target="basefrm">_dmxWinPriv</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="struct__myPrivate.html" target="basefrm">_myPrivate</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXConfigCmdStruct.html" target="basefrm">DMXConfigCmdStruct</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXConfigListStruct.html" target="basefrm">DMXConfigListStruct</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXDesktopAttributesRec.html" target="basefrm">DMXDesktopAttributesRec</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structdmxGlxVisualPrivate.html" target="basefrm">dmxGlxVisualPrivate</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXInputAttributesRec.html" target="basefrm">DMXInputAttributesRec</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXScreenAttributesRec.html" target="basefrm">DMXScreenAttributesRec</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structDMXWindowAttributesRec.html" target="basefrm">DMXWindowAttributesRec</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structstack.html" target="basefrm">stack</a></p>
         </div>
-        <p><img src="ftv2pnode.png" alt="o" width=16 height=22 onclick="toggleFolder('folder2', this)"/><img src="ftv2folderclosed.png" alt="+" width=24 height=22 onclick="toggleFolder('folder2', this)"/><a class="el" href="annotated.html" target="basefrm">Data Structures</a></p>
+        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="functions.html" target="basefrm">Data Fields</a></p>
+        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder2', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder2', this)"/><a class="el" href="files.html" target="basefrm">File List</a></p>
         <div id="folder2">
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxArg.html" target="basefrm">_dmxArg</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxColormapPriv.html" target="basefrm">_dmxColormapPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigComment.html" target="basefrm">_DMXConfigComment</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigDisplay.html" target="basefrm">_DMXConfigDisplay</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigEntry.html" target="basefrm">_DMXConfigEntry</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigFullDim.html" target="basefrm">_DMXConfigFullDim</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigNumber.html" target="basefrm">_DMXConfigNumber</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigOption.html" target="basefrm">_DMXConfigOption</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigPair.html" target="basefrm">_DMXConfigPair</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigParam.html" target="basefrm">_DMXConfigParam</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigPartDim.html" target="basefrm">_DMXConfigPartDim</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigString.html" target="basefrm">_DMXConfigString</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigSub.html" target="basefrm">_DMXConfigSub</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigToken.html" target="basefrm">_DMXConfigToken</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigVirtual.html" target="basefrm">_DMXConfigVirtual</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXConfigWall.html" target="basefrm">_DMXConfigWall</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxCursorPriv.html" target="basefrm">_dmxCursorPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXEventMap.html" target="basefrm">_DMXEventMap</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxFontPriv.html" target="basefrm">_dmxFontPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxGCPriv.html" target="basefrm">_dmxGCPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxGlyphPriv.html" target="basefrm">_dmxGlyphPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXInputInfo.html" target="basefrm">_DMXInputInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXLocalInitInfo.html" target="basefrm">_DMXLocalInitInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXLocalInputInfo.html" target="basefrm">_DMXLocalInputInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxPictPriv.html" target="basefrm">_dmxPictPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxPixPriv.html" target="basefrm">_dmxPixPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXScreenInfo.html" target="basefrm">_DMXScreenInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXStatAvg.html" target="basefrm">_DMXStatAvg</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__DMXStatInfo.html" target="basefrm">_DMXStatInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__dmxWinPriv.html" target="basefrm">_dmxWinPriv</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__Event.html" target="basefrm">_Event</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__EventQueue.html" target="basefrm">_EventQueue</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="struct__myPrivate.html" target="basefrm">_myPrivate</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXConfigCmdStruct.html" target="basefrm">DMXConfigCmdStruct</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXConfigListStruct.html" target="basefrm">DMXConfigListStruct</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXDesktopAttributes.html" target="basefrm">DMXDesktopAttributes</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXDesktopAttributesRec.html" target="basefrm">DMXDesktopAttributesRec</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structdmxGlxVisualPrivate.html" target="basefrm">dmxGlxVisualPrivate</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXInputAttributes.html" target="basefrm">DMXInputAttributes</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXInputAttributesRec.html" target="basefrm">DMXInputAttributesRec</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXScreenAttributes.html" target="basefrm">DMXScreenAttributes</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXScreenAttributesRec.html" target="basefrm">DMXScreenAttributesRec</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXWindowAttributes.html" target="basefrm">DMXWindowAttributes</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structDMXWindowAttributesRec.html" target="basefrm">DMXWindowAttributesRec</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXAddInputReply.html" target="basefrm">xDMXAddInputReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXAddInputReq.html" target="basefrm">xDMXAddInputReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXAddScreenReply.html" target="basefrm">xDMXAddScreenReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXAddScreenReq.html" target="basefrm">xDMXAddScreenReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXChangeDesktopAttributesReply.html" target="basefrm">xDMXChangeDesktopAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXChangeDesktopAttributesReq.html" target="basefrm">xDMXChangeDesktopAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXChangeScreensAttributesReply.html" target="basefrm">xDMXChangeScreensAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXChangeScreensAttributesReq.html" target="basefrm">xDMXChangeScreensAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXForceWindowCreationReply.html" target="basefrm">xDMXForceWindowCreationReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXForceWindowCreationReq.html" target="basefrm">xDMXForceWindowCreationReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetDesktopAttributesReply.html" target="basefrm">xDMXGetDesktopAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetDesktopAttributesReq.html" target="basefrm">xDMXGetDesktopAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetInputAttributesReply.html" target="basefrm">xDMXGetInputAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetInputAttributesReq.html" target="basefrm">xDMXGetInputAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetInputCountReply.html" target="basefrm">xDMXGetInputCountReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetInputCountReq.html" target="basefrm">xDMXGetInputCountReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetScreenAttributesReply.html" target="basefrm">xDMXGetScreenAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetScreenAttributesReq.html" target="basefrm">xDMXGetScreenAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetScreenCountReply.html" target="basefrm">xDMXGetScreenCountReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetScreenCountReq.html" target="basefrm">xDMXGetScreenCountReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetWindowAttributesReply.html" target="basefrm">xDMXGetWindowAttributesReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXGetWindowAttributesReq.html" target="basefrm">xDMXGetWindowAttributesReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXQueryVersionReply.html" target="basefrm">xDMXQueryVersionReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXQueryVersionReq.html" target="basefrm">xDMXQueryVersionReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXRemoveInputReply.html" target="basefrm">xDMXRemoveInputReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXRemoveInputReq.html" target="basefrm">xDMXRemoveInputReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXRemoveScreenReply.html" target="basefrm">xDMXRemoveScreenReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXRemoveScreenReq.html" target="basefrm">xDMXRemoveScreenReq</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXSyncReply.html" target="basefrm">xDMXSyncReply</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="structxDMXSyncReq.html" target="basefrm">xDMXSyncReq</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="ChkNotMaskEv_8c.html" target="basefrm">ChkNotMaskEv.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="ChkNotMaskEv_8h.html" target="basefrm">ChkNotMaskEv.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmx-config_8h.html" target="basefrm">dmx-config.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmx_8c.html" target="basefrm">dmx.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmx_8h.html" target="basefrm">dmx.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmx__glxvisuals_8c.html" target="basefrm">dmx_glxvisuals.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmx__glxvisuals_8h.html" target="basefrm">dmx_glxvisuals.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxarg_8c.html" target="basefrm">dmxarg.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxarg_8h.html" target="basefrm">dmxarg.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxbackend_8c.html" target="basefrm">dmxbackend.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxbackend_8h.html" target="basefrm">dmxbackend.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcb_8c.html" target="basefrm">dmxcb.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcb_8h.html" target="basefrm">dmxcb.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxclient_8h.html" target="basefrm">dmxclient.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcmap_8c.html" target="basefrm">dmxcmap.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcmap_8h.html" target="basefrm">dmxcmap.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcommon_8c.html" target="basefrm">dmxcommon.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcommon_8h.html" target="basefrm">dmxcommon.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcompat_8c.html" target="basefrm">dmxcompat.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcompat_8h.html" target="basefrm">dmxcompat.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxconfig_8c.html" target="basefrm">dmxconfig.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxconfig_8h.html" target="basefrm">dmxconfig.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxconsole_8c.html" target="basefrm">dmxconsole.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxconsole_8h.html" target="basefrm">dmxconsole.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcursor_8c.html" target="basefrm">dmxcursor.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxcursor_8h.html" target="basefrm">dmxcursor.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxdetach_8c.html" target="basefrm">dmxdetach.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxdpms_8c.html" target="basefrm">dmxdpms.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxdpms_8h.html" target="basefrm">dmxdpms.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxdummy_8c.html" target="basefrm">dmxdummy.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxdummy_8h.html" target="basefrm">dmxdummy.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxevents_8c.html" target="basefrm">dmxevents.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxevents_8h.html" target="basefrm">dmxevents.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxextension_8c.html" target="basefrm">dmxextension.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxextension_8h.html" target="basefrm">dmxextension.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxfont_8c.html" target="basefrm">dmxfont.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxfont_8h.html" target="basefrm">dmxfont.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxgc_8c.html" target="basefrm">dmxgc.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxgc_8h.html" target="basefrm">dmxgc.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxgcops_8c.html" target="basefrm">dmxgcops.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxgcops_8h.html" target="basefrm">dmxgcops.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinit_8c.html" target="basefrm">dmxinit.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinit_8h.html" target="basefrm">dmxinit.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinput_8c.html" target="basefrm">dmxinput.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinput_8h.html" target="basefrm">dmxinput.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinputinit_8c.html" target="basefrm">dmxinputinit.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxinputinit_8h.html" target="basefrm">dmxinputinit.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxlog_8c.html" target="basefrm">dmxlog.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxlog_8h.html" target="basefrm">dmxlog.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxmap_8c.html" target="basefrm">dmxmap.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxmap_8h.html" target="basefrm">dmxmap.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxmotion_8c.html" target="basefrm">dmxmotion.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxmotion_8h.html" target="basefrm">dmxmotion.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxparse_8c.html" target="basefrm">dmxparse.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxparse_8h.html" target="basefrm">dmxparse.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxpict_8c.html" target="basefrm">dmxpict.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxpict_8h.html" target="basefrm">dmxpict.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxpixmap_8c.html" target="basefrm">dmxpixmap.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxpixmap_8h.html" target="basefrm">dmxpixmap.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxprint_8c.html" target="basefrm">dmxprint.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxprint_8h.html" target="basefrm">dmxprint.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxprop_8c.html" target="basefrm">dmxprop.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxprop_8h.html" target="basefrm">dmxprop.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxscrinit_8c.html" target="basefrm">dmxscrinit.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxscrinit_8h.html" target="basefrm">dmxscrinit.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxshadow_8c.html" target="basefrm">dmxshadow.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxshadow_8h.html" target="basefrm">dmxshadow.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxsigio_8c.html" target="basefrm">dmxsigio.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxsigio_8h.html" target="basefrm">dmxsigio.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxstat_8c.html" target="basefrm">dmxstat.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxstat_8h.html" target="basefrm">dmxstat.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxsync_8c.html" target="basefrm">dmxsync.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxsync_8h.html" target="basefrm">dmxsync.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxtodmx_8c.html" target="basefrm">dmxtodmx.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxvisual_8c.html" target="basefrm">dmxvisual.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxvisual_8h.html" target="basefrm">dmxvisual.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxwindow_8c.html" target="basefrm">dmxwindow.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxwindow_8h.html" target="basefrm">dmxwindow.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dmxxinput_8c.html" target="basefrm">dmxxinput.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-keyboard_8c.html" target="basefrm">lnx-keyboard.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-keyboard_8h.html" target="basefrm">lnx-keyboard.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-ms_8c.html" target="basefrm">lnx-ms.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-ms_8h.html" target="basefrm">lnx-ms.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-ps2_8c.html" target="basefrm">lnx-ps2.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="lnx-ps2_8h.html" target="basefrm">lnx-ps2.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-common_8c.html" target="basefrm">usb-common.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-common_8h.html" target="basefrm">usb-common.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-keyboard_8c.html" target="basefrm">usb-keyboard.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-keyboard_8h.html" target="basefrm">usb-keyboard.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-mouse_8c.html" target="basefrm">usb-mouse.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-mouse_8h.html" target="basefrm">usb-mouse.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-other_8c.html" target="basefrm">usb-other.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-other_8h.html" target="basefrm">usb-other.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usb-private_8h.html" target="basefrm">usb-private.h</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="vdltodmx_8c.html" target="basefrm">vdltodmx.c</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="xdmxconfig_8c.html" target="basefrm">xdmxconfig.c</a></p>
         </div>
-        <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="functions.html" target="basefrm">Data Fields</a></p>
-        <p><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="globals.html" target="basefrm">Globals</a></p>
+        <p><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="globals.html" target="basefrm">Globals</a></p>
       </div>
     </div>
   </body>
 </html>
+
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8c.html b/xorg-server/hw/dmx/doc/html/usb-common_8c.html
index 3c1882a5b..0032cf4eb 100644
--- a/xorg-server/hw/dmx/doc/html/usb-common_8c.html
+++ b/xorg-server/hw/dmx/doc/html/usb-common_8c.html
@@ -6,208 +6,718 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-common.c File Reference</h1><code>#include "<a class="el" href="usb-private_8h-source.html">usb-private.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-mouse_8h-source.html">usb-mouse.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8c.html#a21">usbRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>usb-common.c File Reference</h1><code>#include &quot;<a class="el" href="usb-private_8h_source.html">usb-private.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-mouse_8h_source.html">usb-mouse.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a4745b9c19ea1cc480dc2b58e59d1e9bb">USB_COMMON_DEBUG</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a5340233a04762d00a2fc39e922489cbd">GETNAME</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a362570e9b2c9ac295638be490c81d1fb">LOG1INPUT</a>(p, f, a)&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#ab34476eaeb97ba2e10bab547085c22b8">LOG3INPUT</a>(p, f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#aa9a2c0ce5f5776ac17b498dc1d90ce1f">LOG5INPUT</a>(p, f, a, b, c, d, e)&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a,b,c,d,e)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>(b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>(b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a36b621e66020a8ee4641d56c73c4226b">test_bit</a>(bit)&nbsp;&nbsp;&nbsp;(priv-&gt;mask[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a228e7b7d6adf81ad78bc848896044085">test_bits</a>(bit)&nbsp;&nbsp;&nbsp;(bits[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#ae20f3b14463c8e288041f9970e388950">usbRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a01c83154e667f74a79fac7b951208646">usbPrint</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, const char *filename, const char *devname, int fd)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a> (DevicePtr pDev, <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a> type)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#aa86d87cabbc0971c51452970b7dc879f">usbOff</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a580f9f4ac56071b925cbf63d8b9dc706">usbCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8c.html#a0eca0051ed4a3a117d504d6a82c65313">usbDestroyPrivate</a> (pointer priv)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Routines that are common between <em><a class="el" href="usb-keyboard_8c.html">usb-keyboard.c</a></em>, <em><a class="el" href="usb-mouse_8c.html">usb-mouse.c</a></em>, and <em><a class="el" href="usb-other_8c.html">usb-other.c</a></em> </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="usb&#45;common.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8c.html#a23">usbInit</a> (DevicePtr pDev, usbType type)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="usb&#45;common.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8c.html#a24">usbOff</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="usb&#45;common.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8c.html#a25">usbCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="usb&#45;common.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8c.html#a26">usbDestroyPrivate</a> (pointer priv)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="usb&#45;common.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Routines that are common between #usb-keyboard.c, #usb-mouse.c, and #usb-other.c<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a25" doxytag="usb-common.c::usbCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="usb&#45;common.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer usbCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a5340233a04762d00a2fc39e922489cbd"></a><!-- doxytag: member="usb&#45;common.c::GETNAME" ref="a5340233a04762d00a2fc39e922489cbd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETNAME</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="usb-common.c::usbDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment">((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDevice-&gt;public.devicePrivate)) \
+                      -&gt;name
+</pre></div>
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="usb&#45;common.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                                         \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="usb&#45;common.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void usbDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="usb&#45;common.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="usb-common.c::usbInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a362570e9b2c9ac295638be490c81d1fb"></a><!-- doxytag: member="usb&#45;common.c::LOG1INPUT" ref="a362570e9b2c9ac295638be490c81d1fb" args="(p, f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1INPUT</td>
+          <td>(</td>
+          <td class="paramtype">p, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void usbInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="usb&#45;common.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>usbType&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="usb&#45;common.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialized <em>pDev</em> as a <em>usbMouse</em>, <em>usbKeyboard</em>, or <em>usbOther</em> device.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="usb-common.c::usbOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab34476eaeb97ba2e10bab547085c22b8"></a><!-- doxytag: member="usb&#45;common.c::LOG3INPUT" ref="ab34476eaeb97ba2e10bab547085c22b8" args="(p, f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG3INPUT</td>
+          <td>(</td>
+          <td class="paramtype">p, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a,b,c)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa9a2c0ce5f5776ac17b498dc1d90ce1f"></a><!-- doxytag: member="usb&#45;common.c::LOG5INPUT" ref="aa9a2c0ce5f5776ac17b498dc1d90ce1f" args="(p, f, a, b, c, d, e)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG5INPUT</td>
+          <td>(</td>
+          <td class="paramtype">p, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void usbOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">d, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">e&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLogInput(p-&gt;dmxInput,f,a,b,c,d,e)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="usb&#45;common.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="usb-common.c::usbRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7581da9bfd7ebf4fe3703352df521931"></a><!-- doxytag: member="usb&#45;common.c::PRESS" ref="a7581da9bfd7ebf4fe3703352df521931" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void usbRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define PRESS</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonPress, 0, 0, NULL, block);   \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a2b4d2480737f9eb52f80998518486f01"></a><!-- doxytag: member="usb&#45;common.c::RELEASE" ref="a2b4d2480737f9eb52f80998518486f01" args="(b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define RELEASE</td>
+          <td>(</td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span> {                                                 \
+        enqueue(pDev, ButtonRelease, 0, 0, NULL, block); \
+    } <span class="keywordflow">while</span> (0)
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a36b621e66020a8ee4641d56c73c4226b"></a><!-- doxytag: member="usb&#45;common.c::test_bit" ref="a36b621e66020a8ee4641d56c73c4226b" args="(bit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define test_bit</td>
+          <td>(</td>
+          <td class="paramtype">bit&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(priv-&gt;mask[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-other_8c_source.html#l00097">othUSBGetInfo()</a>, <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a228e7b7d6adf81ad78bc848896044085"></a><!-- doxytag: member="usb&#45;common.c::test_bits" ref="a228e7b7d6adf81ad78bc848896044085" args="(bit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define test_bits</td>
+          <td>(</td>
+          <td class="paramtype">bit&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(bits[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4745b9c19ea1cc480dc2b58e59d1e9bb"></a><!-- doxytag: member="usb&#45;common.c::USB_COMMON_DEBUG" ref="a4745b9c19ea1cc480dc2b58e59d1e9bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define USB_COMMON_DEBUG&nbsp;&nbsp;&nbsp;1</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a580f9f4ac56071b925cbf63d8b9dc706"></a><!-- doxytag: member="usb&#45;common.c::usbCreatePrivate" ref="a580f9f4ac56071b925cbf63d8b9dc706" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">pointer usbCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="usb-private_8h_source.html#l00101">_myPrivate::pDevice</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0eca0051ed4a3a117d504d6a82c65313"></a><!-- doxytag: member="usb&#45;common.c::usbDestroyPrivate" ref="a0eca0051ed4a3a117d504d6a82c65313" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void usbDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
+
+</div>
+</div>
+<a class="anchor" id="a7f9b3a6d320a9ddbed689f4e12acb443"></a><!-- doxytag: member="usb&#45;common.c::usbInit" ref="a7f9b3a6d320a9ddbed689f4e12acb443" args="(DevicePtr pDev, usbType type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void usbInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialized <em>pDev</em> as a <em>usbMouse</em>, <em>usbKeyboard</em>, or <em>usbOther</em> device. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>, <a class="el" href="usb-common_8c_source.html#l00162">test_bit</a>, <a class="el" href="usb-common_8c_source.html#l00163">test_bits</a>, <a class="el" href="usb-common_8h_source.html#l00042">usbKeyboard</a>, <a class="el" href="usb-common_8h_source.html#l00041">usbMouse</a>, <a class="el" href="usb-common_8h_source.html#l00043">usbOther</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00287">kbdUSBInit()</a>, <a class="el" href="usb-mouse_8c_source.html#l00079">mouUSBInit()</a>, and <a class="el" href="usb-other_8c_source.html#l00081">othUSBInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa86d87cabbc0971c51452970b7dc879f"></a><!-- doxytag: member="usb&#45;common.c::usbOff" ref="aa86d87cabbc0971c51452970b7dc879f" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void usbOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a01c83154e667f74a79fac7b951208646"></a><!-- doxytag: member="usb&#45;common.c::usbPrint" ref="a01c83154e667f74a79fac7b951208646" args="(myPrivate *priv, const char *filename, const char *devname, int fd)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void usbPrint </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>minButton</em>, </td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>devname</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>fd</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="usb-private_8h_source.html#l00094">ABS_BRAKE</a>, <a class="el" href="usb-private_8h_source.html#l00091">ABS_GAS</a>, <a class="el" href="usb-private_8h_source.html#l00088">ABS_WHEEL</a>, <a class="el" href="usb-private_8h_source.html#l00056">EV_FF</a>, <a class="el" href="usb-private_8h_source.html#l00053">EV_MSC</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, <a class="el" href="usb-common_8c_source.html#l00056">GETNAME</a>, <a class="el" href="usb-private_8h_source.html#l00068">LED_MISC</a>, <a class="el" href="usb-private_8h_source.html#l00065">LED_MUTE</a>, <a class="el" href="usb-private_8h_source.html#l00059">LED_SLEEP</a>, <a class="el" href="usb-private_8h_source.html#l00062">LED_SUSPEND</a>, <a class="el" href="usb-common_8c_source.html#l00063">LOG1INPUT</a>, <a class="el" href="usb-common_8c_source.html#l00064">LOG3INPUT</a>, <a class="el" href="usb-common_8c_source.html#l00065">LOG5INPUT</a>, <a class="el" href="usb-private_8h_source.html#l00101">_myPrivate::pDevice</a>, <a class="el" href="usb-common_8c_source.html#l00162">test_bit</a>, and <a class="el" href="usb-common_8c_source.html#l00163">test_bits</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ae20f3b14463c8e288041f9970e388950"></a><!-- doxytag: member="usb&#45;common.c::usbRead" ref="ae20f3b14463c8e288041f9970e388950" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, int minButton, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void usbRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>minButton</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.<p>
-Since USB devices return EV_KEY events for buttons and keys, <em>minButton</em> is used to decide if a Button or Key event should be queued.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.</p>
+<p>Since USB devices return EV_KEY events for buttons and keys, <em>minButton</em> is used to decide if a Button or Key event should be queued. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00077">DMX_ABSOLUTE</a>, <a class="el" href="dmxevents_8c_source.html#l00280">DMX_MAX_AXES</a>, <a class="el" href="dmxinputinit_8h_source.html#l00076">DMX_RELATIVE</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00142">LOG3</a>, <a class="el" href="lnx-ms_8c.html#a7581da9bfd7ebf4fe3703352df521931">PRESS</a>, and <a class="el" href="lnx-ms_8c.html#a2b4d2480737f9eb52f80998518486f01">RELEASE</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-mouse_8c_source.html#l00069">mouUSBRead()</a>, and <a class="el" href="usb-other_8c_source.html#l00071">othUSBRead()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html
deleted file mode 100644
index 422ce1ff7..000000000
--- a/xorg-server/hw/dmx/doc/html/usb-common_8h-source.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-common.h</h1><a href="usb-common_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00039 <span class="preprocessor">#ifndef _USB_COMMON_H_</span>
-00040 <span class="preprocessor"></span><span class="preprocessor">#define _USB_COMMON_H_</span>
-00041 <span class="preprocessor"></span><span class="keyword">typedef</span> <span class="keyword">enum</span> {
-00042     usbMouse,
-00043     usbKeyboard,
-00044     usbOther
-00045 } usbType;
-00046 
-00047 <span class="keyword">extern</span> pointer <a class="code" href="usb-common_8c.html#a25">usbCreatePrivate</a>(DeviceIntPtr pDevice);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a26">usbDestroyPrivate</a>(pointer priv);
-00049 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a21">usbRead</a>(DevicePtr pDev,
-00050                        dmxMotionProcPtr motion,
-00051                        dmxEnqueueProcPtr enqueue,
-00052                        <span class="keywordtype">int</span> minButton,
-00053                        DMXBlockType block);
-00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a23">usbInit</a>(DevicePtr pDev, usbType type);
-00055 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a24">usbOff</a>(DevicePtr pDev);
-00056 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h.html b/xorg-server/hw/dmx/doc/html/usb-common_8h.html
index 846695551..6fb3ff95e 100644
--- a/xorg-server/hw/dmx/doc/html/usb-common_8h.html
+++ b/xorg-server/hw/dmx/doc/html/usb-common_8h.html
@@ -6,153 +6,211 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>usb-common.h File Reference</h1>
-<p>
-<a href="usb-common_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>pointer&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8h.html#a3">usbCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8h.html#a4">usbDestroyPrivate</a> (pointer priv)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8h.html#a6">usbInit</a> (DevicePtr pDev, usbType type)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-common_8h.html#a7">usbOff</a> (DevicePtr pDev)</td></tr>
-
+<p><a href="usb-common_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Enumerations</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a> { <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7">usbMouse</a>, 
+<a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3">usbKeyboard</a>, 
+<a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb">usbOther</a>
+ }</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">pointer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#a580f9f4ac56071b925cbf63d8b9dc706">usbCreatePrivate</a> (DeviceIntPtr pDevice)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#a0eca0051ed4a3a117d504d6a82c65313">usbDestroyPrivate</a> (pointer priv)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#aea8c9cef438c8851ef7f47d7167152cb">usbRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, int minButton, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a> (DevicePtr pDev, <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a> type)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-common_8h.html#aa86d87cabbc0971c51452970b7dc879f">usbOff</a> (DevicePtr pDev)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to common USB support. <dl compact><dt><b>See also:</b></dt><dd>usb-common.c <p>
-usb-mouse.c <p>
-usb-keyboard.c <p>
-usb-other.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a3" doxytag="usb-common.h::usbCreatePrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to common USB support. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="usb-common_8c.html">usb-common.c</a> </dd>
+<dd>
+<a class="el" href="usb-mouse_8c.html">usb-mouse.c</a> </dd>
+<dd>
+<a class="el" href="usb-keyboard_8c.html">usb-keyboard.c</a> </dd>
+<dd>
+<a class="el" href="usb-other_8c.html">usb-other.c</a> </dd></dl>
+<hr/><h2>Enumeration Type Documentation</h2>
+<a class="anchor" id="a5e4410bf95babe73bcecc612691fc2d0"></a><!-- doxytag: member="usb&#45;common.h::usbType" ref="a5e4410bf95babe73bcecc612691fc2d0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> pointer usbCreatePrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DeviceIntPtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDevice</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">enum <a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
+</div>
+<div class="memdoc">
+<dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
+<tr><td valign="top"><em><a class="anchor" id="a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7"></a><!-- doxytag: member="usbMouse" ref="a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7" args="" -->usbMouse</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3"></a><!-- doxytag: member="usbKeyboard" ref="a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3" args="" -->usbKeyboard</em>&nbsp;</td><td>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" id="a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb"></a><!-- doxytag: member="usbOther" ref="a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb" args="" -->usbOther</em>&nbsp;</td><td>
+</td></tr>
 </table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</dd>
+</dl>
 
-<p>
-Create a private structure for use within this file.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a4" doxytag="usb-common.h::usbDestroyPrivate" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a580f9f4ac56071b925cbf63d8b9dc706"></a><!-- doxytag: member="usb&#45;common.h::usbCreatePrivate" ref="a580f9f4ac56071b925cbf63d8b9dc706" args="(DeviceIntPtr pDevice)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void usbDestroyPrivate </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">pointer&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>priv</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">pointer usbCreatePrivate </td>
+          <td>(</td>
+          <td class="paramtype">DeviceIntPtr&nbsp;</td>
+          <td class="paramname"> <em>pDevice</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Create a private structure for use within this file. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00178">_myPrivate::fd</a>, and <a class="el" href="usb-private_8h_source.html#l00101">_myPrivate::pDevice</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a0eca0051ed4a3a117d504d6a82c65313"></a><!-- doxytag: member="usb&#45;common.h::usbDestroyPrivate" ref="a0eca0051ed4a3a117d504d6a82c65313" args="(pointer priv)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void usbDestroyPrivate </td>
+          <td>(</td>
+          <td class="paramtype">pointer&nbsp;</td>
+          <td class="paramname"> <em>priv</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Destroy a private structure. </p>
 
-<p>
-Destroy a private structure.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a6" doxytag="usb-common.h::usbInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a7f9b3a6d320a9ddbed689f4e12acb443"></a><!-- doxytag: member="usb&#45;common.h::usbInit" ref="a7f9b3a6d320a9ddbed689f4e12acb443" args="(DevicePtr pDev, usbType type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void usbInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void usbInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>usbType&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em></td>
+          <td class="paramtype"><a class="el" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialized <em>pDev</em> as a <em>usbMouse</em>, <em>usbKeyboard</em>, or <em>usbOther</em> device. </p>
 
-<p>
-Initialized <em>pDev</em> as a <em>usbMouse</em>, <em>usbKeyboard</em>, or <em>usbOther</em> device.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a7" doxytag="usb-common.h::usbOff" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00144">FATAL1</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="dmxsigio_8c_source.html#l00062">O_NONBLOCK</a>, <a class="el" href="usb-common_8c_source.html#l00162">test_bit</a>, <a class="el" href="usb-common_8c_source.html#l00163">test_bits</a>, <a class="el" href="usb-common_8h_source.html#l00042">usbKeyboard</a>, <a class="el" href="usb-common_8h_source.html#l00041">usbMouse</a>, <a class="el" href="usb-common_8h_source.html#l00043">usbOther</a>, and <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00287">kbdUSBInit()</a>, <a class="el" href="usb-mouse_8c_source.html#l00079">mouUSBInit()</a>, and <a class="el" href="usb-other_8c_source.html#l00081">othUSBInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aa86d87cabbc0971c51452970b7dc879f"></a><!-- doxytag: member="usb&#45;common.h::usbOff" ref="aa86d87cabbc0971c51452970b7dc879f" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void usbOff </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void usbOff </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="aea8c9cef438c8851ef7f47d7167152cb"></a><!-- doxytag: member="usb&#45;common.h::usbRead" ref="aea8c9cef438c8851ef7f47d7167152cb" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, int minButton, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void usbRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>minButton</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Turn <em>pDev</em> off (i.e., stop taking input from <em>pDev</em>).     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html
new file mode 100644
index 000000000..722e849b1
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/usb-common_8h_source.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>usb-common.h</h1><a href="usb-common_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00038"></a>00038 <span class="preprocessor">#ifndef _USB_COMMON_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="preprocessor">#define _USB_COMMON_H_</span>
+<a name="l00040"></a><a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">00040</a> <span class="preprocessor"></span><span class="keyword">typedef</span> <span class="keyword">enum</span> {
+<a name="l00041"></a><a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7">00041</a>     <a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0a6bd9e53b1b5835e304e54ba13a227de7">usbMouse</a>,
+<a name="l00042"></a><a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3">00042</a>     <a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0ac0ee79f0c48b61dfd08fff502a2752a3">usbKeyboard</a>,
+<a name="l00043"></a><a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb">00043</a>     <a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0acf68ef2e5cae37647c412e73c93960fb">usbOther</a>
+<a name="l00044"></a>00044 } <a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a>;
+<a name="l00045"></a>00045 
+<a name="l00046"></a>00046 <span class="keyword">extern</span> pointer <a class="code" href="usb-common_8c.html#a580f9f4ac56071b925cbf63d8b9dc706">usbCreatePrivate</a>(DeviceIntPtr pDevice);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a0eca0051ed4a3a117d504d6a82c65313">usbDestroyPrivate</a>(pointer priv);
+<a name="l00048"></a>00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#ae20f3b14463c8e288041f9970e388950">usbRead</a>(DevicePtr pDev,
+<a name="l00049"></a>00049                        <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00050"></a>00050                        <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00051"></a>00051                        <span class="keywordtype">int</span> minButton,
+<a name="l00052"></a>00052                        <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00053"></a>00053 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>(DevicePtr pDev, <a class="code" href="usb-common_8h.html#a5e4410bf95babe73bcecc612691fc2d0">usbType</a> type);
+<a name="l00054"></a>00054 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-common_8c.html#aa86d87cabbc0971c51452970b7dc879f">usbOff</a>(DevicePtr pDev);
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html
index 5da5a0b3b..6ef084811 100644
--- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html
+++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8c.html
@@ -6,217 +6,703 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-keyboard.c File Reference</h1><code>#include "atKeynames.h"</code><br>
-<code>#include "<a class="el" href="usb-private_8h-source.html">usb-private.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-keyboard_8h-source.html">usb-keyboard.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8c.html#a20">kbdUSBCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>usb-keyboard.c File Reference</h1><code>#include &quot;atKeynames.h&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-private_8h_source.html">usb-private.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-keyboard_8h_source.html">usb-keyboard.h</a>&quot;</code><br/>
+<code>#include &lt;xkbsrv.h&gt;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a6a3bdd45bcb120470819f4ef1ffabc57">USB_KEYBOARD_DEBUG</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a6238ada986dd7e452a89773c2252a96d">GLYPHS_PER_KEY</a>&nbsp;&nbsp;&nbsp;4</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a6dbb3fc1c4a78ddba8904d186c8b2784">NUM_KEYCODES</a>&nbsp;&nbsp;&nbsp;248</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a4204c7bd1b89b76ee0bd11d53741d4e6">MIN_KEYCODE</a>&nbsp;&nbsp;&nbsp;8</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#ac769af5d0ea9b1ab3a1cd61572f8f302">MAX_KEYCODE</a>&nbsp;&nbsp;&nbsp;(NUM_KEYCODES + MIN_KEYCODE - 1)</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#ac5b3c28b56eee8c08253f2c93247c2fb">kbdUSBKeyDown</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int keyCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a31da2502826ab88638635abb2b719cae">kbdUSBKeyState</a> (<a class="el" href="struct__myPrivate.html">myPrivate</a> *priv, int type, int keyCode)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a0e9cdd2a76b14cad8a054f2e6e1dbc08">kbdUSBCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a294cdaa0f31f5f463562c72107b569f2">kbdUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a1bdbc94af66450a58735130ce8b994d0">kbdUSBConvert</a> (DevicePtr pDev, unsigned int scanCode, int value, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a75d61db123cbd10084ecdee9f18a30bf">kbdUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#ab1326e68df2758918fd0e9aa06387424">kbdUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#accd75bb2b1ea015ca086fb41c472546b">kbdUSBGetMap</a> (DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a2513592fe5b9c9f0cafcb299c6531d50">kbdUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td colspan="2"><h2>Variables</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static KeySym&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a> [NUM_KEYCODES *GLYPHS_PER_KEY]</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for a USB keyboard under Linux. The keymap description is derived from code by Thomas Roell, Orest Zborowski. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="usb&#45;keyboard.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8c.html#a21">kbdUSBInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="usb&#45;keyboard.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8c.html#a23">kbdUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="usb&#45;keyboard.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8c.html#a24">kbdUSBOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="usb&#45;keyboard.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8c.html#a26">kbdUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="usb&#45;keyboard.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for a USB keyboard under Linux. The keymap description is derived from code by Thomas Roell, Orest Zborowski.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a20" doxytag="usb-keyboard.c::kbdUSBCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="usb&#45;keyboard.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="usb&#45;keyboard.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a6238ada986dd7e452a89773c2252a96d"></a><!-- doxytag: member="usb&#45;keyboard.c::GLYPHS_PER_KEY" ref="a6238ada986dd7e452a89773c2252a96d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GLYPHS_PER_KEY&nbsp;&nbsp;&nbsp;4</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="usb&#45;keyboard.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="usb&#45;keyboard.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="usb&#45;keyboard.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Set the LEDs.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a26" doxytag="usb-keyboard.c::kbdUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="usb&#45;keyboard.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">b, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="ac769af5d0ea9b1ab3a1cd61572f8f302"></a><!-- doxytag: member="usb&#45;keyboard.c::MAX_KEYCODE" ref="ac769af5d0ea9b1ab3a1cd61572f8f302" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MAX_KEYCODE&nbsp;&nbsp;&nbsp;(NUM_KEYCODES + MIN_KEYCODE - 1)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a21" doxytag="usb-keyboard.c::kbdUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a4204c7bd1b89b76ee0bd11d53741d4e6"></a><!-- doxytag: member="usb&#45;keyboard.c::MIN_KEYCODE" ref="a4204c7bd1b89b76ee0bd11d53741d4e6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define MIN_KEYCODE&nbsp;&nbsp;&nbsp;8</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00657">kbdLinuxConvert()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="usb&#45;keyboard.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a24" doxytag="usb-keyboard.c::kbdUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a6dbb3fc1c4a78ddba8904d186c8b2784"></a><!-- doxytag: member="usb&#45;keyboard.c::NUM_KEYCODES" ref="a6dbb3fc1c4a78ddba8904d186c8b2784" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int kbdUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define NUM_KEYCODES&nbsp;&nbsp;&nbsp;248</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6a3bdd45bcb120470819f4ef1ffabc57"></a><!-- doxytag: member="usb&#45;keyboard.c::USB_KEYBOARD_DEBUG" ref="a6a3bdd45bcb120470819f4ef1ffabc57" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define USB_KEYBOARD_DEBUG&nbsp;&nbsp;&nbsp;0</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a23" doxytag="usb-keyboard.c::kbdUSBRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a1bdbc94af66450a58735130ce8b994d0"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBConvert" ref="a1bdbc94af66450a58735130ce8b994d0" args="(DevicePtr pDev, unsigned int scanCode, int value, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdUSBConvert </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>scanCode</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00202">kbdLinuxKeyDown()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00245">kbdUSBKeyDown()</a>, <a class="el" href="usb-keyboard_8c_source.html#l00254">kbdUSBKeyState()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00110">MIN_KEYCODE</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00369">kbdUSBRead()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0e9cdd2a76b14cad8a054f2e6e1dbc08"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBCtrl" ref="a0e9cdd2a76b14cad8a054f2e6e1dbc08" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdUSBCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Set the LEDs. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2513592fe5b9c9f0cafcb299c6531d50"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBGetInfo" ref="a2513592fe5b9c9f0cafcb299c6531d50" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00093">_DMXLocalInitInfo::force</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00091">_DMXLocalInitInfo::names</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="accd75bb2b1ea015ca086fb41c472546b"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBGetMap" ref="accd75bb2b1ea015ca086fb41c472546b" args="(DevicePtr pDev, KeySymsPtr pKeySyms, CARD8 *pModMap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static void kbdUSBGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">KeySymsPtr&nbsp;</td>
+          <td class="paramname"> <em>pKeySyms</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">CARD8 *&nbsp;</td>
+          <td class="paramname"> <em>pModMap</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="usb-keyboard_8c_source.html#l00108">GLYPHS_PER_KEY</a>, <a class="el" href="usb-keyboard_8c_source.html#l00113">map</a>, <a class="el" href="usb-keyboard_8c_source.html#l00111">MAX_KEYCODE</a>, <a class="el" href="usb-keyboard_8c_source.html#l00110">MIN_KEYCODE</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00109">NUM_KEYCODES</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00435">kbdUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a294cdaa0f31f5f463562c72107b569f2"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBInit" ref="a294cdaa0f31f5f463562c72107b569f2" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
+
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00042">usbKeyboard</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00388">kbdUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ac5b3c28b56eee8c08253f2c93247c2fb"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBKeyDown" ref="ac5b3c28b56eee8c08253f2c93247c2fb" args="(myPrivate *priv, int keyCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static int kbdUSBKeyDown </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>keyCode</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00184">_myPrivate::kbdState</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00173">NUM_STATE_ENTRIES</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a31da2502826ab88638635abb2b719cae"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBKeyState" ref="a31da2502826ab88638635abb2b719cae" args="(myPrivate *priv, int type, int keyCode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">static void kbdUSBKeyState </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__myPrivate.html">myPrivate</a> *&nbsp;</td>
+          <td class="paramname"> <em>priv</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>keyCode</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00184">_myPrivate::kbdState</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00173">NUM_STATE_ENTRIES</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab1326e68df2758918fd0e9aa06387424"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBOn" ref="ab1326e68df2758918fd0e9aa06387424" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int kbdUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00287">kbdUSBInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a75d61db123cbd10084ecdee9f18a30bf"></a><!-- doxytag: member="usb&#45;keyboard.c::kbdUSBRead" ref="a75d61db123cbd10084ecdee9f18a30bf" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Read an event from the <em>pDev</em> device. If the event is a motion event, enqueue it with the <em>motion</em> function. Otherwise, check for special keys with the <em>checkspecial</em> function and enqueue the event with the <em>enqueue</em> function. The <em>block</em> type is passed to the functions so that they may block SIGIO handling as appropriate to the caller of this function. </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="usb-keyboard_8c_source.html#l00292">kbdUSBConvert()</a>, and <a class="el" href="lnx-keyboard_8c_source.html#l00142">LOG3</a>.</p>
+
+</div>
+</div>
+<hr/><h2>Variable Documentation</h2>
+<a class="anchor" id="a2187a19657fb0b38c67dbafc7dd74c4d"></a><!-- doxytag: member="usb&#45;keyboard.c::map" ref="a2187a19657fb0b38c67dbafc7dd74c4d" args="[NUM_KEYCODES *GLYPHS_PER_KEY]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">KeySym <a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>[NUM_KEYCODES *GLYPHS_PER_KEY]<code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="lnx-keyboard_8c_source.html#l00933">kbdLinuxGetMap()</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00784">kbdLinuxReadKernelMapping()</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html
deleted file mode 100644
index 1f03b2483..000000000
--- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h-source.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-keyboard.h</h1><a href="usb-keyboard_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _USB_KEYBOARD_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _USB_KEYBOARD_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a21">kbdUSBInit</a>(DevicePtr pDev);
-00041 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a26">kbdUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00042 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-keyboard_8c.html#a24">kbdUSBOn</a>(DevicePtr pDev);
-00043 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a23">kbdUSBRead</a>(DevicePtr pDev,
-00044                           dmxMotionProcPtr motion,
-00045                           dmxEnqueueProcPtr enqueue,
-00046                           dmxCheckSpecialProcPtr checkspecial,
-00047                           DMXBlockType block);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a20">kbdUSBCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
-00049 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html
index 23f48a73a..988ee18cb 100644
--- a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html
+++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h.html
@@ -6,160 +6,189 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>usb-keyboard.h File Reference</h1>
-<p>
-<a href="usb-keyboard_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8h.html#a0">kbdUSBInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8h.html#a1">kbdUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8h.html#a2">kbdUSBOn</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-keyboard_8h.html#a4">kbdUSBCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
-
+<p><a href="usb-keyboard_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8h.html#a294cdaa0f31f5f463562c72107b569f2">kbdUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8h.html#a2513592fe5b9c9f0cafcb299c6531d50">kbdUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8h.html#ab1326e68df2758918fd0e9aa06387424">kbdUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8h.html#a2f9f160c14e7911c167f03c9eab139e7">kbdUSBRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-keyboard_8h.html#a0e9cdd2a76b14cad8a054f2e6e1dbc08">kbdUSBCtrl</a> (DevicePtr pDev, KeybdCtrl *ctrl)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to USB keyboard driver. <dl compact><dt><b>See also:</b></dt><dd>usb-keyboard.c <p>
-usb-common.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a4" doxytag="usb-keyboard.h::kbdUSBCtrl" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to USB keyboard driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="usb-keyboard_8c.html">usb-keyboard.c</a> </dd>
+<dd>
+<a class="el" href="usb-common_8c.html">usb-common.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a0e9cdd2a76b14cad8a054f2e6e1dbc08"></a><!-- doxytag: member="usb&#45;keyboard.h::kbdUSBCtrl" ref="a0e9cdd2a76b14cad8a054f2e6e1dbc08" args="(DevicePtr pDev, KeybdCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBCtrl </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdUSBCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap>KeybdCtrl *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ctrl</em></td>
+          <td class="paramtype">KeybdCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Set the LEDs. </p>
 
-<p>
-Set the LEDs.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="usb-keyboard.h::kbdUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2513592fe5b9c9f0cafcb299c6531d50"></a><!-- doxytag: member="usb&#45;keyboard.h::kbdUSBGetInfo" ref="a2513592fe5b9c9f0cafcb299c6531d50" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void kbdUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a0" doxytag="usb-keyboard.h::kbdUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00109">_DMXLocalInitInfo::focusClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00093">_DMXLocalInitInfo::force</a>, <a class="el" href="dmxinputinit_8h_source.html#l00113">_DMXLocalInitInfo::kbdFeedbackClass</a>, <a class="el" href="usb-keyboard_8c_source.html#l00396">kbdUSBGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00084">_DMXLocalInitInfo::keyboard</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00089">_DMXLocalInitInfo::modMap</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00091">_DMXLocalInitInfo::names</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a294cdaa0f31f5f463562c72107b569f2"></a><!-- doxytag: member="usb&#45;keyboard.h::kbdUSBInit" ref="a294cdaa0f31f5f463562c72107b569f2" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void kbdUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void kbdUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
 
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a2" doxytag="usb-keyboard.h::kbdUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00042">usbKeyboard</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-keyboard_8c_source.html#l00388">kbdUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ab1326e68df2758918fd0e9aa06387424"></a><!-- doxytag: member="usb&#45;keyboard.h::kbdUSBOn" ref="ab1326e68df2758918fd0e9aa06387424" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int kbdUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int kbdUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-keyboard_8c_source.html#l00287">kbdUSBInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a2f9f160c14e7911c167f03c9eab139e7"></a><!-- doxytag: member="usb&#45;keyboard.h::kbdUSBRead" ref="a2f9f160c14e7911c167f03c9eab139e7" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void kbdUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html
new file mode 100644
index 000000000..ae2519d2b
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/usb-keyboard_8h_source.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>usb-keyboard.h</h1><a href="usb-keyboard_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _USB_KEYBOARD_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _USB_KEYBOARD_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a294cdaa0f31f5f463562c72107b569f2">kbdUSBInit</a>(DevicePtr pDev);
+<a name="l00040"></a>00040 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a2513592fe5b9c9f0cafcb299c6531d50">kbdUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00041"></a>00041 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-keyboard_8c.html#ab1326e68df2758918fd0e9aa06387424">kbdUSBOn</a>(DevicePtr pDev);
+<a name="l00042"></a>00042 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a75d61db123cbd10084ecdee9f18a30bf">kbdUSBRead</a>(DevicePtr pDev,
+<a name="l00043"></a>00043                           <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00044"></a>00044                           <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00045"></a>00045                           <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00046"></a>00046                           <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-keyboard_8c.html#a0e9cdd2a76b14cad8a054f2e6e1dbc08">kbdUSBCtrl</a>(DevicePtr pDev, KeybdCtrl *ctrl);
+<a name="l00048"></a>00048 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html
index ea3767d19..956624145 100644
--- a/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html
+++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8c.html
@@ -6,176 +6,446 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-mouse.c File Reference</h1><code>#include "<a class="el" href="usb-private_8h-source.html">usb-private.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-mouse_8h-source.html">usb-mouse.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8c.html#a12">mouUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>usb-mouse.c File Reference</h1><code>#include &quot;<a class="el" href="usb-private_8h_source.html">usb-private.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-mouse_8h_source.html">usb-mouse.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#ae823cb66bf7678148ffadf3202034921">mouUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a6c0a19ce4ec02df96f781152a8cc5d36">mouUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a919a8e16f26a0742cda7c9824270501b">mouUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a006f4bb1b13582dc5d54ba662b84a4d7">mouUSBGetMap</a> (DevicePtr pDev, unsigned char *<a class="el" href="usb-keyboard_8c.html#a2187a19657fb0b38c67dbafc7dd74c4d">map</a>, int *nButtons)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8c.html#a422205f883732c44c29093a832254579">mouUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for a USB mouse. </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="usb&#45;mouse.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8c.html#a13">mouUSBInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="usb&#45;mouse.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8c.html#a14">mouUSBOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="usb&#45;mouse.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8c.html#a16">mouUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="usb&#45;mouse.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for a USB mouse.<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a16" doxytag="usb-mouse.c::mouUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="usb&#45;mouse.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void mouUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="usb&#45;mouse.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="usb&#45;mouse.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="usb-mouse.c::mouUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="usb&#45;mouse.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void mouUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="usb-mouse.c::mouUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="usb&#45;mouse.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> int mouUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="usb&#45;mouse.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a12" doxytag="usb-mouse.c::mouUSBRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="usb&#45;mouse.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void mouUSBRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="usb&#45;mouse.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a422205f883732c44c29093a832254579"></a><!-- doxytag: member="usb&#45;mouse.c::mouUSBGetInfo" ref="a422205f883732c44c29093a832254579" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="usb-mouse_8c_source.html#l00093">mouUSBGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a006f4bb1b13582dc5d54ba662b84a4d7"></a><!-- doxytag: member="usb&#45;mouse.c::mouUSBGetMap" ref="a006f4bb1b13582dc5d54ba662b84a4d7" args="(DevicePtr pDev, unsigned char *map, int *nButtons)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">static void mouUSBGetMap </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>map</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>nButtons</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [static]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-mouse_8c_source.html#l00103">mouUSBGetInfo()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6c0a19ce4ec02df96f781152a8cc5d36"></a><!-- doxytag: member="usb&#45;mouse.c::mouUSBInit" ref="a6c0a19ce4ec02df96f781152a8cc5d36" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
+
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00041">usbMouse</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-mouse_8c_source.html#l00085">mouUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a919a8e16f26a0742cda7c9824270501b"></a><!-- doxytag: member="usb&#45;mouse.c::mouUSBOn" ref="a919a8e16f26a0742cda7c9824270501b" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">int mouUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-mouse_8c_source.html#l00079">mouUSBInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ae823cb66bf7678148ffadf3202034921"></a><!-- doxytag: member="usb&#45;mouse.c::mouUSBRead" ref="ae823cb66bf7678148ffadf3202034921" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read the USB device using <a class="el" href="usb-common_8c.html#a21">usbRead</a>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Read the USB device using <a class="el" href="usb-common_8h.html#aea8c9cef438c8851ef7f47d7167152cb">usbRead</a>. </p>
+
+<p>References <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html
deleted file mode 100644
index 12fbbcd52..000000000
--- a/xorg-server/hw/dmx/doc/html/usb-mouse_8h-source.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-mouse.h</h1><a href="usb-mouse_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _USB_MOU_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _USB_MOU_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#a12">mouUSBRead</a>(DevicePtr pDev,
-00041                           dmxMotionProcPtr motion,
-00042                           dmxEnqueueProcPtr enqueue,
-00043                           dmxCheckSpecialProcPtr checkspecial,
-00044                           DMXBlockType block);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#a13">mouUSBInit</a>(DevicePtr pDev);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#a16">mouUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00047 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-mouse_8c.html#a14">mouUSBOn</a>(DevicePtr pDev);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    mouUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00049 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html
index ac03fe55b..293076b1f 100644
--- a/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html
+++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8h.html
@@ -6,120 +6,186 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>usb-mouse.h File Reference</h1>
-<p>
-<a href="usb-mouse_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8h.html#a1">mouUSBInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8h.html#a2">mouUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-mouse_8h.html#a3">mouUSBOn</a> (DevicePtr pDev)</td></tr>
-
+<p><a href="usb-mouse_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8h.html#afb9d774d978b63fed427dc72d94f632d">mouUSBRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8h.html#a6c0a19ce4ec02df96f781152a8cc5d36">mouUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8h.html#a422205f883732c44c29093a832254579">mouUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8h.html#a919a8e16f26a0742cda7c9824270501b">mouUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-mouse_8h.html#a62cd25ae1a19bea910edcbf10c2d8686">mouUSBCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to USB mouse driver. <dl compact><dt><b>See also:</b></dt><dd>usb-mouse.c <p>
-usb-common.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="usb-mouse.h::mouUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to USB mouse driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="usb-mouse_8c.html">usb-mouse.c</a> </dd>
+<dd>
+<a class="el" href="usb-common_8c.html">usb-common.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a62cd25ae1a19bea910edcbf10c2d8686"></a><!-- doxytag: member="usb&#45;mouse.h::mouUSBCtrl" ref="a62cd25ae1a19bea910edcbf10c2d8686" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void mouUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void mouUSBCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="usb-mouse.h::mouUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a422205f883732c44c29093a832254579"></a><!-- doxytag: member="usb&#45;mouse.h::mouUSBGetInfo" ref="a422205f883732c44c29093a832254579" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void mouUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00095">_DMXLocalInitInfo::buttonClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00097">_DMXLocalInitInfo::map</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="usb-mouse_8c_source.html#l00093">mouUSBGetMap()</a>, <a class="el" href="dmxinputinit_8h_source.html#l00096">_DMXLocalInitInfo::numButtons</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00115">_DMXLocalInitInfo::ptrFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a6c0a19ce4ec02df96f781152a8cc5d36"></a><!-- doxytag: member="usb&#45;mouse.h::mouUSBInit" ref="a6c0a19ce4ec02df96f781152a8cc5d36" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
 
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="usb-mouse.h::mouUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00041">usbMouse</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-mouse_8c_source.html#l00085">mouUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a919a8e16f26a0742cda7c9824270501b"></a><!-- doxytag: member="usb&#45;mouse.h::mouUSBOn" ref="a919a8e16f26a0742cda7c9824270501b" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int mouUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int mouUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-mouse_8c_source.html#l00079">mouUSBInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="afb9d774d978b63fed427dc72d94f632d"></a><!-- doxytag: member="usb&#45;mouse.h::mouUSBRead" ref="afb9d774d978b63fed427dc72d94f632d" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mouUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html
new file mode 100644
index 000000000..69d966cde
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/usb-mouse_8h_source.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>usb-mouse.h</h1><a href="usb-mouse_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _USB_MOU_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _USB_MOU_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#ae823cb66bf7678148ffadf3202034921">mouUSBRead</a>(DevicePtr pDev,
+<a name="l00040"></a>00040                           <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00041"></a>00041                           <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00042"></a>00042                           <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00043"></a>00043                           <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#a6c0a19ce4ec02df96f781152a8cc5d36">mouUSBInit</a>(DevicePtr pDev);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8c.html#a422205f883732c44c29093a832254579">mouUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-mouse_8c.html#a919a8e16f26a0742cda7c9824270501b">mouUSBOn</a>(DevicePtr pDev);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-mouse_8h.html#a62cd25ae1a19bea910edcbf10c2d8686">mouUSBCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
+<a name="l00048"></a>00048 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8c.html b/xorg-server/hw/dmx/doc/html/usb-other_8c.html
index 284b4b79b..449fc4d45 100644
--- a/xorg-server/hw/dmx/doc/html/usb-other_8c.html
+++ b/xorg-server/hw/dmx/doc/html/usb-other_8c.html
@@ -6,177 +6,430 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-other.c File Reference</h1><code>#include "<a class="el" href="usb-private_8h-source.html">usb-private.h</a>"</code><br>
-<code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "<a class="el" href="usb-other_8h-source.html">usb-other.h</a>"</code><br>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8c.html#a13">othUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>usb-other.c File Reference</h1><code>#include &quot;<a class="el" href="usb-private_8h_source.html">usb-private.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;<a class="el" href="usb-other_8h_source.html">usb-other.h</a>&quot;</code><br/>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#aacf069d346230dd96812d5395728eef2">GETPRIV</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a837722a322e811d5e42242655f277b87">LOG0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#aab4b3434c36117a2ecdddec40716d97a">LOG1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a16da5d597d9bfb9e569a9bfb6996382c">LOG2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a8247f0bca25789d2ac27674eb26e223f">LOG3</a>(f, a, b, c)&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a6bce6020b913db8afe5d94bc63d1b355">FATAL0</a>(f)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a11bcea7c6bc7dbe400a3855f5b8676ce">FATAL1</a>(f, a)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a7952c9e9fe9c75be4964fc53a4299183">FATAL2</a>(f, a, b)&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a11a17082bee3b1b8217ce8a12adcf814">MOTIONPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a017080ce5e42667a6582cf858e7185cd">ENQUEUEPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#aa35a985e998ad5e2187e13434dca118a">CHECKPROC</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a52220397ecea855b3a99746e451426e1">BLOCK</a>&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a36b621e66020a8ee4641d56c73c4226b">test_bit</a>(bit)&nbsp;&nbsp;&nbsp;(priv-&gt;mask[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td></tr>
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a3c2a6d36c58f4372068d019364831151">othUSBRead</a> (DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#ad1b551c84928693ea1b2edebf6c4fcff">othUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a1f1af19f36fcccfc6b67c814fb360573">othUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8c.html#a35a421bfc49015d8ed37cac84746ba78">othUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>This code implements a low-level device driver for a non-keyboard, non-mouse USB device (e.g., a joystick or gamepad). </p>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a52220397ecea855b3a99746e451426e1"></a><!-- doxytag: member="usb&#45;other.c::BLOCK" ref="a52220397ecea855b3a99746e451426e1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BLOCK&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8c.html#a14">othUSBInit</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="aa35a985e998ad5e2187e13434dca118a"></a><!-- doxytag: member="usb&#45;other.c::CHECKPROC" ref="aa35a985e998ad5e2187e13434dca118a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CHECKPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8c.html#a15">othUSBOn</a> (DevicePtr pDev)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a017080ce5e42667a6582cf858e7185cd"></a><!-- doxytag: member="usb&#45;other.c::ENQUEUEPROC" ref="a017080ce5e42667a6582cf858e7185cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ENQUEUEPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8c.html#a16">othUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+</div>
+</div>
+<a class="anchor" id="a6bce6020b913db8afe5d94bc63d1b355"></a><!-- doxytag: member="usb&#45;other.c::FATAL0" ref="a6bce6020b913db8afe5d94bc63d1b355" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
-</table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-This code implements a low-level device driver for a non-keyboard, non-mouse USB device (e.g., a joystick or gamepad).<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a16" doxytag="usb-other.c::othUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a11bcea7c6bc7dbe400a3855f5b8676ce"></a><!-- doxytag: member="usb&#45;other.c::FATAL1" ref="a11bcea7c6bc7dbe400a3855f5b8676ce" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void othUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">#define FATAL1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a7952c9e9fe9c75be4964fc53a4299183"></a><!-- doxytag: member="usb&#45;other.c::FATAL2" ref="a7952c9e9fe9c75be4964fc53a4299183" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define FATAL2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">a, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxFatal,f,a,b)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="aacf069d346230dd96812d5395728eef2"></a><!-- doxytag: member="usb&#45;other.c::GETPRIV" ref="aacf069d346230dd96812d5395728eef2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define GETPRIV</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a14" doxytag="usb-other.c::othUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+<b>Value:</b><div class="fragment"><pre class="fragment"><a class="code" href="struct__myPrivate.html">myPrivate</a> *priv                            \
+                      = ((<a class="code" href="struct__DMXLocalInputInfo.html">DMXLocalInputInfoPtr</a>)(pDev-&gt;devicePrivate))-&gt;private
+</pre></div>
+</div>
+</div>
+<a class="anchor" id="a837722a322e811d5e42242655f277b87"></a><!-- doxytag: member="usb&#45;other.c::LOG0" ref="a837722a322e811d5e42242655f277b87" args="(f)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void othUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define LOG0</td>
+          <td>(</td>
+          <td class="paramtype">f&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f)</td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="aab4b3434c36117a2ecdddec40716d97a"></a><!-- doxytag: member="usb&#45;other.c::LOG1" ref="aab4b3434c36117a2ecdddec40716d97a" args="(f, a)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG1</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a)</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a15" doxytag="usb-other.c::othUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a16da5d597d9bfb9e569a9bfb6996382c"></a><!-- doxytag: member="usb&#45;other.c::LOG2" ref="a16da5d597d9bfb9e569a9bfb6996382c" args="(f, a, b)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LOG2</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a8247f0bca25789d2ac27674eb26e223f"></a><!-- doxytag: member="usb&#45;other.c::LOG3" ref="a8247f0bca25789d2ac27674eb26e223f" args="(f, a, b, c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int othUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define LOG3</td>
+          <td>(</td>
+          <td class="paramtype">f, </td>
         </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">a, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">b, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">c&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;dmxLog(dmxDebug,f,a,b,c)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a11a17082bee3b1b8217ce8a12adcf814"></a><!-- doxytag: member="usb&#45;other.c::MOTIONPROC" ref="a11a17082bee3b1b8217ce8a12adcf814" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MOTIONPROC&nbsp;&nbsp;&nbsp;<a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
+</div>
+</div>
+<a class="anchor" id="a36b621e66020a8ee4641d56c73c4226b"></a><!-- doxytag: member="usb&#45;other.c::test_bit" ref="a36b621e66020a8ee4641d56c73c4226b" args="(bit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define test_bit</td>
+          <td>(</td>
+          <td class="paramtype">bit&nbsp;</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td>&nbsp;&nbsp;&nbsp;(priv-&gt;mask[(bit)/8] &amp; (1 &lt;&lt; ((bit)%8)))</td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
-<a class="anchor" name="a13" doxytag="usb-other.c::othUSBRead" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a35a421bfc49015d8ed37cac84746ba78"></a><!-- doxytag: member="usb&#45;other.c::othUSBGetInfo" ref="a35a421bfc49015d8ed37cac84746ba78" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void othUSBRead </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void othUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
           <td></td>
-          <td class="md" nowrap>MOTIONPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>motion</em>, </td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
+
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00119">_DMXLocalInitInfo::belFeedbackClass</a>, <a class="el" href="dmxevents_8c_source.html#l00280">DMX_MAX_AXES</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00117">_DMXLocalInitInfo::ledFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00102">_DMXLocalInitInfo::numAbsAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, <a class="el" href="usb-common_8c_source.html#l00162">test_bit</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad1b551c84928693ea1b2edebf6c4fcff"></a><!-- doxytag: member="usb&#45;other.c::othUSBInit" ref="ad1b551c84928693ea1b2edebf6c4fcff" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void othUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
+
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00043">usbOther</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-other_8c_source.html#l00087">othUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1f1af19f36fcccfc6b67c814fb360573"></a><!-- doxytag: member="usb&#45;other.c::othUSBOn" ref="a1f1af19f36fcccfc6b67c814fb360573" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int othUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
           <td></td>
-          <td class="md" nowrap>ENQUEUEPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>enqueue</em>, </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-other_8c_source.html#l00081">othUSBInit()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a3c2a6d36c58f4372068d019364831151"></a><!-- doxytag: member="usb&#45;other.c::othUSBRead" ref="a3c2a6d36c58f4372068d019364831151" args="(DevicePtr pDev, MOTIONPROC motion, ENQUEUEPROC enqueue, CHECKPROC checkspecial, BLOCK block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void othUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">MOTIONPROC&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>CHECKPROC&nbsp;</td>
-          <td class="mdname" nowrap> <em>checkspecial</em>, </td>
+          <td class="paramtype">ENQUEUEPROC&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">CHECKPROC&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td class="md" nowrap>BLOCK&nbsp;</td>
-          <td class="mdname" nowrap> <em>block</em></td>
+          <td class="paramtype">BLOCK&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-Read the USB device using <a class="el" href="usb-common_8c.html#a21">usbRead</a>.     </td>
-  </tr>
-</table>
+</div>
+<div class="memdoc">
+<p>Read the USB device using <a class="el" href="usb-common_8h.html#aea8c9cef438c8851ef7f47d7167152cb">usbRead</a>. </p>
+
+<p>References <a class="el" href="usb-common_8c_source.html#l00087">usbRead()</a>.</p>
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html
deleted file mode 100644
index d5cd221ff..000000000
--- a/xorg-server/hw/dmx/doc/html/usb-other_8h-source.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-other.h</h1><a href="usb-other_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00038 <span class="preprocessor">#ifndef _USB_OTHER_H_</span>
-00039 <span class="preprocessor"></span><span class="preprocessor">#define _USB_OTHER_H_</span>
-00040 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#a13">othUSBRead</a>(DevicePtr pDev,
-00041                           dmxMotionProcPtr motion,
-00042                           dmxEnqueueProcPtr enqueue,
-00043                           dmxCheckSpecialProcPtr checkspecial,
-00044                           DMXBlockType block);
-00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#a14">othUSBInit</a>(DevicePtr pDev);
-00046 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#a16">othUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
-00047 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-other_8c.html#a15">othUSBOn</a>(DevicePtr pDev);
-00048 <span class="keyword">extern</span> <span class="keywordtype">void</span>    othUSBCtrl(DevicePtr pDev, PtrCtrl *ctrl);
-00049 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h.html b/xorg-server/hw/dmx/doc/html/usb-other_8h.html
index d3c80ae02..f720e9de0 100644
--- a/xorg-server/hw/dmx/doc/html/usb-other_8h.html
+++ b/xorg-server/hw/dmx/doc/html/usb-other_8h.html
@@ -6,120 +6,186 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>usb-other.h File Reference</h1>
-<p>
-<a href="usb-other_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8h.html#a1">othUSBInit</a> (DevicePtr pDev)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>void&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8h.html#a2">othUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align=right valign=top>int&nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="usb-other_8h.html#a3">othUSBOn</a> (DevicePtr pDev)</td></tr>
-
+<p><a href="usb-other_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8h.html#a901d4789dd6f963fb642427bc6816033">othUSBRead</a> (DevicePtr pDev, <a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion, <a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue, <a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial, <a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8h.html#ad1b551c84928693ea1b2edebf6c4fcff">othUSBInit</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8h.html#a35a421bfc49015d8ed37cac84746ba78">othUSBGetInfo</a> (DevicePtr pDev, <a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8h.html#a1f1af19f36fcccfc6b67c814fb360573">othUSBOn</a> (DevicePtr pDev)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-other_8h.html#a968e84db8d818b0fdd455cf61a1da058">othUSBCtrl</a> (DevicePtr pDev, PtrCtrl *ctrl)</td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Interface to USB generic driver. <dl compact><dt><b>See also:</b></dt><dd>usb-other.c <p>
-usb-common.c</dd></dl>
-<hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2" doxytag="usb-other.h::othUSBGetInfo" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Interface to USB generic driver. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="usb-other_8c.html">usb-other.c</a> </dd>
+<dd>
+<a class="el" href="usb-common_8c.html">usb-common.c</a> </dd></dl>
+<hr/><h2>Function Documentation</h2>
+<a class="anchor" id="a968e84db8d818b0fdd455cf61a1da058"></a><!-- doxytag: member="usb&#45;other.h::othUSBCtrl" ref="a968e84db8d818b0fdd455cf61a1da058" args="(DevicePtr pDev, PtrCtrl *ctrl)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> void othUSBGetInfo </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname" nowrap> <em>pDev</em>, </td>
+          <td class="memname">void othUSBCtrl </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td></td>
-          <td class="md" nowrap><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>info</em></td>
+          <td class="paramtype">PtrCtrl *&nbsp;</td>
+          <td class="paramname"> <em>ctrl</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
-
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a1" doxytag="usb-other.h::othUSBInit" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+</div>
+</div>
+<a class="anchor" id="a35a421bfc49015d8ed37cac84746ba78"></a><!-- doxytag: member="usb&#45;other.h::othUSBGetInfo" ref="a35a421bfc49015d8ed37cac84746ba78" args="(DevicePtr pDev, DMXLocalInitInfoPtr info)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void othUSBGetInfo </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>info</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"> void othUSBInit </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Fill the <em>info</em> structure with information needed to initialize <em>pDev</em>. </p>
 
+<p>References <a class="el" href="dmxinputinit_8h_source.html#l00119">_DMXLocalInitInfo::belFeedbackClass</a>, <a class="el" href="dmxevents_8c_source.html#l00280">DMX_MAX_AXES</a>, <a class="el" href="dmxlog_8c_source.html#l00159">dmxLog()</a>, <a class="el" href="dmxlog_8h_source.html#l00045">dmxWarning</a>, <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, <a class="el" href="dmxinputinit_8h_source.html#l00086">_DMXLocalInitInfo::keyClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00087">_DMXLocalInitInfo::keySyms</a>, <a class="el" href="dmxinputinit_8h_source.html#l00117">_DMXLocalInitInfo::ledFeedbackClass</a>, <a class="el" href="dmxinputinit_8h_source.html#l00107">_DMXLocalInitInfo::maxres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00104">_DMXLocalInitInfo::maxval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00106">_DMXLocalInitInfo::minres</a>, <a class="el" href="dmxinputinit_8h_source.html#l00103">_DMXLocalInitInfo::minval</a>, <a class="el" href="dmxinputinit_8h_source.html#l00102">_DMXLocalInitInfo::numAbsAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00101">_DMXLocalInitInfo::numRelAxes</a>, <a class="el" href="dmxinputinit_8h_source.html#l00105">_DMXLocalInitInfo::res</a>, <a class="el" href="usb-common_8c_source.html#l00162">test_bit</a>, and <a class="el" href="dmxinputinit_8h_source.html#l00099">_DMXLocalInitInfo::valuatorClass</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad1b551c84928693ea1b2edebf6c4fcff"></a><!-- doxytag: member="usb&#45;other.h::othUSBInit" ref="ad1b551c84928693ea1b2edebf6c4fcff" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void othUSBInit </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+<p>Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a7f9b3a6d320a9ddbed689f4e12acb443">usbInit</a>. </p>
 
-<p>
-Initialize <em>pDev</em> using <a class="el" href="usb-common_8h.html#a6">usbInit</a>.     </td>
-  </tr>
-</table>
-<a class="anchor" name="a3" doxytag="usb-other.h::othUSBOn" ></a><p>
-<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<p>References <a class="el" href="usb-common_8c_source.html#l00272">usbInit()</a>, and <a class="el" href="usb-common_8h_source.html#l00043">usbOther</a>.</p>
+
+<p>Referenced by <a class="el" href="usb-other_8c_source.html#l00087">othUSBOn()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a1f1af19f36fcccfc6b67c814fb360573"></a><!-- doxytag: member="usb&#45;other.h::othUSBOn" ref="a1f1af19f36fcccfc6b67c814fb360573" args="(DevicePtr pDev)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"> int othUSBOn </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">DevicePtr&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>pDev</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int othUSBOn </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+<p>Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>). </p>
+
+<p>References <a class="el" href="lnx-keyboard_8c_source.html#l00136">GETPRIV</a>, and <a class="el" href="usb-other_8c_source.html#l00081">othUSBInit()</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a901d4789dd6f963fb642427bc6816033"></a><!-- doxytag: member="usb&#45;other.h::othUSBRead" ref="a901d4789dd6f963fb642427bc6816033" args="(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, dmxCheckSpecialProcPtr checkspecial, DMXBlockType block)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void othUSBRead </td>
+          <td>(</td>
+          <td class="paramtype">DevicePtr&nbsp;</td>
+          <td class="paramname"> <em>pDev</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>motion</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>enqueue</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a>&nbsp;</td>
+          <td class="paramname"> <em>checkspecial</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a>&nbsp;</td>
+          <td class="paramname"> <em>block</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing=5 cellpadding=0 border=0>
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
-<p>
-Turn <em>pDev</em> on (i.e., take input from <em>pDev</em>).     </td>
-  </tr>
-</table>
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html
new file mode 100644
index 000000000..2243b43d0
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/usb-other_8h_source.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>usb-other.h</h1><a href="usb-other_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00037"></a>00037 <span class="preprocessor">#ifndef _USB_OTHER_H_</span>
+<a name="l00038"></a>00038 <span class="preprocessor"></span><span class="preprocessor">#define _USB_OTHER_H_</span>
+<a name="l00039"></a>00039 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#a3c2a6d36c58f4372068d019364831151">othUSBRead</a>(DevicePtr pDev,
+<a name="l00040"></a>00040                           <a class="code" href="dmxinputinit_8h.html#a1279820425966adabf5c77357e4a289c">dmxMotionProcPtr</a> motion,
+<a name="l00041"></a>00041                           <a class="code" href="dmxinputinit_8h.html#adbd955b9ddbc5ffe38ff65e3f068f205">dmxEnqueueProcPtr</a> enqueue,
+<a name="l00042"></a>00042                           <a class="code" href="dmxinputinit_8h.html#a838cb45fd92d5cf506e4179b601f7dbc">dmxCheckSpecialProcPtr</a> checkspecial,
+<a name="l00043"></a>00043                           <a class="code" href="dmxinput_8h.html#a3a7195ab3516c5354bac4ca80b2eedb7">DMXBlockType</a> block);
+<a name="l00044"></a>00044 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#ad1b551c84928693ea1b2edebf6c4fcff">othUSBInit</a>(DevicePtr pDev);
+<a name="l00045"></a>00045 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8c.html#a35a421bfc49015d8ed37cac84746ba78">othUSBGetInfo</a>(DevicePtr pDev, <a class="code" href="struct__DMXLocalInitInfo.html">DMXLocalInitInfoPtr</a> info);
+<a name="l00046"></a>00046 <span class="keyword">extern</span> <span class="keywordtype">int</span>     <a class="code" href="usb-other_8c.html#a1f1af19f36fcccfc6b67c814fb360573">othUSBOn</a>(DevicePtr pDev);
+<a name="l00047"></a>00047 <span class="keyword">extern</span> <span class="keywordtype">void</span>    <a class="code" href="usb-other_8h.html#a968e84db8d818b0fdd455cf61a1da058">othUSBCtrl</a>(DevicePtr pDev, PtrCtrl *ctrl);
+<a name="l00048"></a>00048 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html b/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html
deleted file mode 100644
index 3baac9582..000000000
--- a/xorg-server/hw/dmx/doc/html/usb-private_8h-source.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-    <title>File Index</title>
-    <link href="doxygen.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-private.h</h1><a href="usb-private_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <span class="comment">/* $XFree86$ */</span>
-00002 <span class="comment">/*</span>
-00003 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
-00004 <span class="comment"> *</span>
-00005 <span class="comment"> * All Rights Reserved.</span>
-00006 <span class="comment"> *</span>
-00007 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
-00008 <span class="comment"> * a copy of this software and associated documentation files (the</span>
-00009 <span class="comment"> * "Software"), to deal in the Software without restriction, including</span>
-00010 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
-00011 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
-00012 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
-00013 <span class="comment"> * subject to the following conditions:</span>
-00014 <span class="comment"> *</span>
-00015 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
-00016 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
-00017 <span class="comment"> * portions of the Software.</span>
-00018 <span class="comment"> *</span>
-00019 <span class="comment"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</span>
-00020 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
-00021 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
-00022 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
-00023 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
-00024 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
-00025 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
-00026 <span class="comment"> * SOFTWARE.</span>
-00027 <span class="comment"> */</span>
-00028 
-00029 <span class="comment">/*</span>
-00030 <span class="comment"> * Authors:</span>
-00031 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
-00032 <span class="comment"> *</span>
-00033 <span class="comment"> */</span>
-00034 
-00041 <span class="preprocessor">#ifndef _USB_PRIVATE_H_</span>
-00042 <span class="preprocessor"></span><span class="preprocessor">#define _USB_PRIVATE_H_</span>
-00043 <span class="preprocessor"></span>
-00044 <span class="preprocessor">#include "<a class="code" href="dmxinputinit_8h.html">dmxinputinit.h</a>"</span>
-00045 <span class="preprocessor">#include "inputstr.h"</span>
-00046 <span class="preprocessor">#include "Xos.h"</span>
-00047 <span class="preprocessor">#include &lt;errno.h&gt;</span>
-00048 <span class="preprocessor">#include &lt;linux/input.h&gt;</span>
-00049 <span class="preprocessor">#include "<a class="code" href="usb-common_8h.html">usb-common.h</a>"</span>
-00050 
-00051                                 <span class="comment">/*  Support for force feedback was</span>
-00052 <span class="comment">                                 *  introduced in Linxu 2.4.10 */</span>
-00053 <span class="preprocessor">#ifndef EV_MSC</span>
-00054 <span class="preprocessor"></span><span class="preprocessor">#define EV_MSC      0x04</span>
-00055 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00056 <span class="preprocessor"></span><span class="preprocessor">#ifndef EV_FF</span>
-00057 <span class="preprocessor"></span><span class="preprocessor">#define EV_FF       0x15</span>
-00058 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00059 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_SLEEP</span>
-00060 <span class="preprocessor"></span><span class="preprocessor">#define LED_SLEEP   0x05</span>
-00061 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00062 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_SUSPEND</span>
-00063 <span class="preprocessor"></span><span class="preprocessor">#define LED_SUSPEND 0x06</span>
-00064 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00065 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_MUTE</span>
-00066 <span class="preprocessor"></span><span class="preprocessor">#define LED_MUTE    0x07</span>
-00067 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00068 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_MISC</span>
-00069 <span class="preprocessor"></span><span class="preprocessor">#define LED_MISC    0x08</span>
-00070 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00071 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_DEAD</span>
-00072 <span class="preprocessor"></span><span class="preprocessor">#define BTN_DEAD    0x12f</span>
-00073 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00074 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_THUMBL</span>
-00075 <span class="preprocessor"></span><span class="preprocessor">#define BTN_THUMBL  0x13d</span>
-00076 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00077 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_THUMBR</span>
-00078 <span class="preprocessor"></span><span class="preprocessor">#define BTN_THUMBR  0x13e</span>
-00079 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00080 <span class="preprocessor"></span><span class="preprocessor">#ifndef MSC_SERIAL</span>
-00081 <span class="preprocessor"></span><span class="preprocessor">#define MSC_SERIAL  0x00</span>
-00082 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00083 <span class="preprocessor"></span><span class="preprocessor">#ifndef MSC_MAX</span>
-00084 <span class="preprocessor"></span><span class="preprocessor">#define MSC_MAX     0x07</span>
-00085 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00086 <span class="preprocessor"></span>
-00087                                 <span class="comment">/* Support for older kernels. */</span>
-00088 <span class="preprocessor">#ifndef ABS_WHEEL</span>
-00089 <span class="preprocessor"></span><span class="preprocessor">#define ABS_WHEEL   0x08</span>
-00090 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00091 <span class="preprocessor"></span><span class="preprocessor">#ifndef ABS_GAS</span>
-00092 <span class="preprocessor"></span><span class="preprocessor">#define ABS_GAS     0x09</span>
-00093 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00094 <span class="preprocessor"></span><span class="preprocessor">#ifndef ABS_BRAKE</span>
-00095 <span class="preprocessor"></span><span class="preprocessor">#define ABS_BRAKE   0x0a</span>
-00096 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-00097 <span class="preprocessor"></span>
-00098 <span class="preprocessor">#define NUM_STATE_ENTRIES (256/32)</span>
-00099 <span class="preprocessor"></span>
-00100 <span class="comment">/* Private area for USB devices. */</span>
-00101 <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__myPrivate.html">_myPrivate</a> {
-<a name="l00102"></a><a class="code" href="struct__myPrivate.html#o55">00102</a>     DeviceIntPtr   <a class="code" href="struct__myPrivate.html#o55">pDevice</a>;                 
-<a name="l00103"></a><a class="code" href="struct__myPrivate.html#o37">00103</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#o37">fd</a>;                      
-<a name="l00104"></a><a class="code" href="struct__myPrivate.html#o56">00104</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>  <a class="code" href="struct__myPrivate.html#o56">mask</a>[EV_MAX/8 + 1];      
-<a name="l00105"></a><a class="code" href="struct__myPrivate.html#o59">00105</a>     <span class="keywordtype">int</span>            numRel, numAbs, <a class="code" href="struct__myPrivate.html#o59">numLeds</a>; 
-<a name="l00106"></a><a class="code" href="struct__myPrivate.html#o60">00106</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#o60">relmap</a>[DMX_MAX_AXES];    
-<a name="l00107"></a><a class="code" href="struct__myPrivate.html#o61">00107</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#o61">absmap</a>[DMX_MAX_AXES];    
-<a name="l00109"></a><a class="code" href="struct__myPrivate.html#o43">00109</a>     CARD32         <a class="code" href="struct__myPrivate.html#o43">kbdState</a>[NUM_STATE_ENTRIES]; 
-00110     DeviceIntPtr   pKeyboard;                   
-<a name="l00112"></a><a class="code" href="struct__myPrivate.html#o49">00112</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#o49">pitch</a>;       
-<a name="l00113"></a><a class="code" href="struct__myPrivate.html#o50">00113</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>  <a class="code" href="struct__myPrivate.html#o50">duration</a>;    
-00115     <span class="comment">/* FIXME: dmxInput is never initialized */</span>
-<a name="l00116"></a><a class="code" href="struct__myPrivate.html#o62">00116</a>     <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>   *<a class="code" href="struct__myPrivate.html#o62">dmxInput</a>;   
-00117 } <a class="code" href="struct__myPrivate.html">myPrivate</a>;
-00118 <span class="preprocessor">#endif</span>
-</pre></div>    <hr>
-    <address>
-      <small>
-        Generated June 29, 2004 for <a
-        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
-        <a href="http://www.doxygen.org/index.html">doxygen</a>
-        1.3.4.
-      </small>
-    </addres>
-    </hr>
-  </body>
-</html>
diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h.html b/xorg-server/hw/dmx/doc/html/usb-private_8h.html
index 360d88290..5720c3310 100644
--- a/xorg-server/hw/dmx/doc/html/usb-private_8h.html
+++ b/xorg-server/hw/dmx/doc/html/usb-private_8h.html
@@ -6,27 +6,291 @@
     <link href="doxygen.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-<!-- Generated by Doxygen 1.3.4 -->
-<div class="qindex"><a class="qindex" href="main.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>usb-private.h File Reference</h1><code>#include "<a class="el" href="dmxinputinit_8h-source.html">dmxinputinit.h</a>"</code><br>
-<code>#include "inputstr.h"</code><br>
-<code>#include "Xos.h"</code><br>
-<code>#include &lt;errno.h&gt;</code><br>
-<code>#include &lt;linux/input.h&gt;</code><br>
-<code>#include "<a class="el" href="usb-common_8h-source.html">usb-common.h</a>"</code><br>
-
-<p>
-<a href="usb-private_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
-<tr><td></td></tr>
-<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct &nbsp;</td><td class="memItemRight" valign=bottom><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>usb-private.h File Reference</h1><code>#include &quot;<a class="el" href="dmxinputinit_8h_source.html">dmxinputinit.h</a>&quot;</code><br/>
+<code>#include &quot;inputstr.h&quot;</code><br/>
+<code>#include &lt;X11/Xos.h&gt;</code><br/>
+<code>#include &lt;errno.h&gt;</code><br/>
+<code>#include &lt;linux/input.h&gt;</code><br/>
+<code>#include &quot;<a class="el" href="usb-common_8h_source.html">usb-common.h</a>&quot;</code><br/>
 
+<p><a href="usb-private_8h_source.html">Go to the source code of this file.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__myPrivate.html">_myPrivate</a></td></tr>
+<tr><td colspan="2"><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#af2e56f461a160409ab75afaa916beebf">EV_MSC</a>&nbsp;&nbsp;&nbsp;0x04</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a97886fd107ad9e34bf130fe2e8a5799a">EV_FF</a>&nbsp;&nbsp;&nbsp;0x15</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#ad578ee0c4ea73206378c55bba1135e84">LED_SLEEP</a>&nbsp;&nbsp;&nbsp;0x05</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a59fd9fe6c0cd23e8154bc7578d3676a5">LED_SUSPEND</a>&nbsp;&nbsp;&nbsp;0x06</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a06e2b597089e33458df03d81fa441995">LED_MUTE</a>&nbsp;&nbsp;&nbsp;0x07</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#acc1dccaea09503c64e9dfb635e19b29a">LED_MISC</a>&nbsp;&nbsp;&nbsp;0x08</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a0774f9bbd6ba5b888d42a088b906deaf">BTN_DEAD</a>&nbsp;&nbsp;&nbsp;0x12f</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#ad7efb66d8b7e7e5ef815d869534a769e">BTN_THUMBL</a>&nbsp;&nbsp;&nbsp;0x13d</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#ab637d656fd23697017c9b50be714119d">BTN_THUMBR</a>&nbsp;&nbsp;&nbsp;0x13e</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#af0896a7858b26c8c2eb9d8406f2aa32c">MSC_SERIAL</a>&nbsp;&nbsp;&nbsp;0x00</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#abe411125a4bc2a57b8656a3d44acfc0d">MSC_MAX</a>&nbsp;&nbsp;&nbsp;0x07</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#abc57d88f908f35bd3c82ba7dff0d97e7">ABS_WHEEL</a>&nbsp;&nbsp;&nbsp;0x08</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#acf2960996b3a73cfa447e18a655690c5">ABS_GAS</a>&nbsp;&nbsp;&nbsp;0x09</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a28f782ce9e5d1e3cff987901a7bf6823">ABS_BRAKE</a>&nbsp;&nbsp;&nbsp;0x0a</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a4551482d17e969e4de70a669be3afc74">NUM_STATE_ENTRIES</a>&nbsp;&nbsp;&nbsp;(256/32)</td></tr>
+<tr><td colspan="2"><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="usb-private_8h.html#a25692217bddf2b6c089525b325afccf1">myPrivate</a></td></tr>
 </table>
-<hr><a name="_details"></a><h2>Detailed Description</h2>
-Private header file for USB support. This file provides Linux-specific include files and the definition of the private structure. <dl compact><dt><b>See also:</b></dt><dd>usb-common.c <p>
-usb-keyboard.c <p>
-usb-mouse.c <p>
-usb-other.c</dd></dl>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>Private header file for USB support. This file provides Linux-specific include files and the definition of the private structure. </p>
+<dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="usb-common_8c.html">usb-common.c</a> </dd>
+<dd>
+<a class="el" href="usb-keyboard_8c.html">usb-keyboard.c</a> </dd>
+<dd>
+<a class="el" href="usb-mouse_8c.html">usb-mouse.c</a> </dd>
+<dd>
+<a class="el" href="usb-other_8c.html">usb-other.c</a> </dd></dl>
+<hr/><h2>Define Documentation</h2>
+<a class="anchor" id="a28f782ce9e5d1e3cff987901a7bf6823"></a><!-- doxytag: member="usb&#45;private.h::ABS_BRAKE" ref="a28f782ce9e5d1e3cff987901a7bf6823" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ABS_BRAKE&nbsp;&nbsp;&nbsp;0x0a</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acf2960996b3a73cfa447e18a655690c5"></a><!-- doxytag: member="usb&#45;private.h::ABS_GAS" ref="acf2960996b3a73cfa447e18a655690c5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ABS_GAS&nbsp;&nbsp;&nbsp;0x09</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abc57d88f908f35bd3c82ba7dff0d97e7"></a><!-- doxytag: member="usb&#45;private.h::ABS_WHEEL" ref="abc57d88f908f35bd3c82ba7dff0d97e7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define ABS_WHEEL&nbsp;&nbsp;&nbsp;0x08</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0774f9bbd6ba5b888d42a088b906deaf"></a><!-- doxytag: member="usb&#45;private.h::BTN_DEAD" ref="a0774f9bbd6ba5b888d42a088b906deaf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BTN_DEAD&nbsp;&nbsp;&nbsp;0x12f</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ad7efb66d8b7e7e5ef815d869534a769e"></a><!-- doxytag: member="usb&#45;private.h::BTN_THUMBL" ref="ad7efb66d8b7e7e5ef815d869534a769e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BTN_THUMBL&nbsp;&nbsp;&nbsp;0x13d</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ab637d656fd23697017c9b50be714119d"></a><!-- doxytag: member="usb&#45;private.h::BTN_THUMBR" ref="ab637d656fd23697017c9b50be714119d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define BTN_THUMBR&nbsp;&nbsp;&nbsp;0x13e</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a97886fd107ad9e34bf130fe2e8a5799a"></a><!-- doxytag: member="usb&#45;private.h::EV_FF" ref="a97886fd107ad9e34bf130fe2e8a5799a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define EV_FF&nbsp;&nbsp;&nbsp;0x15</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="af2e56f461a160409ab75afaa916beebf"></a><!-- doxytag: member="usb&#45;private.h::EV_MSC" ref="af2e56f461a160409ab75afaa916beebf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define EV_MSC&nbsp;&nbsp;&nbsp;0x04</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="acc1dccaea09503c64e9dfb635e19b29a"></a><!-- doxytag: member="usb&#45;private.h::LED_MISC" ref="acc1dccaea09503c64e9dfb635e19b29a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LED_MISC&nbsp;&nbsp;&nbsp;0x08</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a06e2b597089e33458df03d81fa441995"></a><!-- doxytag: member="usb&#45;private.h::LED_MUTE" ref="a06e2b597089e33458df03d81fa441995" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LED_MUTE&nbsp;&nbsp;&nbsp;0x07</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad578ee0c4ea73206378c55bba1135e84"></a><!-- doxytag: member="usb&#45;private.h::LED_SLEEP" ref="ad578ee0c4ea73206378c55bba1135e84" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LED_SLEEP&nbsp;&nbsp;&nbsp;0x05</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a59fd9fe6c0cd23e8154bc7578d3676a5"></a><!-- doxytag: member="usb&#45;private.h::LED_SUSPEND" ref="a59fd9fe6c0cd23e8154bc7578d3676a5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define LED_SUSPEND&nbsp;&nbsp;&nbsp;0x06</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Referenced by <a class="el" href="usb-common_8c_source.html#l00165">usbPrint()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="abe411125a4bc2a57b8656a3d44acfc0d"></a><!-- doxytag: member="usb&#45;private.h::MSC_MAX" ref="abe411125a4bc2a57b8656a3d44acfc0d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MSC_MAX&nbsp;&nbsp;&nbsp;0x07</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="af0896a7858b26c8c2eb9d8406f2aa32c"></a><!-- doxytag: member="usb&#45;private.h::MSC_SERIAL" ref="af0896a7858b26c8c2eb9d8406f2aa32c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define MSC_SERIAL&nbsp;&nbsp;&nbsp;0x00</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a4551482d17e969e4de70a669be3afc74"></a><!-- doxytag: member="usb&#45;private.h::NUM_STATE_ENTRIES" ref="a4551482d17e969e4de70a669be3afc74" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define NUM_STATE_ENTRIES&nbsp;&nbsp;&nbsp;(256/32)</td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+<hr/><h2>Typedef Documentation</h2>
+<a class="anchor" id="a25692217bddf2b6c089525b325afccf1"></a><!-- doxytag: member="usb&#45;private.h::myPrivate" ref="a25692217bddf2b6c089525b325afccf1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="struct__myPrivate.html">_myPrivate</a>  <a class="el" href="struct__myPrivate.html">myPrivate</a></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+</div>
+</div>
+</div>
     <hr>
     <address>
       <small>
diff --git a/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html b/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html
new file mode 100644
index 000000000..728767cbc
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/html/usb-private_8h_source.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+    <title>File Index</title>
+    <link href="doxygen.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+<!-- Generated by Doxygen 1.6.1 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+<h1>usb-private.h</h1><a href="usb-private_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
+<a name="l00002"></a>00002 <span class="comment"> * Copyright 2002 Red Hat Inc., Durham, North Carolina.</span>
+<a name="l00003"></a>00003 <span class="comment"> *</span>
+<a name="l00004"></a>00004 <span class="comment"> * All Rights Reserved.</span>
+<a name="l00005"></a>00005 <span class="comment"> *</span>
+<a name="l00006"></a>00006 <span class="comment"> * Permission is hereby granted, free of charge, to any person obtaining</span>
+<a name="l00007"></a>00007 <span class="comment"> * a copy of this software and associated documentation files (the</span>
+<a name="l00008"></a>00008 <span class="comment"> * &quot;Software&quot;), to deal in the Software without restriction, including</span>
+<a name="l00009"></a>00009 <span class="comment"> * without limitation on the rights to use, copy, modify, merge,</span>
+<a name="l00010"></a>00010 <span class="comment"> * publish, distribute, sublicense, and/or sell copies of the Software,</span>
+<a name="l00011"></a>00011 <span class="comment"> * and to permit persons to whom the Software is furnished to do so,</span>
+<a name="l00012"></a>00012 <span class="comment"> * subject to the following conditions:</span>
+<a name="l00013"></a>00013 <span class="comment"> *</span>
+<a name="l00014"></a>00014 <span class="comment"> * The above copyright notice and this permission notice (including the</span>
+<a name="l00015"></a>00015 <span class="comment"> * next paragraph) shall be included in all copies or substantial</span>
+<a name="l00016"></a>00016 <span class="comment"> * portions of the Software.</span>
+<a name="l00017"></a>00017 <span class="comment"> *</span>
+<a name="l00018"></a>00018 <span class="comment"> * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,</span>
+<a name="l00019"></a>00019 <span class="comment"> * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</span>
+<a name="l00020"></a>00020 <span class="comment"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</span>
+<a name="l00021"></a>00021 <span class="comment"> * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS</span>
+<a name="l00022"></a>00022 <span class="comment"> * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</span>
+<a name="l00023"></a>00023 <span class="comment"> * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</span>
+<a name="l00024"></a>00024 <span class="comment"> * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span>
+<a name="l00025"></a>00025 <span class="comment"> * SOFTWARE.</span>
+<a name="l00026"></a>00026 <span class="comment"> */</span>
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="comment">/*</span>
+<a name="l00029"></a>00029 <span class="comment"> * Authors:</span>
+<a name="l00030"></a>00030 <span class="comment"> *   Rickard E. (Rik) Faith &lt;faith@redhat.com&gt;</span>
+<a name="l00031"></a>00031 <span class="comment"> *</span>
+<a name="l00032"></a>00032 <span class="comment"> */</span>
+<a name="l00033"></a>00033 
+<a name="l00040"></a>00040 <span class="preprocessor">#ifndef _USB_PRIVATE_H_</span>
+<a name="l00041"></a>00041 <span class="preprocessor"></span><span class="preprocessor">#define _USB_PRIVATE_H_</span>
+<a name="l00042"></a>00042 <span class="preprocessor"></span>
+<a name="l00043"></a>00043 <span class="preprocessor">#include &quot;<a class="code" href="dmxinputinit_8h.html">dmxinputinit.h</a>&quot;</span>
+<a name="l00044"></a>00044 <span class="preprocessor">#include &quot;inputstr.h&quot;</span>
+<a name="l00045"></a>00045 <span class="preprocessor">#include &lt;X11/Xos.h&gt;</span>
+<a name="l00046"></a>00046 <span class="preprocessor">#include &lt;errno.h&gt;</span>
+<a name="l00047"></a>00047 <span class="preprocessor">#include &lt;linux/input.h&gt;</span>
+<a name="l00048"></a>00048 <span class="preprocessor">#include &quot;<a class="code" href="usb-common_8h.html">usb-common.h</a>&quot;</span>
+<a name="l00049"></a>00049 
+<a name="l00050"></a>00050                                 <span class="comment">/*  Support for force feedback was</span>
+<a name="l00051"></a>00051 <span class="comment">                                 *  introduced in Linxu 2.4.10 */</span>
+<a name="l00052"></a>00052 <span class="preprocessor">#ifndef EV_MSC</span>
+<a name="l00053"></a><a class="code" href="usb-private_8h.html#af2e56f461a160409ab75afaa916beebf">00053</a> <span class="preprocessor"></span><span class="preprocessor">#define EV_MSC      0x04</span>
+<a name="l00054"></a>00054 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00055"></a>00055 <span class="preprocessor"></span><span class="preprocessor">#ifndef EV_FF</span>
+<a name="l00056"></a><a class="code" href="usb-private_8h.html#a97886fd107ad9e34bf130fe2e8a5799a">00056</a> <span class="preprocessor"></span><span class="preprocessor">#define EV_FF       0x15</span>
+<a name="l00057"></a>00057 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00058"></a>00058 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_SLEEP</span>
+<a name="l00059"></a><a class="code" href="usb-private_8h.html#ad578ee0c4ea73206378c55bba1135e84">00059</a> <span class="preprocessor"></span><span class="preprocessor">#define LED_SLEEP   0x05</span>
+<a name="l00060"></a>00060 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00061"></a>00061 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_SUSPEND</span>
+<a name="l00062"></a><a class="code" href="usb-private_8h.html#a59fd9fe6c0cd23e8154bc7578d3676a5">00062</a> <span class="preprocessor"></span><span class="preprocessor">#define LED_SUSPEND 0x06</span>
+<a name="l00063"></a>00063 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00064"></a>00064 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_MUTE</span>
+<a name="l00065"></a><a class="code" href="usb-private_8h.html#a06e2b597089e33458df03d81fa441995">00065</a> <span class="preprocessor"></span><span class="preprocessor">#define LED_MUTE    0x07</span>
+<a name="l00066"></a>00066 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00067"></a>00067 <span class="preprocessor"></span><span class="preprocessor">#ifndef LED_MISC</span>
+<a name="l00068"></a><a class="code" href="usb-private_8h.html#acc1dccaea09503c64e9dfb635e19b29a">00068</a> <span class="preprocessor"></span><span class="preprocessor">#define LED_MISC    0x08</span>
+<a name="l00069"></a>00069 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00070"></a>00070 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_DEAD</span>
+<a name="l00071"></a><a class="code" href="usb-private_8h.html#a0774f9bbd6ba5b888d42a088b906deaf">00071</a> <span class="preprocessor"></span><span class="preprocessor">#define BTN_DEAD    0x12f</span>
+<a name="l00072"></a>00072 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00073"></a>00073 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_THUMBL</span>
+<a name="l00074"></a><a class="code" href="usb-private_8h.html#ad7efb66d8b7e7e5ef815d869534a769e">00074</a> <span class="preprocessor"></span><span class="preprocessor">#define BTN_THUMBL  0x13d</span>
+<a name="l00075"></a>00075 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00076"></a>00076 <span class="preprocessor"></span><span class="preprocessor">#ifndef BTN_THUMBR</span>
+<a name="l00077"></a><a class="code" href="usb-private_8h.html#ab637d656fd23697017c9b50be714119d">00077</a> <span class="preprocessor"></span><span class="preprocessor">#define BTN_THUMBR  0x13e</span>
+<a name="l00078"></a>00078 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00079"></a>00079 <span class="preprocessor"></span><span class="preprocessor">#ifndef MSC_SERIAL</span>
+<a name="l00080"></a><a class="code" href="usb-private_8h.html#af0896a7858b26c8c2eb9d8406f2aa32c">00080</a> <span class="preprocessor"></span><span class="preprocessor">#define MSC_SERIAL  0x00</span>
+<a name="l00081"></a>00081 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00082"></a>00082 <span class="preprocessor"></span><span class="preprocessor">#ifndef MSC_MAX</span>
+<a name="l00083"></a><a class="code" href="usb-private_8h.html#abe411125a4bc2a57b8656a3d44acfc0d">00083</a> <span class="preprocessor"></span><span class="preprocessor">#define MSC_MAX     0x07</span>
+<a name="l00084"></a>00084 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00085"></a>00085 <span class="preprocessor"></span>
+<a name="l00086"></a>00086                                 <span class="comment">/* Support for older kernels. */</span>
+<a name="l00087"></a>00087 <span class="preprocessor">#ifndef ABS_WHEEL</span>
+<a name="l00088"></a><a class="code" href="usb-private_8h.html#abc57d88f908f35bd3c82ba7dff0d97e7">00088</a> <span class="preprocessor"></span><span class="preprocessor">#define ABS_WHEEL   0x08</span>
+<a name="l00089"></a>00089 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00090"></a>00090 <span class="preprocessor"></span><span class="preprocessor">#ifndef ABS_GAS</span>
+<a name="l00091"></a><a class="code" href="usb-private_8h.html#acf2960996b3a73cfa447e18a655690c5">00091</a> <span class="preprocessor"></span><span class="preprocessor">#define ABS_GAS     0x09</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00093"></a>00093 <span class="preprocessor"></span><span class="preprocessor">#ifndef ABS_BRAKE</span>
+<a name="l00094"></a><a class="code" href="usb-private_8h.html#a28f782ce9e5d1e3cff987901a7bf6823">00094</a> <span class="preprocessor"></span><span class="preprocessor">#define ABS_BRAKE   0x0a</span>
+<a name="l00095"></a>00095 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>
+<a name="l00097"></a><a class="code" href="usb-private_8h.html#a4551482d17e969e4de70a669be3afc74">00097</a> <span class="preprocessor">#define NUM_STATE_ENTRIES (256/32)</span>
+<a name="l00098"></a>00098 <span class="preprocessor"></span>
+<a name="l00099"></a>00099 <span class="comment">/* Private area for USB devices. */</span>
+<a name="l00100"></a>00100 <span class="keyword">typedef</span> <span class="keyword">struct </span><a class="code" href="struct__myPrivate.html">_myPrivate</a> {
+<a name="l00101"></a><a class="code" href="struct__myPrivate.html#ae08ddb2f15fe104faf25f51f05c26033">00101</a>     DeviceIntPtr   <a class="code" href="struct__myPrivate.html#ae08ddb2f15fe104faf25f51f05c26033">pDevice</a>;                 
+<a name="l00102"></a>00102     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#a6b26eb0acc0b932c8dee8277501e6273">fd</a>;                      
+<a name="l00103"></a><a class="code" href="struct__myPrivate.html#a5e71754533023837d932a24bd25ff602">00103</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>  <a class="code" href="struct__myPrivate.html#a5e71754533023837d932a24bd25ff602">mask</a>[EV_MAX/8 + 1];      
+<a name="l00104"></a><a class="code" href="struct__myPrivate.html#af4532a0338cfa7325e8e3b2e3deb770f">00104</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#af4532a0338cfa7325e8e3b2e3deb770f">numRel</a>, <a class="code" href="struct__myPrivate.html#a2ef864f533851d1c4a2a9f6c44400692">numAbs</a>, <a class="code" href="struct__myPrivate.html#a06ca4d02bb8f2a1795251f496ffd3cb2">numLeds</a>; 
+<a name="l00105"></a><a class="code" href="struct__myPrivate.html#ad2d732244cdd84a0cc50bec620d50846">00105</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#ad2d732244cdd84a0cc50bec620d50846">relmap</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>];    
+<a name="l00106"></a><a class="code" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">00106</a>     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#afc48f38bcefc200e681475c06fdacad6">absmap</a>[<a class="code" href="dmxevents_8c.html#a144e2f1a618a0d14e2c9ce4fda50104a">DMX_MAX_AXES</a>];    
+<a name="l00108"></a>00108     CARD32         <a class="code" href="struct__myPrivate.html#a35c7b19223e75cef1eebc0467fb2514d">kbdState</a>[<a class="code" href="lnx-keyboard_8c.html#a4551482d17e969e4de70a669be3afc74">NUM_STATE_ENTRIES</a>]; 
+<a name="l00109"></a>00109     DeviceIntPtr   <a class="code" href="struct__myPrivate.html#a1f72c73bb97bf77b8f5359eabf81fb79">pKeyboard</a>;                   
+<a name="l00111"></a>00111     <span class="keywordtype">int</span>            <a class="code" href="struct__myPrivate.html#ac184b2b8c6283dc678512c5f5990c0f2">pitch</a>;       
+<a name="l00112"></a>00112     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>  <a class="code" href="struct__myPrivate.html#a6a27aa80849de66952d95ab65914d6da">duration</a>;    
+<a name="l00114"></a>00114     <span class="comment">/* FIXME: dmxInput is never initialized */</span>
+<a name="l00115"></a><a class="code" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">00115</a>     <a class="code" href="struct__DMXInputInfo.html">DMXInputInfo</a>   *<a class="code" href="struct__myPrivate.html#a0d76644b5072fa20b8470cc0f7bb8958">dmxInput</a>;   
+<a name="l00116"></a>00116 } <a class="code" href="struct__myPrivate.html">myPrivate</a>;
+<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
+</pre></div></div>
+    <hr>
+    <address>
+      <small>
+        Generated June 29, 2004 for <a
+        href="http://dmx.sourceforge.net">Distributed Multihead X</a> by
+        <a href="http://www.doxygen.org/index.html">doxygen</a>
+        1.3.4.
+      </small>
+    </addres>
+    </hr>
+  </body>
+</html>
diff --git a/xorg-server/hw/dmx/examples/Makefile.in b/xorg-server/hw/dmx/examples/Makefile.in
index db656c682..2c5b19db3 100644
--- a/xorg-server/hw/dmx/examples/Makefile.in
+++ b/xorg-server/hw/dmx/examples/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -199,7 +199,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -224,7 +223,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -248,6 +246,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -265,8 +264,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -312,7 +309,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -338,6 +334,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -347,7 +344,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -361,7 +357,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -403,8 +398,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -447,6 +440,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -478,7 +472,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.in b/xorg-server/hw/dmx/glxProxy/Makefile.in
index 29894ccf2..0f3ec55f1 100644
--- a/xorg-server/hw/dmx/glxProxy/Makefile.in
+++ b/xorg-server/hw/dmx/glxProxy/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -254,7 +251,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -268,7 +264,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -354,6 +347,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -385,7 +379,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/input/Makefile.in b/xorg-server/hw/dmx/input/Makefile.in
index db8d24382..c25f1c9a2 100644
--- a/xorg-server/hw/dmx/input/Makefile.in
+++ b/xorg-server/hw/dmx/input/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -120,7 +120,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -145,7 +144,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -169,6 +167,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -186,8 +185,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -233,7 +230,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -259,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -268,7 +265,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -282,7 +278,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -324,8 +319,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -368,6 +361,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -399,7 +393,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/dmx/input/dmxbackend.c b/xorg-server/hw/dmx/input/dmxbackend.c
index b94c6d468..55615cf39 100644
--- a/xorg-server/hw/dmx/input/dmxbackend.c
+++ b/xorg-server/hw/dmx/input/dmxbackend.c
@@ -236,7 +236,7 @@ static int dmxBackendOffscreen(int screen, int x, int y)
 }
 
 /** This routine is called from #dmxCoreMotion for each motion
- * event. #x and #y are global coordinants. */
+ * event. \a x and \a y are global coordinants. */
 void dmxBackendUpdatePosition(pointer private, int x, int y)
 {
     GETPRIVFROMPRIVATE;
diff --git a/xorg-server/hw/dmx/input/dmxcommon.c b/xorg-server/hw/dmx/input/dmxcommon.c
index 8c8cefa53..da5b77893 100644
--- a/xorg-server/hw/dmx/input/dmxcommon.c
+++ b/xorg-server/hw/dmx/input/dmxcommon.c
@@ -519,7 +519,7 @@ void dmxCommonMouOff(DevicePtr pDev)
 /** Given the global coordinates \a x and \a y, determine the screen
  * with the lowest number on which those coordinates lie.  If they are
  * not on any screen, return -1.  The number returned is an index into
- * #dmxScreenInfo and is between -1 and #dmxNumScreens - 1,
+ * \a dmxScreenInfo and is between -1 and \a dmxNumScreens - 1,
  * inclusive. */
 int dmxFindPointerScreen(int x, int y)
 {
diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c
index 70737b4c4..dfa6bdad5 100644
--- a/xorg-server/hw/dmx/input/dmxevents.c
+++ b/xorg-server/hw/dmx/input/dmxevents.c
@@ -552,7 +552,7 @@ void dmxInvalidateGlobalPosition(void)
  * allowed to move outside the global boundaires).
  *
  * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be
- * blocked around calls to #dmxeqEnqueue(). */
+ * blocked around calls to \a enqueueMotion(). */
 void dmxMotion(DevicePtr pDev, int *v, int firstAxes, int axesCount,
                DMXMotionType type, DMXBlockType block)
 {
@@ -652,8 +652,9 @@ static int dmxFixup(DevicePtr pDev, int detail, KeySym keySym)
  * specified \a type and \a detail.  If the event is a KeyPress or
  * KeyRelease event, then the \a keySym is also specified.
  *
+ * FIXME: make the code do what the comment says, or remove this comment.
  * If \a block is set to \a DMX_BLOCK, then the SIGIO handler will be
- * blocked around calls to #dmxeqEnqueue(). */
+ * blocked around calls to dmxeqEnqueue(). */
     
 void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
                 XEvent *e, DMXBlockType block)
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index d8402e87f..5a486a464 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -474,9 +474,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
                                               Relative);
                 for (i = 0; i < info.numRelAxes; i++)
                     InitValuatorAxisStruct(pDevice, i, axis_labels[i],
-                                           info.minval[0], info.maxval[0],
-                                           info.res[0],
-                                           info.minres[0], info.maxres[0]);
+                                           info.minval[i], info.maxval[i],
+                                           info.res[i],
+                                           info.minres[i], info.maxres[i]);
             } else if (info.numRelAxes) {
                 InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
                                               axis_labels,
@@ -484,20 +484,20 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
                                               Relative);
                 for (i = 0; i < info.numRelAxes; i++)
                     InitValuatorAxisStruct(pDevice, i, axis_labels[i],
-                                           info.minval[0],
-                                           info.maxval[0], info.res[0],
-                                           info.minres[0], info.maxres[0]);
+                                           info.minval[i],
+                                           info.maxval[i], info.res[i],
+                                           info.minres[i], info.maxres[i]);
             } else if (info.numAbsAxes) {
                 InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
                                               axis_labels,
                                               dmxPointerGetMotionBufferSize(),
                                               Absolute);
                 for (i = 0; i < info.numAbsAxes; i++)
-                    InitValuatorAxisStruct(pDevice, i+info.numRelAxes,
-                                           axis_labels[i + info.numRelAxes],
-                                           info.minval[i+1], info.maxval[i+1],
-                                           info.res[i+1], info.minres[i+1],
-                                           info.maxres[i+1]);
+                    InitValuatorAxisStruct(pDevice, i,
+                                           axis_labels[i],
+                                           info.minval[i], info.maxval[i],
+                                           info.res[i], info.minres[i],
+                                           info.maxres[i]);
             }
         }
         if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);
@@ -933,7 +933,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
 }
 
 /** Re-initialize all the devices described in \a dmxInput.  Called from
-    #dmxReconfig before the cursor is redisplayed. */ 
+    #dmxAdjustCursorBoundaries before the cursor is redisplayed. */
 void dmxInputReInit(DMXInputInfo *dmxInput)
 {
     int i;
@@ -946,7 +946,7 @@ void dmxInputReInit(DMXInputInfo *dmxInput)
 }
 
 /** Re-initialize all the devices described in \a dmxInput.  Called from
-    #dmxReconfig after the cursor is redisplayed. */ 
+    #dmxAdjustCursorBoundaries after the cursor is redisplayed. */
 void dmxInputLateReInit(DMXInputInfo *dmxInput)
 {
     int i;
diff --git a/xorg-server/hw/dmx/input/usb-common.c b/xorg-server/hw/dmx/input/usb-common.c
index 2d3f4dd5f..95c00b839 100644
--- a/xorg-server/hw/dmx/input/usb-common.c
+++ b/xorg-server/hw/dmx/input/usb-common.c
@@ -33,8 +33,8 @@
 
 /** \file
  *
- * Routines that are common between #usb-keyboard.c, #usb-mouse.c, and
- * #usb-other.c */
+ * Routines that are common between \a usb-keyboard.c, \a usb-mouse.c, and
+ * \a usb-other.c */
 
 #ifdef HAVE_DMX_CONFIG_H
 #include <dmx-config.h>
diff --git a/xorg-server/hw/kdrive/Makefile.am b/xorg-server/hw/kdrive/Makefile.am
index e20d4d6d2..906a14c60 100644
--- a/xorg-server/hw/kdrive/Makefile.am
+++ b/xorg-server/hw/kdrive/Makefile.am
@@ -6,10 +6,6 @@ if XFAKESERVER
 XFAKE_SUBDIRS = fake
 endif
 
-if XSDLSERVER
-XSDL_SUBDIRS = sdl
-endif
-
 if XEPHYR
 XEPHYR_SUBDIRS = ephyr
 endif
@@ -19,7 +15,6 @@ LINUX_SUBDIRS = linux
 endif
 
 SERVER_SUBDIRS = 		\
-	$(XSDL_SUBDIRS)		\
 	$(FBDEV_SUBDIRS)	\
 	$(XEPHYR_SUBDIRS)       \
 	$(XFAKE_SUBDIRS)
@@ -29,7 +24,7 @@ SUBDIRS =			\
 	$(LINUX_SUBDIRS)	\
 	$(SERVER_SUBDIRS)
 
-DIST_SUBDIRS = fbdev sdl ephyr src linux fake
+DIST_SUBDIRS = fbdev ephyr src linux fake
 
 relink:
 	@for i in $(SERVER_SUBDIRS) ; do make -C $$i relink ; done
diff --git a/xorg-server/hw/kdrive/Makefile.in b/xorg-server/hw/kdrive/Makefile.in
index a3a242f89..81c69a524 100644
--- a/xorg-server/hw/kdrive/Makefile.in
+++ b/xorg-server/hw/kdrive/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -108,7 +108,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -133,7 +132,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -157,6 +155,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -174,8 +173,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -221,7 +218,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -247,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -256,7 +253,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -270,7 +266,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -312,8 +307,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -356,6 +349,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -387,7 +381,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -397,11 +390,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_KDRIVEFBDEVLIB_TRUE@FBDEV_SUBDIRS = fbdev
 @XFAKESERVER_TRUE@XFAKE_SUBDIRS = fake
-@XSDLSERVER_TRUE@XSDL_SUBDIRS = sdl
 @XEPHYR_TRUE@XEPHYR_SUBDIRS = ephyr
 @KDRIVELINUX_TRUE@LINUX_SUBDIRS = linux
 SERVER_SUBDIRS = \
-	$(XSDL_SUBDIRS)		\
 	$(FBDEV_SUBDIRS)	\
 	$(XEPHYR_SUBDIRS)       \
 	$(XFAKE_SUBDIRS)
@@ -411,7 +402,7 @@ SUBDIRS = \
 	$(LINUX_SUBDIRS)	\
 	$(SERVER_SUBDIRS)
 
-DIST_SUBDIRS = fbdev sdl ephyr src linux fake
+DIST_SUBDIRS = fbdev ephyr src linux fake
 all: all-recursive
 
 .SUFFIXES:
diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.in b/xorg-server/hw/kdrive/ephyr/Makefile.in
index 9540106e6..0531c7026 100644
--- a/xorg-server/hw/kdrive/ephyr/Makefile.in
+++ b/xorg-server/hw/kdrive/ephyr/Makefile.in
@@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -158,7 +158,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -183,7 +182,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -207,6 +205,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -224,8 +223,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -271,7 +268,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -297,6 +293,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -306,7 +303,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -320,7 +316,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -362,8 +357,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -406,6 +399,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -437,7 +431,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -933,10 +926,10 @@ Xephyr.$(APP_MAN_SUFFIX): Xephyr.man
 	$(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX)
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index eecad7e42..2b72b4e0a 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -93,6 +93,13 @@ InitInput (int argc, char **argv)
   KdInitInput();
 }
 
+#ifdef DDXBEFORERESET
+void
+ddxBeforeReset (void)
+{
+}
+#endif
+
 void
 ddxUseMsg (void)
 {
diff --git a/xorg-server/hw/kdrive/fake/Makefile.in b/xorg-server/hw/kdrive/fake/Makefile.in
index f879f6159..4231f2f54 100644
--- a/xorg-server/hw/kdrive/fake/Makefile.in
+++ b/xorg-server/hw/kdrive/fake/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -104,7 +104,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -129,7 +128,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -153,6 +151,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -170,8 +169,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -217,7 +214,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -243,6 +239,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -252,7 +249,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -266,7 +262,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -308,8 +303,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -352,6 +345,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -383,7 +377,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/kdrive/fake/fakeinit.c b/xorg-server/hw/kdrive/fake/fakeinit.c
index 2cfcbedd5..0472a7183 100644
--- a/xorg-server/hw/kdrive/fake/fakeinit.c
+++ b/xorg-server/hw/kdrive/fake/fakeinit.c
@@ -60,6 +60,13 @@ InitInput (int argc, char **argv)
     KdInitInput ();
 }
 
+#ifdef DDXBEFORERESET
+void
+ddxBeforeReset (void)
+{
+}
+#endif
+
 void
 ddxUseMsg (void)
 {
diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.in b/xorg-server/hw/kdrive/fbdev/Makefile.in
index 19ecaf165..20b40496e 100644
--- a/xorg-server/hw/kdrive/fbdev/Makefile.in
+++ b/xorg-server/hw/kdrive/fbdev/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -105,7 +105,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -130,7 +129,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -154,6 +152,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -171,8 +170,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -218,7 +215,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -244,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -253,7 +250,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -267,7 +263,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -309,8 +304,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -353,6 +346,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -384,7 +378,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/kdrive/linux/Makefile.am b/xorg-server/hw/kdrive/linux/Makefile.am
index be07561ef..13df142f7 100644
--- a/xorg-server/hw/kdrive/linux/Makefile.am
+++ b/xorg-server/hw/kdrive/linux/Makefile.am
@@ -17,7 +17,6 @@ KDRIVE_HW_SOURCES =	\
 
 liblinux_la_SOURCES = 	\
 	bus.c		\
-	klinux.h	\
 	mouse.c		\
 	ms.c		\
 	ps2.c		\
diff --git a/xorg-server/hw/kdrive/linux/Makefile.in b/xorg-server/hw/kdrive/linux/Makefile.in
index 87e6503c5..a5b0791d7 100644
--- a/xorg-server/hw/kdrive/linux/Makefile.in
+++ b/xorg-server/hw/kdrive/linux/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -57,8 +57,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 liblinux_la_LIBADD =
-am__liblinux_la_SOURCES_DIST = bus.c klinux.h mouse.c ms.c ps2.c \
-	evdev.c keyboard.c linux.c tslib.c
+am__liblinux_la_SOURCES_DIST = bus.c mouse.c ms.c ps2.c evdev.c \
+	keyboard.c linux.c tslib.c
 am__objects_1 = evdev.lo keyboard.lo linux.lo
 @TSLIB_TRUE@am__objects_2 = tslib.lo
 am_liblinux_la_OBJECTS = bus.lo mouse.lo ms.lo ps2.lo $(am__objects_1) \
@@ -100,7 +100,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -125,7 +124,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -149,6 +147,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -166,8 +165,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -213,7 +210,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -239,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -248,7 +245,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -262,7 +258,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -304,8 +299,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -348,6 +341,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -379,7 +373,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -401,7 +394,6 @@ KDRIVE_HW_SOURCES = \
 
 liblinux_la_SOURCES = \
 	bus.c		\
-	klinux.h	\
 	mouse.c		\
 	ms.c		\
 	ps2.c		\
diff --git a/xorg-server/hw/kdrive/linux/bus.c b/xorg-server/hw/kdrive/linux/bus.c
index ba8a6cd43..93c3ea5f3 100644
--- a/xorg-server/hw/kdrive/linux/bus.c
+++ b/xorg-server/hw/kdrive/linux/bus.c
@@ -72,7 +72,7 @@ BusInit (KdPointerInfo *pi)
     {
         for (i = 0; i < NUM_BUS_NAMES; i++)
         {
-            if ((fd = open (BusNames[i], 0)) > 0)
+            if ((fd = open (BusNames[i], 0)) >= 0)
             {
                 close(fd);
                 if (pi->path)
@@ -84,7 +84,7 @@ BusInit (KdPointerInfo *pi)
     }
     else
     {
-        if ((fd = open(pi->path, 0)) > 0)
+        if ((fd = open(pi->path, 0)) >= 0)
         {
             close(fd);
             return Success;
@@ -99,7 +99,7 @@ BusEnable (KdPointerInfo *pi)
 {
     int fd = open(pi->path, 0);
 
-    if (fd > 0)
+    if (fd >= 0)
     {
         KdRegisterFd(fd, BusRead, pi);
         pi->driverPrivate = (void *)fd;
diff --git a/xorg-server/hw/kdrive/linux/klinux.h b/xorg-server/hw/kdrive/linux/klinux.h
deleted file mode 100644
index 349685241..000000000
--- a/xorg-server/hw/kdrive/linux/klinux.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright © 2003 Keith Packard
- *
- * 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, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _KLINUX_H_
-#define _KLINUX_H_
- 
-Bool
-LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr);
-
-unsigned char *
-LinuxGetPciCfg(KdCardAttr *attr);
-    
-#endif /* _KLINUX_H_ */
diff --git a/xorg-server/hw/kdrive/linux/linux.c b/xorg-server/hw/kdrive/linux/linux.c
index 3fba056df..f76c2cbd9 100644
--- a/xorg-server/hw/kdrive/linux/linux.c
+++ b/xorg-server/hw/kdrive/linux/linux.c
@@ -24,7 +24,6 @@
 #include <kdrive-config.h>
 #endif
 #include "kdrive.h"
-#include "klinux.h"
 #include <errno.h>
 #include <signal.h>
 #include <linux/vt.h>
@@ -125,110 +124,6 @@ LinuxInit (void)
     return 1;
 }
 
-Bool
-LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr)
-{
-    FILE    *f;
-    char    line[2048], *l, *end;
-    CARD32  bus, id, addr;
-    int	    n;
-    CARD32  ven_dev;
-    Bool    ret = FALSE;
-    int	    i;
-
-    attr->vendorID = vendor;
-    attr->deviceID = device;
-    ven_dev = (((CARD32) vendor) << 16) | ((CARD32) device);
-    f = fopen ("/proc/bus/pci/devices", "r");
-    if (!f)
-	return FALSE;
-    attr->io = 0;
-    while (fgets (line, sizeof (line)-1, f))
-    {
-	line[sizeof(line)-1] = '\0';
-	l = line;
-	bus = strtoul (l, &end, 16);
-	if (end == l)
-	    continue;
-	l = end;
-	id = strtoul (l, &end, 16);
-	if (end == l)
-	    continue;
-	l = end;
-	if (id != ven_dev)
-	    continue;
-	if (count--)
-	    continue;
-	(void) strtoul (l, &end, 16);	/* IRQ */
-	if (end == l)
-	    continue;
-	l = end;
-	n = 0;
-	for (i = 0; i < 6; i++)
-	{
-	    addr = strtoul (l, &end, 16);
-	    if (end == l)
-		break;
-	    if (addr & 1)
-		attr->io = addr & ~0xf;
-	    else
-	    {
-		if (n == KD_MAX_CARD_ADDRESS)
-		    break;
-		attr->address[n++] = addr & ~0xf;
-	    }
-	    l = end;
-	}
-	while (n > 0)
-	{
-	    if (attr->address[n-1] != 0)
-		break;
-	    n--;
-	}
-	attr->naddr = n;
-	attr->domain = 0; /* XXX */
-	attr->bus = (bus >> 8) & 0xff;
-	attr->slot = (bus >> 3) & 0x1f;
-	attr->func = bus & 0x07;
-	ret = TRUE;
-	break;
-    }
-    fclose (f);
-    return ret;
-}
-
-unsigned char *
-LinuxGetPciCfg(KdCardAttr *attr) 
-{
-    char filename[256];
-    FILE *f;
-    unsigned char *cfg;
-    int r;
-
-    snprintf(filename, 255, "/proc/bus/pci/%02x/%02x.%x",
-             attr->bus >> 8, (attr->bus & 0xff) >> 3, attr->bus & 7);
-/*     fprintf(stderr,"Find card on path %s\n",filename); */
-
-    if (!(f=fopen(filename,"r"))) 
-        return NULL;
-
-    if (!(cfg=xalloc(256))) 
-    {
-        fclose(f);
-        return NULL;
-    }
-
-    if (256 != (r=fread(cfg, 1, 256, f)))
-    {
-        fprintf(stderr,"LinuxGetPciCfg: read %d, expected 256\n",r);
-        free(cfg);
-        cfg=NULL;
-    }
-    fclose(f);
-/*     fprintf(stderr,"LinuxGetPciCfg: success, returning %p\n",cfg); */
-    return cfg;
-}
-
 static void
 LinuxSetSwitchMode (int mode)
 {
diff --git a/xorg-server/hw/kdrive/linux/tslib.c b/xorg-server/hw/kdrive/linux/tslib.c
index 59011b0e3..7cc23e637 100644
--- a/xorg-server/hw/kdrive/linux/tslib.c
+++ b/xorg-server/hw/kdrive/linux/tslib.c
@@ -151,10 +151,6 @@ TslibDisable (KdPointerInfo *pi)
 static Status
 TslibInit (KdPointerInfo *pi)
 {
-    int		        fd = 0, i = 0;
-    DIR                 *inputdir = NULL;
-    struct dirent       *inputent = NULL;
-    struct tsdev        *tsDev = NULL;
     struct TslibPrivate *private = NULL;
 
     if (!pi || !pi->dixdev)
diff --git a/xorg-server/hw/kdrive/sdl/Makefile.am b/xorg-server/hw/kdrive/sdl/Makefile.am
deleted file mode 100644
index 0973cb4ea..000000000
--- a/xorg-server/hw/kdrive/sdl/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES = 					\
-	@KDRIVE_PURE_INCS@				\
-	@KDRIVE_CFLAGS@	\
-	@XSDL_INCS@
-
-bin_PROGRAMS = Xsdl
-
-Xsdl_SOURCES = sdl.c
-
-Xsdl_LDADD = \
-	@KDRIVE_LIBS@                                  \
-	@XSDL_LIBS@
-
-Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
-
-Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-
-relink:
-	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/xorg-server/hw/kdrive/sdl/Makefile.in b/xorg-server/hw/kdrive/sdl/Makefile.in
deleted file mode 100644
index 80df51441..000000000
--- a/xorg-server/hw/kdrive/sdl/Makefile.in
+++ /dev/null
@@ -1,726 +0,0 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = Xsdl$(EXEEXT)
-subdir = hw/kdrive/sdl
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
-	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
-	$(top_builddir)/include/xorg-server.h \
-	$(top_builddir)/include/dix-config.h \
-	$(top_builddir)/include/xorg-config.h \
-	$(top_builddir)/include/xkb-config.h \
-	$(top_builddir)/include/xwin-config.h \
-	$(top_builddir)/include/kdrive-config.h \
-	$(top_builddir)/include/version-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_Xsdl_OBJECTS = sdl.$(OBJEXT)
-Xsdl_OBJECTS = $(am_Xsdl_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-Xsdl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(Xsdl_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(Xsdl_SOURCES)
-DIST_SOURCES = $(Xsdl_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
-ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
-APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
-APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
-APP_MAN_DIR = @APP_MAN_DIR@
-APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASE_FONT_PATH = @BASE_FONT_PATH@
-BUILD_DATE = @BUILD_DATE@
-BUILD_TIME = @BUILD_TIME@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHANGELOG_CMD = @CHANGELOG_CMD@
-COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
-CYGPATH_W = @CYGPATH_W@
-DARWIN_LIBS = @DARWIN_LIBS@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
-DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
-DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DGA_CFLAGS = @DGA_CFLAGS@
-DGA_LIBS = @DGA_LIBS@
-DIX_CFLAGS = @DIX_CFLAGS@
-DIX_LIB = @DIX_LIB@
-DLLTOOL = @DLLTOOL@
-DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
-DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
-DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
-DMXMODULES_LIBS = @DMXMODULES_LIBS@
-DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
-DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
-DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
-DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
-DOLT_BASH = @DOLT_BASH@
-DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
-DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
-DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
-DRIPROTO_LIBS = @DRIPROTO_LIBS@
-DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
-DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-DRI_CFLAGS = @DRI_CFLAGS@
-DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
-DRI_LIBS = @DRI_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DTRACE = @DTRACE@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
-FGREP = @FGREP@
-FILE_MAN_DIR = @FILE_MAN_DIR@
-FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
-GLX_DEFINES = @GLX_DEFINES@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-GREP = @GREP@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
-KDRIVE_INCS = @KDRIVE_INCS@
-KDRIVE_LIBS = @KDRIVE_LIBS@
-KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
-KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
-KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
-LAUNCHD_ID_PREFIX = @LAUNCHD_ID_PREFIX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
-LIBDRM_LIBS = @LIBDRM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_MAN_DIR = @LIB_MAN_DIR@
-LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LINUXDOC = @LINUXDOC@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
-MAKEINFO = @MAKEINFO@
-MAKE_HTML = @MAKE_HTML@
-MAKE_PDF = @MAKE_PDF@
-MAKE_PS = @MAKE_PS@
-MAKE_TEXT = @MAKE_TEXT@
-MISC_MAN_DIR = @MISC_MAN_DIR@
-MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCCLD = @OBJCCLD@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJCLINK = @OBJCLINK@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OS_LIB = @OS_LIB@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PROJECTROOT = @PROJECTROOT@
-PS2PDF = @PS2PDF@
-Q = @Q@
-RANLIB = @RANLIB@
-RAWCPP = @RAWCPP@
-RAWCPPFLAGS = @RAWCPPFLAGS@
-SED = @SED@
-SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
-SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
-STRIP = @STRIP@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
-UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
-VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
-X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
-XDMCP_CFLAGS = @XDMCP_CFLAGS@
-XDMCP_LIBS = @XDMCP_LIBS@
-XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
-XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
-XDMX_CFLAGS = @XDMX_CFLAGS@
-XDMX_LIBS = @XDMX_LIBS@
-XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
-XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
-XEPHYR_INCS = @XEPHYR_INCS@
-XEPHYR_LIBS = @XEPHYR_LIBS@
-XF86CONFIGFILE = @XF86CONFIGFILE@
-XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
-XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
-XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
-XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
-XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
-XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
-XLIB_CFLAGS = @XLIB_CFLAGS@
-XLIB_LIBS = @XLIB_LIBS@
-XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
-XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
-XNEST_LIBS = @XNEST_LIBS@
-XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
-XORG_CFLAGS = @XORG_CFLAGS@
-XORG_INCS = @XORG_INCS@
-XORG_LIBS = @XORG_LIBS@
-XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
-XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
-XORG_OS = @XORG_OS@
-XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
-XORG_SYS_LIBS = @XORG_SYS_LIBS@
-XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
-XPBPROXY_LIBS = @XPBPROXY_LIBS@
-XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
-XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
-XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
-XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
-XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
-XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
-XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
-XSERVER_LIBS = @XSERVER_LIBS@
-XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
-XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
-XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
-XVFB_LIBS = @XVFB_LIBS@
-XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
-XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
-XWINMODULES_LIBS = @XWINMODULES_LIBS@
-XWIN_LIBS = @XWIN_LIBS@
-XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
-XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
-abi_ansic = @abi_ansic@
-abi_extension = @abi_extension@
-abi_videodrv = @abi_videodrv@
-abi_xinput = @abi_xinput@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-driverdir = @driverdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-extdir = @extdir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-logdir = @logdir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-moduledir = @moduledir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sdkdir = @sdkdir@
-sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
-srcdir = @srcdir@
-symbol_visibility = @symbol_visibility@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = \
-	@KDRIVE_PURE_INCS@				\
-	@KDRIVE_CFLAGS@	\
-	@XSDL_INCS@
-
-Xsdl_SOURCES = sdl.c
-Xsdl_LDADD = \
-	@KDRIVE_LIBS@                                  \
-	@XSDL_LIBS@
-
-Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
-Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hw/kdrive/sdl/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hw/kdrive/sdl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-Xsdl$(EXEEXT): $(Xsdl_OBJECTS) $(Xsdl_DEPENDENCIES) 
-	@rm -f Xsdl$(EXEEXT)
-	$(AM_V_CCLD)$(Xsdl_LINK) $(Xsdl_OBJECTS) $(Xsdl_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdl.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-
-relink:
-	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xorg-server/hw/kdrive/sdl/sdl.c b/xorg-server/hw/kdrive/sdl/sdl.c
deleted file mode 100644
index a83c84a5d..000000000
--- a/xorg-server/hw/kdrive/sdl/sdl.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright © 2004 PillowElephantBadgerBankPond 
- 
- * 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, and that the name of PillowElephantBadgerBankPond not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  PillowElephantBadgerBankPond makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PillowElephantBadgerBankPond BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * It's really not my fault - see it was the elephants!!
- * 	- jaymz
- *
- */
-#ifdef HAVE_CONFIG_H
-#include "kdrive-config.h"
-#endif
-#include "kdrive.h"
-#include <SDL/SDL.h>
-#include <X11/keysym.h>
-
-static void xsdlFini(void);
-static Bool sdlScreenInit(KdScreenInfo *screen);
-static Bool sdlFinishInitScreen(ScreenPtr pScreen);
-static Bool sdlCreateRes(ScreenPtr pScreen);
-
-static void sdlKeyboardFini(KdKeyboardInfo *ki);
-static Bool sdlKeyboardInit(KdKeyboardInfo *ki);
-
-static Bool sdlMouseInit(KdPointerInfo *pi);
-static void sdlMouseFini(KdPointerInfo *pi);
-
-void *sdlShadowWindow (ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure);
-void sdlShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf);
-
-void sdlTimer(void);
-
-KdKeyboardInfo *sdlKeyboard = NULL;
-KdPointerInfo *sdlPointer = NULL;
-
-KdKeyboardDriver sdlKeyboardDriver = {
-    .name = "keyboard",
-    .Init = sdlKeyboardInit,
-    .Fini = sdlKeyboardFini,
-};
-
-KdPointerDriver sdlMouseDriver = {
-    .name = "mouse",
-    .Init = sdlMouseInit,
-    .Fini = sdlMouseFini,
-};
-
-
-KdCardFuncs sdlFuncs = {
-    .scrinit = sdlScreenInit,	/* scrinit */
-    .finishInitScreen = sdlFinishInitScreen, /* finishInitScreen */
-    .createRes = sdlCreateRes,	/* createRes */
-};
-
-int mouseState=0;
-
-struct SdlDriver
-{
-	SDL_Surface *screen;
-};
-
-
-
-static Bool sdlScreenInit(KdScreenInfo *screen)
-{
-	struct SdlDriver *sdlDriver=calloc(1, sizeof(struct SdlDriver));
-#ifdef DEBUG
-	printf("sdlScreenInit()\n");
-#endif
-	if (!screen->width || !screen->height)
-	{
-		screen->width = 640;
-		screen->height = 480;
-	}
-	if (!screen->fb[0].depth)
-		screen->fb[0].depth = 4;
-#ifdef DEBUG
-	printf("Attempting for %dx%d/%dbpp mode\n", screen->width, screen->height, screen->fb[0].depth);
-#endif
-	sdlDriver->screen=SDL_SetVideoMode(screen->width, screen->height, screen->fb[0].depth, 0);
-	if(sdlDriver->screen==NULL)
-		return FALSE;
-#ifdef DEBUG
-	printf("Set %dx%d/%dbpp mode\n", sdlDriver->screen->w, sdlDriver->screen->h, sdlDriver->screen->format->BitsPerPixel);
-#endif
-	screen->width=sdlDriver->screen->w;
-	screen->height=sdlDriver->screen->h;
-	screen->fb[0].depth=sdlDriver->screen->format->BitsPerPixel;
-	screen->fb[0].visuals=(1<<TrueColor);
-	screen->fb[0].redMask=sdlDriver->screen->format->Rmask;
-	screen->fb[0].greenMask=sdlDriver->screen->format->Gmask;
-	screen->fb[0].blueMask=sdlDriver->screen->format->Bmask;
-	screen->fb[0].bitsPerPixel=sdlDriver->screen->format->BitsPerPixel;
-	screen->rate=60;
-	screen->memory_base=(CARD8 *)sdlDriver->screen->pixels;
-	screen->memory_size=0;
-	screen->off_screen_base=0;
-	screen->driver=sdlDriver;
-	screen->fb[0].byteStride=(sdlDriver->screen->w*sdlDriver->screen->format->BitsPerPixel)/8;
-	screen->fb[0].pixelStride=sdlDriver->screen->w;
-	screen->fb[0].frameBuffer=(CARD8 *)sdlDriver->screen->pixels;
-	SDL_WM_SetCaption("Freedesktop.org X server (SDL)", NULL);
-	return TRUE;
-}
-
-void sdlShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)
-{
-	KdScreenPriv(pScreen);
-	KdScreenInfo *screen = pScreenPriv->screen;
-	struct SdlDriver *sdlDriver=screen->driver;
-#ifdef DEBUG
-	printf("Shadow update()\n");
-#endif
-	if(SDL_MUSTLOCK(sdlDriver->screen))
-	{
-		if(SDL_LockSurface(sdlDriver->screen)<0)
-		{
-#ifdef DEBUG
-			printf("Couldn't lock SDL surface - d'oh!\n");
-#endif
-			return;
-		}
-	}
-	
-	if(SDL_MUSTLOCK(sdlDriver->screen))
-		SDL_UnlockSurface(sdlDriver->screen);
-	SDL_UpdateRect(sdlDriver->screen, 0, 0, sdlDriver->screen->w, sdlDriver->screen->h);
-}
-
-
-void *sdlShadowWindow (ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure)
-{
-	KdScreenPriv(pScreen);
-	KdScreenInfo *screen = pScreenPriv->screen;
-	struct SdlDriver *sdlDriver=screen->driver;
-	*size=(sdlDriver->screen->w*sdlDriver->screen->format->BitsPerPixel)/8;
-#ifdef DEBUG
-	printf("Shadow window()\n");
-#endif
-	return (void *)((CARD8 *)sdlDriver->screen->pixels + row * (*size) + offset);
-}
-
-
-static Bool sdlCreateRes(ScreenPtr pScreen)
-{
-	KdScreenPriv(pScreen);
-	KdScreenInfo *screen = pScreenPriv->screen;
-	KdShadowFbAlloc(screen, 0, FALSE);
-	KdShadowSet(pScreen, RR_Rotate_0, sdlShadowUpdate, sdlShadowWindow);
-	return TRUE;
-}
-
-static Bool sdlFinishInitScreen(ScreenPtr pScreen)
-{
-	if (!shadowSetup (pScreen))
-		return FALSE;
-		
-/*
-#ifdef RANDR
-	if (!sdlRandRInit (pScreen))
-		return FALSE;
-#endif
-*/
-	return TRUE;
-}
-
-static void sdlKeyboardFini(KdKeyboardInfo *ki)
-{
-        sdlKeyboard = NULL;
-}
-
-static Bool sdlKeyboardInit(KdKeyboardInfo *ki)
-{
-        ki->minScanCode = 8;
-        ki->maxScanCode = 255;
-
-	sdlKeyboard = ki;
-
-        return TRUE;
-}
-
-static Bool sdlMouseInit (KdPointerInfo *pi)
-{
-        sdlPointer = pi;
-	return TRUE;
-}
-
-static void sdlMouseFini(KdPointerInfo *pi)
-{
-        sdlPointer = NULL;
-}
-
-
-void InitCard(char *name)
-{
-	KdCardAttr attr;
-        KdCardInfoAdd (&sdlFuncs, &attr, 0);
-#ifdef DEBUG
-	printf("InitCard: %s\n", name);
-#endif
-}
-
-void InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
-{
-	KdInitOutput(pScreenInfo, argc, argv);
-#ifdef DEBUG
-	printf("InitOutput()\n");
-#endif
-}
-
-void InitInput(int argc, char **argv)
-{
-        KdPointerInfo *pi;
-        KdKeyboardInfo *ki;
-
-        KdAddKeyboardDriver(&sdlKeyboardDriver);
-        KdAddPointerDriver(&sdlMouseDriver);
-        
-        ki = KdParseKeyboard("keyboard");
-        KdAddKeyboard(ki);
-        pi = KdParsePointer("mouse");
-        KdAddPointer(pi);
-
-        KdInitInput();
-}
-
-void ddxUseMsg(void)
-{
-	KdUseMsg();
-}
-
-int ddxProcessArgument(int argc, char **argv, int i)
-{
-	return KdProcessArgument(argc, argv, i);
-}
-
-void sdlTimer(void)
-{
-	static int buttonState=0;
-	SDL_Event event;
-	SDL_ShowCursor(FALSE);
-	/* get the mouse state */
-	while ( SDL_PollEvent(&event) ) {
-		switch (event.type) {
-			case SDL_MOUSEMOTION:
-				KdEnqueuePointerEvent(sdlPointer, mouseState, event.motion.x, event.motion.y, 0);
-				break;
-			case SDL_MOUSEBUTTONDOWN:
-				switch(event.button.button)
-				{
-					case 1:
-						buttonState=KD_BUTTON_1;
-						break;
-					case 2:
-						buttonState=KD_BUTTON_2;
-						break;
-					case 3:
-						buttonState=KD_BUTTON_3;
-						break;
-				}
-				mouseState|=buttonState;
-				KdEnqueuePointerEvent(sdlPointer, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-				break;
-			case SDL_MOUSEBUTTONUP:
-				switch(event.button.button)
-				{
-					case 1:
-						buttonState=KD_BUTTON_1;
-						break;
-					case 2:
-						buttonState=KD_BUTTON_2;
-						break;
-					case 3:
-						buttonState=KD_BUTTON_3;
-						break;
-				}
-				mouseState &= ~buttonState;
-				KdEnqueuePointerEvent(sdlPointer, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-				break;
-			case SDL_KEYDOWN:
-			case SDL_KEYUP:
-#ifdef DEBUG
-				printf("Keycode: %d\n", event.key.keysym.scancode);
-#endif
-			        KdEnqueueKeyboardEvent (sdlKeyboard, event.key.keysym.scancode, event.type==SDL_KEYUP);
-				break;
-
-			case SDL_QUIT:
-				/* this should never happen */
-				SDL_Quit();
-		}
-	}
-}
-
-static int xsdlInit(void)
-{
-#ifdef DEBUG
-	printf("Calling SDL_Init()\n");
-#endif
-	return SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER);
-}
-
-
-static void xsdlFini(void)
-{
-	SDL_Quit();
-}
-
-KdOsFuncs sdlOsFuncs={
-	.Init = xsdlInit,
-	.Fini = xsdlFini,
-	.pollEvents = sdlTimer,
-};
-
-void OsVendorInit (void)
-{
-    KdOsInit (&sdlOsFuncs);
-}
-
-
diff --git a/xorg-server/hw/kdrive/src/Makefile.in b/xorg-server/hw/kdrive/src/Makefile.in
index 889bb6afa..ff33a07df 100644
--- a/xorg-server/hw/kdrive/src/Makefile.in
+++ b/xorg-server/hw/kdrive/src/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -105,7 +105,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -130,7 +129,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -154,6 +152,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -171,8 +170,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -218,7 +215,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -244,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -253,7 +250,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -267,7 +263,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -309,8 +304,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -353,6 +346,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -384,7 +378,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index fb8ebd076..65fc75a54 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -898,11 +898,11 @@ KdNewKeyboard (void)
     ki->bellDuration = 200;
     ki->next = NULL;
     ki->options = NULL;
-    ki->xkbRules = strdup("base");
-    ki->xkbModel = strdup("pc105");
-    ki->xkbLayout = strdup("us");
-    ki->xkbVariant = NULL;
-    ki->xkbOptions = NULL;
+    ki->xkbRules = strdup(XKB_DFLT_RULES);
+    ki->xkbModel = strdup(XKB_DFLT_MODEL);
+    ki->xkbLayout = strdup(XKB_DFLT_LAYOUT);
+    ki->xkbVariant = strdup(XKB_DFLT_VARIANT);
+    ki->xkbOptions = strdup(XKB_DFLT_OPTIONS);
 
     return ki;
 }
diff --git a/xorg-server/hw/vfb/Makefile.in b/xorg-server/hw/vfb/Makefile.in
index 295ebf6b9..2821f63ba 100644
--- a/xorg-server/hw/vfb/Makefile.in
+++ b/xorg-server/hw/vfb/Makefile.in
@@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -142,7 +142,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -167,7 +166,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -191,6 +189,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -208,8 +207,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -255,7 +252,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -281,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -290,7 +287,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -304,7 +300,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -346,8 +341,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -395,6 +388,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -426,7 +420,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -922,10 +915,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
 	-rm -f $@
diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in
index 1f14b0ac0..3bc1b00ed 100644
--- a/xorg-server/hw/xfree86/Makefile.in
+++ b/xorg-server/hw/xfree86/Makefile.in
@@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -155,7 +155,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -180,7 +179,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -204,6 +202,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -221,8 +220,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -268,7 +265,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -294,6 +290,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -303,7 +300,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -317,7 +313,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -359,8 +354,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -403,6 +396,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -434,7 +428,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -987,10 +980,10 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 libxorg.c xorg.c:
 	touch $@
diff --git a/xorg-server/hw/xfree86/common/Makefile.in b/xorg-server/hw/xfree86/common/Makefile.in
index 6abdf4261..e5922f09c 100644
--- a/xorg-server/hw/xfree86/common/Makefile.in
+++ b/xorg-server/hw/xfree86/common/Makefile.in
@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -147,7 +147,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -172,7 +171,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -196,6 +194,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -213,8 +212,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -260,7 +257,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -286,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -295,7 +292,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -309,7 +305,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -351,8 +346,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -395,6 +388,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -426,7 +420,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index bce5aae58..3b7828a3f 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -253,7 +253,7 @@ configureInputSection (void)
 	int fd;
 #ifdef WSCONS_SUPPORT
 	fd = open("/dev/wsmouse", 0);
-	if (fd > 0) {
+	if (fd >= 0) {
 	    DFLT_MOUSE_DEV = "/dev/wsmouse";
 	    DFLT_MOUSE_PROTO = "wsmouse";
 	    close(fd);
diff --git a/xorg-server/hw/xfree86/ddc/Makefile.in b/xorg-server/hw/xfree86/ddc/Makefile.in
index ccaebbb9f..fb63c69b8 100644
--- a/xorg-server/hw/xfree86/ddc/Makefile.in
+++ b/xorg-server/hw/xfree86/ddc/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -269,7 +266,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -283,7 +279,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -369,6 +362,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -400,7 +394,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.in b/xorg-server/hw/xfree86/dixmods/Makefile.in
index 6d12d31ec..39e093237 100644
--- a/xorg-server/hw/xfree86/dixmods/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -209,7 +209,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -234,7 +233,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -258,6 +256,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -275,8 +274,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -322,7 +319,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -348,6 +344,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -357,7 +354,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -371,7 +367,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -413,8 +408,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -457,6 +450,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -488,7 +482,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
index 64fac12d9..70acef6f7 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -277,7 +274,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -291,7 +287,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -377,6 +370,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -408,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/doc/Makefile.in b/xorg-server/hw/xfree86/doc/Makefile.in
index 75cd02557..06ac44067 100644
--- a/xorg-server/hw/xfree86/doc/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -109,7 +109,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -134,7 +133,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -158,6 +156,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -175,8 +174,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -222,7 +219,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -248,6 +244,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -257,7 +254,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -271,7 +267,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -313,8 +308,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -357,6 +350,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -388,7 +382,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/doc/devel/Makefile.in b/xorg-server/hw/xfree86/doc/devel/Makefile.in
index 17a586fc2..5b1dabe78 100644
--- a/xorg-server/hw/xfree86/doc/devel/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/devel/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -72,7 +72,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -97,7 +96,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -121,6 +119,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -138,8 +137,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -185,7 +182,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -211,6 +207,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -220,7 +217,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -234,7 +230,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -276,8 +271,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -320,6 +313,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -351,7 +345,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.in b/xorg-server/hw/xfree86/doc/man/Makefile.in
index cc86ddb7a..7693cb6d4 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -246,7 +243,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -260,7 +256,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -346,6 +339,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -377,7 +371,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -672,10 +665,10 @@ xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
 	$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.am b/xorg-server/hw/xfree86/doc/sgml/Makefile.am
index d2c821c03..09b64f7b0 100644
--- a/xorg-server/hw/xfree86/doc/sgml/Makefile.am
+++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.am
@@ -33,19 +33,19 @@ SUFFIXES = .sgml .txt .html .ps .pdf
 
 .sgml.txt:
 	@rm -f $@
-	$(MAKE_TEXT) $<
+	$(AM_V_GEN)$(MAKE_TEXT) $<
 
 .sgml.ps:
 	@rm -f $@
-	$(MAKE_PS) $<
+	$(AM_V_GEN)$(MAKE_PS) $<
 
 .ps.pdf:
 	@rm -f $@
-	$(MAKE_PDF) $<
+	$(AM_V_GEN)$(MAKE_PDF) $<
 
 .sgml.html:
 	@rm -f $@
-	$(MAKE_HTML) $<
+	$(AM_V_GEN)$(MAKE_HTML) $<
 
 noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.in b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
index 200466a1b..d203a07f4 100644
--- a/xorg-server/hw/xfree86/doc/sgml/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -92,7 +92,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -117,7 +116,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -141,6 +139,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -158,8 +157,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -205,7 +202,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -231,6 +227,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -240,7 +237,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -254,7 +250,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -296,8 +291,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -340,6 +333,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -371,7 +365,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -577,19 +570,19 @@ uninstall-am:
 
 @BUILD_LINUXDOC_TRUE@.sgml.txt:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
-@BUILD_LINUXDOC_TRUE@	$(MAKE_TEXT) $<
+@BUILD_LINUXDOC_TRUE@	$(AM_V_GEN)$(MAKE_TEXT) $<
 
 @BUILD_LINUXDOC_TRUE@.sgml.ps:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
-@BUILD_LINUXDOC_TRUE@	$(MAKE_PS) $<
+@BUILD_LINUXDOC_TRUE@	$(AM_V_GEN)$(MAKE_PS) $<
 
 @BUILD_LINUXDOC_TRUE@.ps.pdf:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
-@BUILD_LINUXDOC_TRUE@	$(MAKE_PDF) $<
+@BUILD_LINUXDOC_TRUE@	$(AM_V_GEN)$(MAKE_PDF) $<
 
 @BUILD_LINUXDOC_TRUE@.sgml.html:
 @BUILD_LINUXDOC_TRUE@	@rm -f $@
-@BUILD_LINUXDOC_TRUE@	$(MAKE_HTML) $<
+@BUILD_LINUXDOC_TRUE@	$(AM_V_GEN)$(MAKE_HTML) $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/hw/xfree86/dri/Makefile.in b/xorg-server/hw/xfree86/dri/Makefile.in
index 3d8591e98..316c4966e 100644
--- a/xorg-server/hw/xfree86/dri/Makefile.in
+++ b/xorg-server/hw/xfree86/dri/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -272,7 +269,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -286,7 +282,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -372,6 +365,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -403,7 +397,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index faddfe6ec..0de9be621 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -1277,7 +1277,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
 
 	/* track this in case the client dies */
 	AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
-		    (pointer)pDrawable->id);
+		    (pointer)(intptr_t)pDrawable->id);
 
 	if (pDRIDrawablePriv->hwDrawable) {
 	    drmUpdateDrawableInfo(pDRIPriv->drmFD,
@@ -1348,7 +1348,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
     if (pDrawable->type == DRAWABLE_WINDOW) {
 	LookupClientResourceComplex(client, DRIDrawablePrivResType,
 				    DRIDestroyDrawableCB,
-				    (pointer)pDrawable->id);
+				    (pointer)(intptr_t)pDrawable->id);
     }
     else { /* pixmap (or for GLX 1.3, a PBuffer) */
 	/* NOT_DONE */
@@ -1364,7 +1364,9 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
     WindowPtr pWin;
     int rc;
 
-    id = (XID)pResource;
+    /* For DRIDrawablePrivResType, the XID is the client's fake ID. The
+     * important XID is the value in pResource. */
+    id = (XID)(intptr_t)pResource;
     rc = dixLookupWindow(&pWin, id, serverClient, DixGetAttrAccess);
 
     if (rc == Success) {
diff --git a/xorg-server/hw/xfree86/dri2/Makefile.in b/xorg-server/hw/xfree86/dri2/Makefile.in
index 8005471f8..36308e660 100644
--- a/xorg-server/hw/xfree86/dri2/Makefile.in
+++ b/xorg-server/hw/xfree86/dri2/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -271,7 +268,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -285,7 +281,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -371,6 +364,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -402,7 +396,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/exa/Makefile.in b/xorg-server/hw/xfree86/exa/Makefile.in
index 24b42048b..f91bfad36 100644
--- a/xorg-server/hw/xfree86/exa/Makefile.in
+++ b/xorg-server/hw/xfree86/exa/Makefile.in
@@ -47,7 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -127,7 +127,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -152,7 +151,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -176,6 +174,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -193,8 +192,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -240,7 +237,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -266,6 +262,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -275,7 +272,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -289,7 +285,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -331,8 +326,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -375,6 +368,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -406,7 +400,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -799,10 +792,10 @@ uninstall-am: uninstall-drivermanDATA uninstall-moduleLTLIBRARIES
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 exa.$(DRIVER_MAN_SUFFIX): exa.man
 	-rm -f exa.$(DRIVER_MAN_SUFFIX)
diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.in b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
index 9bb2082c8..d1c271e18 100644
--- a/xorg-server/hw/xfree86/fbdevhw/Makefile.in
+++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
@@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -132,7 +132,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -157,7 +156,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -181,6 +179,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -198,8 +197,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -245,7 +242,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -271,6 +267,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -280,7 +277,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -294,7 +290,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -336,8 +331,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -380,6 +373,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -411,7 +405,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -822,10 +815,10 @@ uninstall-am: uninstall-drivermanDATA uninstall-linuxmoduleLTLIBRARIES \
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man
 	-rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)
diff --git a/xorg-server/hw/xfree86/i2c/Makefile.in b/xorg-server/hw/xfree86/i2c/Makefile.in
index 5c636f882..6bbc50746 100644
--- a/xorg-server/hw/xfree86/i2c/Makefile.in
+++ b/xorg-server/hw/xfree86/i2c/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -173,7 +173,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -198,7 +197,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -222,6 +220,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -239,8 +238,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -286,7 +283,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -312,6 +308,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -321,7 +318,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -335,7 +331,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -377,8 +372,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -421,6 +414,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -452,7 +446,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/int10/Makefile.in b/xorg-server/hw/xfree86/int10/Makefile.in
index ac177a0f2..2a587eb91 100644
--- a/xorg-server/hw/xfree86/int10/Makefile.in
+++ b/xorg-server/hw/xfree86/int10/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -137,7 +137,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -162,7 +161,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -186,6 +184,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -203,8 +202,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -250,7 +247,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -276,6 +272,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -285,7 +282,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -299,7 +295,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -341,8 +336,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -385,6 +378,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -416,7 +410,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in
index badd676ab..875fd7b9d 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.in
+++ b/xorg-server/hw/xfree86/loader/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -244,7 +241,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -258,7 +254,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -344,6 +337,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -375,7 +369,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c
index 12af6b72e..37c8b641c 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.c
+++ b/xorg-server/hw/xfree86/loader/sdksyms.c
@@ -653,7 +653,6 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &SendErrorToClient,
     (void *) &MarkClientException,
     (void *) &CreateConnectionBlock,
-    (void *) &CopyISOLatin1Lowered,
     (void *) &CompareISOLatin1Lowered,
     (void *) &dixLookupWindow,
     (void *) &dixLookupDrawable,
@@ -1053,7 +1052,6 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &noResExtension,
     (void *) &noXFree86DGAExtension,
     (void *) &noXFree86DRIExtension,
-    (void *) &noXFree86VidModeExtension,
     (void *) &noXFixesExtension,
     (void *) &noPanoramiXExtension,
     (void *) &noXvExtension,
@@ -1568,8 +1566,6 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &DMTModes,
     (void *) &xf86ConfigFile,
     (void *) &xf86AllowMouseOpenFail,
-    (void *) &xf86VidModeDisabled,
-    (void *) &xf86VidModeAllowNonLocal,
     (void *) &xf86fpFlag,
     (void *) &xf86sFlag,
     (void *) &xf86bsEnableFlag,
diff --git a/xorg-server/hw/xfree86/modes/Makefile.in b/xorg-server/hw/xfree86/modes/Makefile.in
index c25014756..54a956297 100644
--- a/xorg-server/hw/xfree86/modes/Makefile.in
+++ b/xorg-server/hw/xfree86/modes/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -127,7 +127,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -152,7 +151,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -176,6 +174,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -193,8 +192,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -240,7 +237,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -266,6 +262,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -275,7 +272,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -289,7 +285,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -331,8 +326,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -375,6 +368,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -406,7 +400,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/Makefile.in b/xorg-server/hw/xfree86/os-support/Makefile.in
index 304aaef80..d8b82872e 100644
--- a/xorg-server/hw/xfree86/os-support/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -158,7 +158,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -183,7 +182,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -207,6 +205,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -224,8 +223,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -271,7 +268,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -297,6 +293,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -306,7 +303,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -320,7 +316,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -362,8 +357,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -406,6 +399,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -437,7 +431,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
index b73bfa0cb..6f7253292 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -269,7 +266,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -283,7 +279,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -369,6 +362,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -400,7 +394,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/bus/Makefile.in b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
index fd9dd926b..94b80c45f 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -129,7 +129,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -154,7 +153,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -178,6 +176,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -195,8 +194,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -242,7 +239,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -268,6 +264,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -277,7 +274,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -291,7 +287,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -333,8 +328,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -377,6 +370,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -408,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/bus/linuxPci.c b/xorg-server/hw/xfree86/os-support/bus/linuxPci.c
index 920a14949..289315ebc 100644
--- a/xorg-server/hw/xfree86/os-support/bus/linuxPci.c
+++ b/xorg-server/hw/xfree86/os-support/bus/linuxPci.c
@@ -445,7 +445,7 @@ xf86MapLegacyIO(struct pci_device *dev)
 						  PCIIOC_MMAP_IS_IO);
 	}
 	else { /* legacy_io file exists, encode fd */
-	    DomainMmappedIO[domain] = (pointer)(fd << 24);
+	    DomainMmappedIO[domain] = (pointer)(intptr_t)(fd << 24);
 	}
     }
 
diff --git a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
index 8eb1562e0..cebfcce13 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -97,7 +97,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -122,7 +121,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -146,6 +144,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -163,8 +162,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -210,7 +207,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -236,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -245,7 +242,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -259,7 +255,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -301,8 +296,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -345,6 +338,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -376,7 +370,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/linux/Makefile.in b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
index 0433483bd..0dc41eded 100644
--- a/xorg-server/hw/xfree86/os-support/linux/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -270,7 +267,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -284,7 +280,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -370,6 +363,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -401,7 +395,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
index 73409dfba..09d178797 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
@@ -336,7 +336,7 @@ mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr)
 {
 	struct mtrr_wc_region *p, *prev;
 
-	if (mtrr_fd > 0) {
+	if (mtrr_fd >= 0) {
 		p = wcr;
 		while (p) {
 			if (p->added)
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.in b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
index 0b74a8902..0b4a50f57 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -243,7 +240,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -257,7 +253,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -343,6 +336,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -374,7 +368,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/sco/Makefile.in b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
index 8c836c7d8..b49eeb366 100644
--- a/xorg-server/hw/xfree86/os-support/sco/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -69,7 +69,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -94,7 +93,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -118,6 +116,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -135,8 +134,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -182,7 +179,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -208,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -217,7 +214,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -231,7 +227,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -273,8 +268,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -317,6 +310,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -348,7 +342,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
index ca606a9be..997ef12b7 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -144,7 +144,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -169,7 +168,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -193,6 +191,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -210,8 +209,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -257,7 +254,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -283,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -292,7 +289,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -306,7 +302,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -348,8 +343,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -392,6 +385,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -423,7 +417,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
index d7b56737a..26d88d168 100644
--- a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -69,7 +69,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -94,7 +93,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -118,6 +116,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -135,8 +134,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -182,7 +179,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -208,6 +204,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -217,7 +214,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -231,7 +227,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -273,8 +268,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -317,6 +310,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -348,7 +342,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/parser/Makefile.in b/xorg-server/hw/xfree86/parser/Makefile.in
index 865a7b029..7db26df1d 100644
--- a/xorg-server/hw/xfree86/parser/Makefile.in
+++ b/xorg-server/hw/xfree86/parser/Makefile.in
@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -152,7 +152,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -177,7 +176,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -201,6 +199,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -218,8 +217,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -265,7 +262,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -291,6 +287,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -300,7 +297,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -314,7 +310,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -356,8 +351,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -400,6 +393,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -431,7 +425,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/ramdac/Makefile.in b/xorg-server/hw/xfree86/ramdac/Makefile.in
index 59e180c7c..3dfddd330 100644
--- a/xorg-server/hw/xfree86/ramdac/Makefile.in
+++ b/xorg-server/hw/xfree86/ramdac/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -269,7 +266,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -283,7 +279,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -369,6 +362,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -400,7 +394,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/shadowfb/Makefile.in b/xorg-server/hw/xfree86/shadowfb/Makefile.in
index df1481fb3..0a4bed446 100644
--- a/xorg-server/hw/xfree86/shadowfb/Makefile.in
+++ b/xorg-server/hw/xfree86/shadowfb/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -272,7 +269,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -286,7 +282,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -372,6 +365,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -403,7 +397,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/utils/Makefile.in b/xorg-server/hw/xfree86/utils/Makefile.in
index 43c08c662..60d168bbd 100644
--- a/xorg-server/hw/xfree86/utils/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/Makefile.in
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -109,7 +109,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -134,7 +133,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -158,6 +156,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -175,8 +174,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -222,7 +219,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -248,6 +244,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -257,7 +254,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -271,7 +267,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -313,8 +308,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -357,6 +350,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -388,7 +382,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/utils/cvt/Makefile.in b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
index 3ee5f1073..fdc6f0711 100644
--- a/xorg-server/hw/xfree86/utils/cvt/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
@@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -157,7 +157,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -182,7 +181,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -206,6 +204,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -223,8 +222,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -270,7 +267,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -296,6 +292,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -305,7 +302,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -319,7 +315,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -361,8 +356,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -405,6 +398,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -436,7 +430,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -896,10 +889,10 @@ uninstall-man: uninstall-man1
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/hw/xfree86/utils/gtf/Makefile.in b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
index c54bdb20e..eab692b27 100644
--- a/xorg-server/hw/xfree86/utils/gtf/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
@@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -156,7 +156,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -181,7 +180,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -205,6 +203,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -222,8 +221,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -269,7 +266,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -295,6 +291,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -304,7 +301,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -318,7 +314,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -360,8 +355,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -404,6 +397,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -435,7 +429,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -851,10 +844,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
 	-rm -f $@
diff --git a/xorg-server/hw/xfree86/vbe/Makefile.in b/xorg-server/hw/xfree86/vbe/Makefile.in
index 5e7319adb..f8b15d129 100644
--- a/xorg-server/hw/xfree86/vbe/Makefile.in
+++ b/xorg-server/hw/xfree86/vbe/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -271,7 +268,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -285,7 +281,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -371,6 +364,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -402,7 +396,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/vgahw/Makefile.in b/xorg-server/hw/xfree86/vgahw/Makefile.in
index 9f7f702a7..85ac974bb 100644
--- a/xorg-server/hw/xfree86/vgahw/Makefile.in
+++ b/xorg-server/hw/xfree86/vgahw/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +123,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -148,7 +147,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -172,6 +170,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -189,8 +188,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -236,7 +233,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -262,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -271,7 +268,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -285,7 +281,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -327,8 +322,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -371,6 +364,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -402,7 +396,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.in b/xorg-server/hw/xfree86/x86emu/Makefile.in
index 90d9ab8bd..d9a4025a4 100644
--- a/xorg-server/hw/xfree86/x86emu/Makefile.in
+++ b/xorg-server/hw/xfree86/x86emu/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -244,7 +241,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -258,7 +254,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -344,6 +337,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -375,7 +369,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.in b/xorg-server/hw/xfree86/xaa/Makefile.in
index 2404c9433..dfeb05aa0 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.in
+++ b/xorg-server/hw/xfree86/xaa/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -143,7 +143,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -168,7 +167,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -192,6 +190,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -209,8 +208,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -256,7 +253,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -282,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -291,7 +288,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -305,7 +301,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -347,8 +342,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -391,6 +384,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -422,7 +416,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
index 4b618a04f..d3527f0f1 100644
--- a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
+++ b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -272,7 +269,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -286,7 +282,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -372,6 +365,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -403,7 +397,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xnest/Makefile.in b/xorg-server/hw/xnest/Makefile.in
index bc8634e14..d165552eb 100644
--- a/xorg-server/hw/xnest/Makefile.in
+++ b/xorg-server/hw/xnest/Makefile.in
@@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -145,7 +145,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -170,7 +169,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -194,6 +192,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -211,8 +210,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -258,7 +255,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -284,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -293,7 +290,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -307,7 +303,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -352,8 +347,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -396,6 +389,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -427,7 +421,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -980,10 +973,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
 	-rm -f $@
diff --git a/xorg-server/hw/xquartz/GL/Makefile.in b/xorg-server/hw/xquartz/GL/Makefile.in
index 6b6127403..053785602 100644
--- a/xorg-server/hw/xquartz/GL/Makefile.in
+++ b/xorg-server/hw/xquartz/GL/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -244,7 +241,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -258,7 +254,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -344,6 +337,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -375,7 +369,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xquartz/Makefile.in b/xorg-server/hw/xquartz/Makefile.in
index 9864293f7..1fe3358ba 100644
--- a/xorg-server/hw/xquartz/Makefile.in
+++ b/xorg-server/hw/xquartz/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -149,7 +149,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -174,7 +173,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -198,6 +196,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -215,8 +214,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -262,7 +259,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -288,6 +284,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -297,7 +294,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -311,7 +307,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -353,8 +348,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -397,6 +390,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -428,7 +422,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m
index d8d23ec2f..119154764 100644
--- a/xorg-server/hw/xquartz/X11Controller.m
+++ b/xorg-server/hw/xquartz/X11Controller.m
@@ -52,8 +52,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-BOOL xquartz_resetenv_display = NO;
-
 @implementation X11Controller
 
 - (void) awakeFromNib
@@ -353,7 +351,7 @@ BOOL xquartz_resetenv_display = NO;
     newargv[3] = NULL;
     
     s = getenv("DISPLAY");
-    if (xquartz_resetenv_display || s == NULL || s[0] == 0) {
+    if (s == NULL || s[0] == 0) {
         snprintf(buf, sizeof(buf), ":%s", display);
         setenv("DISPLAY", buf, TRUE);
     }
diff --git a/xorg-server/hw/xquartz/bundle/Makefile.in b/xorg-server/hw/xquartz/bundle/Makefile.in
index fccfb7357..8452829bd 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.in
+++ b/xorg-server/hw/xquartz/bundle/Makefile.in
@@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -102,7 +102,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -127,7 +126,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -151,6 +149,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -168,8 +167,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -215,7 +212,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -241,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -250,7 +247,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -264,7 +260,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -306,8 +301,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -350,6 +343,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -381,7 +375,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xquartz/doc/Makefile.in b/xorg-server/hw/xquartz/doc/Makefile.in
index 1c2540fbc..b09afa813 100644
--- a/xorg-server/hw/xquartz/doc/Makefile.in
+++ b/xorg-server/hw/xquartz/doc/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -98,7 +98,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -123,7 +122,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -147,6 +145,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -164,8 +163,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -211,7 +208,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -237,6 +233,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -246,7 +243,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -260,7 +256,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -302,8 +297,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -346,6 +339,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -377,7 +371,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -641,10 +634,10 @@ uninstall-am: uninstall-appmanDATA
 
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
 	cp $< $@
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.in b/xorg-server/hw/xquartz/mach-startup/Makefile.in
index 47d174c19..a379c10d4 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.in
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.in
@@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -133,7 +133,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -158,7 +157,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -182,6 +180,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -199,8 +198,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -246,7 +243,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -272,6 +268,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -281,7 +278,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -295,7 +291,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -337,8 +332,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -381,6 +374,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -412,7 +406,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 146ea11d8..640a91f23 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -62,8 +62,6 @@ void DarwinListenOnOpenFD(int fd);
 
 extern int noPanoramiXExtension;
 
-extern int xquartz_resetenv_display;
-
 #define DEFAULT_CLIENT X11BINDIR "/xterm"
 #define DEFAULT_STARTX X11BINDIR "/startx"
 #define DEFAULT_SHELL  "/bin/sh"
@@ -302,6 +300,7 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename)
 
     handoff_data->fd = create_socket(handoff_data->filename);
     if(!handoff_data->fd) {
+        free(handoff_data);
         return KERN_FAILURE;
     }
 
@@ -429,9 +428,6 @@ static int startup_trigger(int argc, char **argv, char **envp) {
     if((s = getenv("DISPLAY"))) {
         fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);
         unsetenv("DISPLAY");
-        
-        /* This tells X11Controller to not use the environment's DISPLAY and reset it based on the server's display */
-        xquartz_resetenv_display = 1;
     } else {
         fprintf(stderr, "X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
     }
diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.in b/xorg-server/hw/xquartz/pbproxy/Makefile.in
index 5243f4934..e55b81c0f 100644
--- a/xorg-server/hw/xquartz/pbproxy/Makefile.in
+++ b/xorg-server/hw/xquartz/pbproxy/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -120,7 +120,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -145,7 +144,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -169,6 +167,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -186,8 +185,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -233,7 +230,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -259,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -268,7 +265,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -282,7 +278,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -324,8 +319,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -368,6 +361,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -399,7 +393,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xquartz/xpr/Makefile.in b/xorg-server/hw/xquartz/xpr/Makefile.in
index f0054fb37..41d640834 100644
--- a/xorg-server/hw/xquartz/xpr/Makefile.in
+++ b/xorg-server/hw/xquartz/xpr/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -97,7 +97,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -122,7 +121,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -146,6 +144,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -163,8 +162,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -210,7 +207,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -236,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -245,7 +242,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -259,7 +255,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -301,8 +296,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -345,6 +338,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -376,7 +370,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 2c7972a7f..a76b56957 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -196,7 +196,6 @@ EXTRA_DIST = \
 	$(GLX_EXTRAS) \
 	$(MAN_SRCS) \
 	_usr_X11R6_lib_X11_system.XWinrc \
-	X-boxed.ico \
 	X.ico \
 	XWin.rc \
 	xlaunch/config.cc \
diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in
index 4abd2661a..59c383f89 100644
--- a/xorg-server/hw/xwin/Makefile.in
+++ b/xorg-server/hw/xwin/Makefile.in
@@ -49,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -212,7 +212,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -237,7 +236,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -269,6 +267,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -286,8 +285,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -333,7 +330,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -359,6 +355,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -368,7 +365,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -382,7 +378,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -424,8 +419,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -468,6 +461,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -499,7 +493,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -689,7 +682,6 @@ EXTRA_DIST = \
 	$(GLX_EXTRAS) \
 	$(MAN_SRCS) \
 	_usr_X11R6_lib_X11_system.XWinrc \
-	X-boxed.ico \
 	X.ico \
 	XWin.rc \
 	xlaunch/config.cc \
@@ -1235,10 +1227,10 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man
 	$(LN_S) XWinrc.man XWinrc.$(FILE_MAN_SUFFIX)
 
 .pre:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.pre.man:
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
 
 relink:
 	rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
diff --git a/xorg-server/hw/xwin/X-boxed.ico b/xorg-server/hw/xwin/X-boxed.ico
deleted file mode 100644
index 072704253..000000000
--- a/xorg-server/hw/xwin/X-boxed.ico
+++ /dev/null
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 29c6f1ccf..df2664dca 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -106,4 +106,3 @@ END
  */
 
 IDI_XWIN		ICON	"X.ico"
-IDI_XWIN_BOXED		ICON	"X-boxed.ico"
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index b537d3213..99eb6b8d2 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -371,16 +371,15 @@ winMouseButtonsHandle (ScreenPtr pScreen,
  */
 void winEnqueueMotion(int x, int y)
 {
-  miPointerSetPosition(g_pwinPointer, &x, &y);
-
   int i, nevents;
   int valuators[2];
-
   EventListPtr events;
-  GetEventList(&events);
 
+  miPointerSetPosition(g_pwinPointer, &x, &y);
   valuators[0] = x;
   valuators[1] = y;
+
+  GetEventList(&events);
   nevents = GetPointerEvents(events, g_pwinPointer, MotionNotify, 0,
 			     POINTER_ABSOLUTE, 0, 2, valuators);
 
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index e16b2a3c8..9f46a64d9 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -543,33 +543,34 @@ winUpdateIcon (Window id)
   HICON			hIcon, hIconSmall=NULL, hIconOld;
 
   pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
-  if (!pWin) return;
-  winWindowPriv(pWin);
-  if (pWinPriv->hWnd) {
-    hIcon = winOverrideIcon ((unsigned long)pWin);
-    if (!hIcon) {
-      hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
-      if (!hIcon) {
-        hIcon = g_hIconX;
-        hIconSmall = g_hSmallIconX;
-      } else {
-        /* Leave undefined if not found */
-        hIconSmall = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON));
+  if (pWin)
+    {
+      winWindowPriv(pWin);
+      if (pWinPriv->hWnd) {
+        hIcon = winOverrideIcon ((unsigned long)pWin);
+        if (!hIcon) {
+          hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
+          if (!hIcon) {
+            hIcon = g_hIconX;
+            hIconSmall = g_hSmallIconX;
+          } else {
+            /* Leave undefined if not found */
+            hIconSmall = winXIconToHICON (pWin, GetSystemMetrics(SM_CXSMICON));
+          }
+        }
+
+        /* Set the large icon */
+        hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
+                                        WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+
+        /* Delete the icon if its not the default */
+        winDestroyIcon(hIconOld);
+
+        /* Same for the small icon */
+        hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
+                                        WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
+        winDestroyIcon(hIconOld);
       }
-    }
-
-    /* Set the large icon */
-    hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
-                     WM_SETICON, ICON_BIG, (LPARAM) hIcon);
-
-    /* Delete the icon if its not the default */
-    winDestroyIcon(hIconOld);
-
-    /* Same for the small icon */
-    hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
-                    WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
-    winDestroyIcon(hIconOld);
-
   }
 }
 
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 543a1652f..d14ceee9c 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -282,11 +282,11 @@ static void winRaiseWindow(WindowPtr pWin)
   if (!winInDestroyWindowsWindow && !winInRaiseWindow)
   {
     BOOL oldstate = winInRaiseWindow;
+    XID vlist[1] = { 0 };
     winInRaiseWindow = TRUE;
     /* Call configure window directly to make sure it gets processed 
      * in time
      */
-    XID vlist[1] = { 0 };
     ConfigureWindow(pWin, CWStackMode, vlist, serverClient); 
     winInRaiseWindow = oldstate;
   }
@@ -416,12 +416,14 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       winReorderWindowsMultiWindow ();
 
       /* Fix a 'round title bar corner background should be transparent not black' problem when first painted */
-      RECT rWindow;
-      HRGN hRgnWindow;
-      GetWindowRect(hwnd, &rWindow);
-      hRgnWindow = CreateRectRgnIndirect(&rWindow);
-      SetWindowRgn (hwnd, hRgnWindow, TRUE);
-      DeleteObject(hRgnWindow);
+      {
+        RECT rWindow;
+        HRGN hRgnWindow;
+        GetWindowRect(hwnd, &rWindow);
+        hRgnWindow = CreateRectRgnIndirect(&rWindow);
+        SetWindowRgn (hwnd, hRgnWindow, TRUE);
+        DeleteObject(hRgnWindow);
+      }
 
       SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE);
 
@@ -897,10 +899,10 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	}
       else /* It is an overridden window so make it top of Z stack */
 	{
+	  HWND forHwnd = GetForegroundWindow();
 #if CYGWINDOWING_DEBUG
 	  ErrorF ("overridden window is shown\n");
 #endif
-	  HWND forHwnd = GetForegroundWindow();
 	  if (forHwnd != NULL)
 	  {
 	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE)
diff --git a/xorg-server/hw/xwin/winprefslex.c b/xorg-server/hw/xwin/winprefslex.c
index 83d7f8fa8..c55bd8310 100644
--- a/xorg-server/hw/xwin/winprefslex.c
+++ b/xorg-server/hw/xwin/winprefslex.c
@@ -53,7 +53,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +83,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -140,7 +141,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -689,7 +698,7 @@ static char *makestr(char *str)
   return ptr;
 }
 
-#line 693 "winprefslex.c"
+#line 702 "winprefslex.c"
 
 #define INITIAL 0
 
@@ -770,7 +779,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -778,7 +792,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -789,7 +803,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -873,7 +887,7 @@ YY_DECL
     
 #line 66 "winprefslex.l"
 
-#line 877 "winprefslex.c"
+#line 891 "winprefslex.c"
 
 	if ( !(yy_init) )
 		{
@@ -1137,7 +1151,7 @@ YY_RULE_SETUP
 #line 102 "winprefslex.l"
 ECHO;
 	YY_BREAK
-#line 1141 "winprefslex.c"
+#line 1155 "winprefslex.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1904,8 +1918,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
diff --git a/xorg-server/hw/xwin/winresource.h b/xorg-server/hw/xwin/winresource.h
index 5aa884030..7085117e6 100644
--- a/xorg-server/hw/xwin/winresource.h
+++ b/xorg-server/hw/xwin/winresource.h
@@ -37,7 +37,6 @@
 
 #define IDC_STATIC		-1
 #define IDI_XWIN		101
-#define IDI_XWIN_BOXED		102
 #define IDM_TRAYICON_MENU	103
 #define IDC_CLIENTS_CONNECTED	104
 
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index d72a5f135..5e8451082 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -717,6 +717,10 @@ winWindowProc (HWND hwnd, UINT message,
       if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
 	break;
 
+      /* We can't do anything without g_pwinPointer */
+      if (g_pwinPointer == NULL)
+        break;
+
       /* Has the mouse pointer crossed screens? */
       if (s_pScreen != miPointerGetScreen(g_pwinPointer))
 	miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen,
diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in
index b4a593fc0..caef87dcd 100644
--- a/xorg-server/include/Makefile.in
+++ b/xorg-server/include/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -106,7 +106,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -131,7 +130,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -155,6 +153,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -172,8 +171,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -219,7 +216,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -245,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -254,7 +251,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -268,7 +264,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -310,8 +305,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -354,6 +347,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -385,7 +379,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index b1edb6c46..ed3acb6c4 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -173,11 +173,6 @@ extern _X_EXPORT void MarkClientException(
 extern _X_HIDDEN Bool CreateConnectionBlock(void);
 /* dixutils.c */
 
-extern _X_EXPORT void CopyISOLatin1Lowered(
-    unsigned char * /*dest*/,
-    unsigned char * /*source*/,
-    int /*length*/);
-
 extern _X_EXPORT int CompareISOLatin1Lowered(
     unsigned char * /*a*/,
     int alen,
@@ -587,8 +582,8 @@ typedef struct {
 
 extern int XItoCoreType(int xi_type);
 extern Bool DevHasCursor(DeviceIntPtr pDev);
-extern Bool IsPointerDevice( DeviceIntPtr dev);
-extern Bool IsKeyboardDevice(DeviceIntPtr dev);
+extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
+extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
 extern Bool IsPointerEvent(InternalEvent *event);
 extern Bool IsMaster(DeviceIntPtr dev);
 
diff --git a/xorg-server/include/do-not-use-config.h.in b/xorg-server/include/do-not-use-config.h.in
index 2093fc6db..19ca8a2a8 100644
--- a/xorg-server/include/do-not-use-config.h.in
+++ b/xorg-server/include/do-not-use-config.h.in
@@ -277,9 +277,6 @@
 /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
 #undef HAVE_RPCSVC_DBM_H
 
-/* Define to 1 if you have the <SDL/SDL.h> header file. */
-#undef HAVE_SDL_SDL_H
-
 /* Define to 1 if you have the <selinux/avc.h> header file. */
 #undef HAVE_SELINUX_AVC_H
 
@@ -451,6 +448,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -687,9 +687,6 @@
 /* Build registry module */
 #undef XREGISTRY
 
-/* Build Xsdl server */
-#undef XSDLSERVER
-
 /* Build SELinux extension */
 #undef XSELINUX
 
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 2f6b0c06f..dad1af787 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -83,6 +83,10 @@ typedef struct _NewClientRec *NewClientPtr;
 #include <stdio.h>
 #include <stdarg.h>
 
+#ifdef DDXBEFORERESET
+extern void ddxBeforeReset (void);
+#endif
+
 #ifdef DDXOSVERRORF
 extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
 #endif
diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index da9770ce3..d688c66b5 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -61,7 +61,7 @@
 
 /* GLX */
 #define SERVER_GLX_MAJOR_VERSION		1
-#define SERVER_GLX_MINOR_VERSION		2
+#define SERVER_GLX_MINOR_VERSION		4
 
 /* Xinerama */
 #define SERVER_PANORAMIX_MAJOR_VERSION          1
diff --git a/xorg-server/ltmain.sh b/xorg-server/ltmain.sh
index 6939dcc4a..3506ead39 100644
--- a/xorg-server/ltmain.sh
+++ b/xorg-server/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6
+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.2.6
+VERSION="2.2.6 Debian-2.2.6a-4"
 TIMESTAMP=""
 package_revision=1.3012
 
@@ -5033,7 +5033,10 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5344,19 +5347,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -5893,6 +5896,7 @@ func_mode_link ()
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -6206,6 +6210,9 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/xorg-server/m4/libtool.m4 b/xorg-server/m4/libtool.m4
index 671cde117..1e7ea47c0 100644
--- a/xorg-server/m4/libtool.m4
+++ b/xorg-server/m4/libtool.m4
@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3079,7 +3088,7 @@ linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4431,7 +4446,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -4606,6 +4621,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -4844,7 +4860,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
diff --git a/xorg-server/m4/shave.m4 b/xorg-server/m4/shave.m4
deleted file mode 100644
index 0c2c9f5a0..000000000
--- a/xorg-server/m4/shave.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-dnl
-dnl SHAVE_INIT([shavedir],[default_mode])
-dnl
-dnl shavedir: the directory where the shave scripts are, it defaults to
-dnl           $(top_builddir)
-dnl default_mode: (enable|disable) default shave mode.  This parameter
-dnl               controls shave's behaviour when no option has been
-dnl               given to configure.  It defaults to disable.
-dnl
-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
-dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
-dnl   LIBTOOL, you don't want the configure tests to have these variables
-dnl   re-defined.
-dnl * This macro requires GNU make's -s option.
-
-AC_DEFUN([_SHAVE_ARG_ENABLE],
-[
-  AC_ARG_ENABLE([shave],
-    AS_HELP_STRING(
-      [--enable-shave],
-      [use shave to make the build pretty [[default=$1]]]),,
-      [enable_shave=$1]
-    )
-])
-
-AC_DEFUN([SHAVE_INIT],
-[
-  dnl you can tweak the default value of enable_shave
-  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
-
-  if test x"$enable_shave" = xyes; then
-    dnl where can we find the shave scripts?
-    m4_if([$1],,
-      [shavedir="$ac_pwd"],
-      [shavedir="$ac_pwd/$1"])
-    AC_SUBST(shavedir)
-
-    dnl make is now quiet
-    AC_SUBST([MAKEFLAGS], [-s])
-    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
-
-    dnl we need sed
-    AC_CHECK_PROG(SED,sed,sed,false)
-
-    dnl substitute libtool
-    SHAVE_SAVED_LIBTOOL=$LIBTOOL
-    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
-    AC_SUBST(LIBTOOL)
-
-    dnl substitute cc/cxx
-    SHAVE_SAVED_CC=$CC
-    SHAVE_SAVED_CXX=$CXX
-    SHAVE_SAVED_FC=$FC
-    SHAVE_SAVED_F77=$F77
-    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
-    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
-    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
-    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
-    AC_SUBST(CC)
-    AC_SUBST(CXX)
-    AC_SUBST(FC)
-    AC_SUBST(F77)
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-  AC_SUBST(V)
-  AC_SUBST(Q)
-])
-
diff --git a/xorg-server/mi/Makefile.in b/xorg-server/mi/Makefile.in
index c80881c72..56ace6c4c 100644
--- a/xorg-server/mi/Makefile.in
+++ b/xorg-server/mi/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -131,7 +131,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -156,7 +155,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -180,6 +178,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -197,8 +196,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -244,7 +241,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -270,6 +266,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -279,7 +276,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -293,7 +289,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -335,8 +330,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -379,6 +372,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -410,7 +404,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/miext/Makefile.in b/xorg-server/miext/Makefile.in
index 0738cc7dc..fdd215968 100644
--- a/xorg-server/miext/Makefile.in
+++ b/xorg-server/miext/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -111,7 +111,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -136,7 +135,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -160,6 +158,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -177,8 +176,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -224,7 +221,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -250,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -259,7 +256,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -273,7 +269,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -315,8 +310,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -359,6 +352,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -390,7 +384,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/miext/cw/Makefile.in b/xorg-server/miext/cw/Makefile.in
index ae7a047c4..3cde755c8 100644
--- a/xorg-server/miext/cw/Makefile.in
+++ b/xorg-server/miext/cw/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -243,7 +240,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -257,7 +253,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -343,6 +336,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -374,7 +368,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/miext/damage/Makefile.in b/xorg-server/miext/damage/Makefile.in
index 9e159a7eb..a9c318766 100644
--- a/xorg-server/miext/damage/Makefile.in
+++ b/xorg-server/miext/damage/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -121,7 +121,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -146,7 +145,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -170,6 +168,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -187,8 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -234,7 +231,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -260,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -269,7 +266,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -283,7 +279,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -325,8 +320,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -369,6 +362,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -400,7 +394,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/miext/rootless/Makefile.in b/xorg-server/miext/rootless/Makefile.in
index e32a59a39..0c24da9a0 100644
--- a/xorg-server/miext/rootless/Makefile.in
+++ b/xorg-server/miext/rootless/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,7 +96,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -121,7 +120,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -145,6 +143,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -162,8 +161,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -209,7 +206,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -235,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -244,7 +241,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -258,7 +254,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -300,8 +295,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -344,6 +337,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -375,7 +369,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/miext/shadow/Makefile.in b/xorg-server/miext/shadow/Makefile.in
index e59d58775..c709c76f5 100644
--- a/xorg-server/miext/shadow/Makefile.in
+++ b/xorg-server/miext/shadow/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -126,7 +126,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -151,7 +150,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -175,6 +173,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -192,8 +191,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -239,7 +236,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -265,6 +261,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -274,7 +271,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -288,7 +284,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -330,8 +325,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -374,6 +367,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -405,7 +399,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am
index 22ed1946c..a7f34a5b8 100644
--- a/xorg-server/os/Makefile.am
+++ b/xorg-server/os/Makefile.am
@@ -44,12 +44,12 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
 if SPECIAL_DTRACE_OBJECTS
 # Generate dtrace object code for probes in libos & libdix
 dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
-	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
+	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
 
 noinst_PROGRAMS = os.O
 
 os.O: dtrace.o $(am_libos_la_OBJECTS)
-	ld -r -o $@ dtrace.o .libs/*.o
+	$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
 endif
 
 os.c:
diff --git a/xorg-server/os/Makefile.in b/xorg-server/os/Makefile.in
index 4a328cfe9..5e334093e 100644
--- a/xorg-server/os/Makefile.in
+++ b/xorg-server/os/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -119,7 +119,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -144,7 +143,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -168,6 +166,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -185,8 +184,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -232,7 +229,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -258,6 +254,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -267,7 +264,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -281,7 +277,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -323,8 +318,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -367,6 +360,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -398,7 +392,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -738,10 +731,10 @@ uninstall-am:
 
 # Generate dtrace object code for probes in libos & libdix
 @SPECIAL_DTRACE_OBJECTS_TRUE@dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
-@SPECIAL_DTRACE_OBJECTS_TRUE@	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
+@SPECIAL_DTRACE_OBJECTS_TRUE@	$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
 
 @SPECIAL_DTRACE_OBJECTS_TRUE@os.O: dtrace.o $(am_libos_la_OBJECTS)
-@SPECIAL_DTRACE_OBJECTS_TRUE@	ld -r -o $@ dtrace.o .libs/*.o
+@SPECIAL_DTRACE_OBJECTS_TRUE@	$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
 
 os.c:
 	touch $@
diff --git a/xorg-server/os/backtrace.c b/xorg-server/os/backtrace.c
index a421140fb..dafb9904b 100644
--- a/xorg-server/os/backtrace.c
+++ b/xorg-server/os/backtrace.c
@@ -38,7 +38,7 @@
 void xorg_backtrace(void)
 {
     void *array[64];
-    char *mod;
+    const char *mod;
     int size, i;
     Dl_info info;
     ErrorF("\nBacktrace:\n");
@@ -48,10 +48,10 @@ void xorg_backtrace(void)
 	mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
 	if (info.dli_saddr)
 	    ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,
-		   info.dli_sname, array[i] - info.dli_saddr, array[i]);
+		   info.dli_sname, (char *) array[i] - (char *) info.dli_saddr, array[i]);
 	else
 	    ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod,
-		   info.dli_fbase, array[i] - info.dli_fbase, array[i]);
+		   info.dli_fbase, (char *) array[i] - (char *) info.dli_fbase, array[i]);
     }
 }
 
diff --git a/xorg-server/randr/Makefile.in b/xorg-server/randr/Makefile.in
index c2d72b4ee..3954eade6 100644
--- a/xorg-server/randr/Makefile.in
+++ b/xorg-server/randr/Makefile.in
@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -130,7 +130,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -155,7 +154,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -179,6 +177,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -196,8 +195,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -243,7 +240,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -269,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -278,7 +275,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -292,7 +288,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -334,8 +329,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -378,6 +371,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -409,7 +403,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/record/Makefile.in b/xorg-server/record/Makefile.in
index 3773a7d2c..596af6f1b 100644
--- a/xorg-server/record/Makefile.in
+++ b/xorg-server/record/Makefile.in
@@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -95,7 +95,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -120,7 +119,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -144,6 +142,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -161,8 +160,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -208,7 +205,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -234,6 +230,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -243,7 +240,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -257,7 +253,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -299,8 +294,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -343,6 +336,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -374,7 +368,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/render/Makefile.in b/xorg-server/render/Makefile.in
index e0ec573c7..1f202a601 100644
--- a/xorg-server/render/Makefile.in
+++ b/xorg-server/render/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -124,7 +124,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -149,7 +148,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -173,6 +171,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -190,8 +189,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -237,7 +234,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -263,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -272,7 +269,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -286,7 +282,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -328,8 +323,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -372,6 +365,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -403,7 +397,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/shave-libtool.in b/xorg-server/shave-libtool.in
deleted file mode 100644
index f19a69e20..000000000
--- a/xorg-server/shave-libtool.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the real libtool to use
-LIBTOOL="$1 --tag=CC"
-shift
-
-# if 1, don't print anything, the underlaying wrapper will do it
-pass_though=0
-
-# scan the arguments, keep the right ones for libtool, and discover the mode
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-        preserved_args="$preserved_args $opt"
-        ;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-case "$mode" in
-compile)
-    # shave will be called and print the actual CC/CXX/LINK line
-    preserved_args="$preserved_args --shave-mode=$mode"
-    pass_though=1
-    ;;
-link)
-    preserved_args="$preserved_args --shave-mode=$mode"
-    Q="  LINK  "
-    ;;
-*)
-    # let's u
-    # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_though -eq 0; then
-        echo "$Q$output"
-    fi
-    $LIBTOOL --silent $preserved_args
-else
-    echo $LIBTOOL $preserved_args
-    $LIBTOOL $preserved_args
-fi
diff --git a/xorg-server/shave.in b/xorg-server/shave.in
deleted file mode 100644
index 809d606af..000000000
--- a/xorg-server/shave.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the tool to wrap (cc, cxx, ar, ranlib, ..)
-tool="$1"
-shift
-
-# the reel tool (to call)
-REEL_TOOL="$1"
-shift
-
-pass_through=0
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --shave-mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-	;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    # hack for configure. configure calls $CC -print-prog-name=ld to get
-    # the linker. Without this bit here, the output can't be parsed and
-    # configure thinks there's no valid linker installed.
-    -print-prog-name=*)
-        mode="find-ld"
-        preserved_args="$preserved_args $opt"
-        ;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-# mode=link is handled in the libtool wrapper
-case "$mode,$tool" in
-link,*)
-    pass_through=1
-    ;;
-find-ld,*)
-    pass_through=1
-    ;;
-*,cxx)
-    Q="  CXX   "
-    ;;
-*,cc)
-    Q="  CC    "
-    ;;
-*,fc)
-    Q="  FC    "
-    ;;
-*,f77)
-    Q="  F77   "
-    ;;
-*,*)
-    # should not happen
-    Q="  CC    "
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_through -eq 0; then
-        echo "$Q$output"
-    fi
-    $REEL_TOOL $preserved_args
-else
-    echo $REEL_TOOL $preserved_args
-    $REEL_TOOL $preserved_args
-fi
diff --git a/xorg-server/test/Makefile.in b/xorg-server/test/Makefile.in
index 0bbf6ade6..34b578331 100644
--- a/xorg-server/test/Makefile.in
+++ b/xorg-server/test/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -166,7 +166,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -191,7 +190,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -215,6 +213,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -232,8 +231,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -279,7 +276,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -305,6 +301,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -314,7 +311,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -328,7 +324,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -370,8 +365,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -414,6 +407,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -445,7 +439,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/test/xi2/Makefile.in b/xorg-server/test/xi2/Makefile.in
index 93e53efc6..d6a09e8a7 100644
--- a/xorg-server/test/xi2/Makefile.in
+++ b/xorg-server/test/xi2/Makefile.in
@@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -233,7 +233,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -258,7 +257,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -282,6 +280,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -299,8 +298,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -346,7 +343,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -372,6 +368,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -381,7 +378,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -395,7 +391,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -437,8 +432,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -481,6 +474,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -512,7 +506,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/xfixes/Makefile.in b/xorg-server/xfixes/Makefile.in
index ba6e2fdfe..7fc598330 100644
--- a/xorg-server/xfixes/Makefile.in
+++ b/xorg-server/xfixes/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -122,7 +122,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -147,7 +146,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -171,6 +169,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -188,8 +187,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -235,7 +232,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -261,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -270,7 +267,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -284,7 +280,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -326,8 +321,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -370,6 +363,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -401,7 +395,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
diff --git a/xorg-server/xkb/Makefile.am b/xorg-server/xkb/Makefile.am
index b85ee8a41..e54ce59f0 100644
--- a/xorg-server/xkb/Makefile.am
+++ b/xorg-server/xkb/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS) \
-	-DHAVE_XKB_CONFIG_H
+AM_CFLAGS = $(DIX_CFLAGS)
 
 DDX_SRCS = \
         ddxBeep.c \
diff --git a/xorg-server/xkb/Makefile.in b/xorg-server/xkb/Makefile.in
index b8398fc53..117a61bb5 100644
--- a/xorg-server/xkb/Makefile.in
+++ b/xorg-server/xkb/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/shave.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -131,7 +131,6 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
@@ -156,7 +155,6 @@ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -180,6 +178,7 @@ DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
 DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
 DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
 DOLT_BASH = @DOLT_BASH@
+DOXYGEN = @DOXYGEN@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
 DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -197,8 +196,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -244,7 +241,6 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
-MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
@@ -270,6 +266,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -279,7 +276,6 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
-Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -293,7 +289,6 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
@@ -335,8 +330,6 @@ XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
-XSDL_INCS = @XSDL_INCS@
-XSDL_LIBS = @XSDL_LIBS@
 XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
 XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
 XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
@@ -379,6 +372,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -410,7 +404,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
-shavedir = @shavedir@
 srcdir = @srcdir@
 symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
@@ -419,9 +412,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
-AM_CFLAGS = $(DIX_CFLAGS) \
-	-DHAVE_XKB_CONFIG_H
-
+AM_CFLAGS = $(DIX_CFLAGS)
 DDX_SRCS = \
         ddxBeep.c \
         ddxCtrls.c \
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index ba8d50b19..72aff2ac0 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifdef HAVE_XKB_CONFIG_H
 #include <xkb-config.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 7abbeaaff..98e879ddb 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -554,7 +554,7 @@ ProcXkbGetState(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     xkb= &dev->key->xkbInfo->state;
     bzero(&rep,sizeof(xkbGetStateReply));
diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c
index 747c913f3..3d0fb0014 100644
--- a/xorg-server/xkb/xkbInit.c
+++ b/xorg-server/xkb/xkbInit.c
@@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifdef HAVE_XKB_CONFIG_H
 #include <xkb-config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c
index 75e243ca5..a214b75d7 100644
--- a/xorg-server/xkb/xkbUtils.c
+++ b/xorg-server/xkb/xkbUtils.c
@@ -343,13 +343,13 @@ CARD8 *			repeat;
     repeat= xkb->ctrls->per_key_repeat;
 
     if (pXDev->kbdfeed)
-	memcpy(repeat,pXDev->kbdfeed->ctrl.autoRepeats,32);
+	memcpy(repeat,pXDev->kbdfeed->ctrl.autoRepeats,XkbPerKeyBitArraySize);
 
     XkbUpdateDescActions(xkb,first,num,changes);
 
     if ((pXDev->kbdfeed)&&
 	(changes->ctrls.enabled_ctrls_changes&XkbPerKeyRepeatMask)) {
-        memcpy(pXDev->kbdfeed->ctrl.autoRepeats,repeat, 32);
+        memcpy(pXDev->kbdfeed->ctrl.autoRepeats,repeat, XkbPerKeyBitArraySize);
 	(*pXDev->kbdfeed->CtrlProc)(pXDev, &pXDev->kbdfeed->ctrl);
     }
     return;