svn merge ^/branches/released

13 files changed, 130 insertions, 49 deletions

diff --git a/xorg-server/hw/dmx/Makefile.in b/xorg-server/hw/dmx/Makefile.in
index 84b6fec10..771cc718a 100644
--- a/xorg-server/hw/dmx/Makefile.in
+++ b/xorg-server/hw/dmx/Makefile.in
@@ -222,6 +222,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -252,6 +253,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -262,6 +270,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -311,6 +320,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -335,6 +346,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -434,7 +447,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/hw/dmx/config/Makefile.in b/xorg-server/hw/dmx/config/Makefile.in
index 00a11b4b2..dc78a2ba3 100644
--- a/xorg-server/hw/dmx/config/Makefile.in
+++ b/xorg-server/hw/dmx/config/Makefile.in
@@ -195,6 +195,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -225,6 +226,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -235,6 +243,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -284,6 +293,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -308,6 +319,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -398,7 +411,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/hw/dmx/doc/Makefile.in b/xorg-server/hw/dmx/doc/Makefile.in
index 95f7febd0..e5feb7ee6 100644
--- a/xorg-server/hw/dmx/doc/Makefile.in
+++ b/xorg-server/hw/dmx/doc/Makefile.in
@@ -130,6 +130,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -160,6 +161,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -170,6 +178,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -219,6 +228,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -243,6 +254,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -333,7 +346,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
index fe4cbcd9c..1f2034321 100644
--- a/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
+++ b/xorg-server/hw/dmx/doc/html/dmxextension_8c.html
@@ -105,7 +105,7 @@
 
 <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>
 
-<p>Referenced by <a class="el" href="dmx_8c_source.html#l00815">ProcDMXAddInput()</a>.</p>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00816">ProcDMXAddInput()</a>.</p>
 
 </div>
 </div>
@@ -160,7 +160,7 @@
 
 <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>
 
-<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>.</p>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00463">ProcDMXAddScreen()</a>.</p>
 
 </div>
 </div>
@@ -517,7 +517,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00514">ProcDMXRemoveScreen()</a>.</p>
 
 </div>
 </div>
@@ -540,7 +540,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>, <a class="el" href="dmx_8c_source.html#l00603">ProcDMXGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00241">ProcDMXSync()</a>.</p>
 
 </div>
 </div>
@@ -605,7 +605,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00715">ProcDMXChangeDesktopAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -637,7 +637,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -660,7 +660,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmx_8c_source.html#l00758">ProcDMXGetInputCount()</a>.</p>
 
 </div>
 </div>
@@ -715,7 +715,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00463">ProcDMXAddScreen()</a>, <a class="el" href="dmx_8c_source.html#l00390">ProcDMXChangeScreensAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
 
 </div>
 </div>
@@ -747,7 +747,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
@@ -770,7 +770,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00867">ProcDMXRemoveInput()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
index 7e0167c36..fdf40a9d6 100644
--- a/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
+++ b/xorg-server/hw/dmx/doc/html/dmxextension_8h.html
@@ -142,7 +142,7 @@
 
 <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>
 
-<p>Referenced by <a class="el" href="dmx_8c_source.html#l00815">ProcDMXAddInput()</a>.</p>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00816">ProcDMXAddInput()</a>.</p>
 
 </div>
 </div>
@@ -174,7 +174,7 @@
 
 <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>
 
-<p>Referenced by <a class="el" href="dmx_8c_source.html#l00462">ProcDMXAddScreen()</a>.</p>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00463">ProcDMXAddScreen()</a>.</p>
 
 </div>
 </div>
@@ -194,7 +194,7 @@
 </div>
 <div class="memdoc">
 
-<p>Referenced by <a class="el" href="dmx_8c_source.html#l00714">ProcDMXChangeDesktopAttributes()</a>.</p>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00715">ProcDMXChangeDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -235,7 +235,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l01170">dmxAttachScreen()</a>, and <a class="el" href="dmx_8c_source.html#l00390">ProcDMXChangeScreensAttributes()</a>.</p>
 
 </div>
 </div>
@@ -258,7 +258,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00514">ProcDMXRemoveScreen()</a>.</p>
 
 </div>
 </div>
@@ -281,7 +281,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00263">ProcDMXForceWindowCreation()</a>, <a class="el" href="dmx_8c_source.html#l00603">ProcDMXGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00241">ProcDMXSync()</a>.</p>
 
 </div>
 </div>
@@ -326,7 +326,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00715">ProcDMXChangeDesktopAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -358,7 +358,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -381,7 +381,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmxinputinit_8c_source.html#l01120">dmxInputLogDevices()</a>, and <a class="el" href="dmx_8c_source.html#l00758">ProcDMXGetInputCount()</a>.</p>
 
 </div>
 </div>
@@ -436,7 +436,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00463">ProcDMXAddScreen()</a>, <a class="el" href="dmx_8c_source.html#l00390">ProcDMXChangeScreensAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
 
 </div>
 </div>
@@ -468,7 +468,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
@@ -491,7 +491,7 @@
 
 <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>
+<p>Referenced by <a class="el" href="dmx_8c_source.html#l00867">ProcDMXRemoveInput()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
index fc522c688..27c9ef0d6 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXDesktopAttributesRec.html
@@ -47,7 +47,7 @@
 </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>
+<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#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -62,7 +62,7 @@
 </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>
+<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#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -77,7 +77,7 @@
 </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>
+<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#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
@@ -92,7 +92,7 @@
 </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>
+<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#l00684">ProcDMXGetDesktopAttributes()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
index 8bfe84b1d..92fe9863d 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXInputAttributesRec.html
@@ -50,7 +50,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -65,7 +65,7 @@
 </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>
+<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#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -80,7 +80,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -95,7 +95,7 @@
 </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>
+<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#l00816">ProcDMXAddInput()</a>, and <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -110,7 +110,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00184">dmxGetInputAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -125,7 +125,7 @@
 </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>
+<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#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
@@ -140,7 +140,7 @@
 </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>
+<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#l00778">ProcDMXGetInputAttributes()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
index ee2faa6ee..48332ad1f 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXScreenAttributesRec.html
@@ -55,7 +55,7 @@
 </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>
+<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#l00463">ProcDMXAddScreen()</a>, and <a class="el" href="dmx_8c_source.html#l00332">ProcDMXGetScreenAttributes()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
index c35cfff52..7a1ffee4e 100644
--- a/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
+++ b/xorg-server/hw/dmx/doc/html/structDMXWindowAttributesRec.html
@@ -47,7 +47,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
@@ -62,7 +62,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
@@ -77,7 +77,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
@@ -92,7 +92,7 @@
 </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>
+<p>Referenced by <a class="el" href="dmxextension_8c_source.html#l00107">dmxGetWindowAttributes()</a>, and <a class="el" href="dmx_8c_source.html#l00572">dmxPopulate()</a>.</p>
 
 </div>
 </div>
diff --git a/xorg-server/hw/dmx/examples/Makefile.in b/xorg-server/hw/dmx/examples/Makefile.in
index 2c5b19db3..5d73b6938 100644
--- a/xorg-server/hw/dmx/examples/Makefile.in
+++ b/xorg-server/hw/dmx/examples/Makefile.in
@@ -237,6 +237,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -267,6 +268,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -277,6 +285,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -326,6 +335,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -350,6 +361,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -440,7 +453,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.in b/xorg-server/hw/dmx/glxProxy/Makefile.in
index 0f3ec55f1..0661f09b9 100644
--- a/xorg-server/hw/dmx/glxProxy/Makefile.in
+++ b/xorg-server/hw/dmx/glxProxy/Makefile.in
@@ -144,6 +144,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -174,6 +175,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -184,6 +192,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -233,6 +242,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -257,6 +268,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -347,7 +360,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/hw/dmx/glxProxy/glxext.c b/xorg-server/hw/dmx/glxProxy/glxext.c
index b30d144ee..6cd8bb41a 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.c
+++ b/xorg-server/hw/dmx/glxProxy/glxext.c
@@ -293,11 +293,20 @@ void GlxExtensionInit(void)
        return;
     }
     
-    __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
-    __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
-    __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
-    __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
-    __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
+    __glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
+					    "GLXContext");
+    __glXClientRes = CreateNewResourceType((DeleteType)ClientGone,
+					   "GLXClient");
+    __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone,
+					   "GLXPixmap");
+    __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone,
+					   "GLXWindow");
+    __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone,
+					    "GLXPbuffer");
+
+    if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
+	!__glXWindowRes || !__glXPbufferRes)
+	return;
 
     /*
     ** Add extension to server extensions.
diff --git a/xorg-server/hw/dmx/input/Makefile.in b/xorg-server/hw/dmx/input/Makefile.in
index c25f1c9a2..adcfcd25e 100644
--- a/xorg-server/hw/dmx/input/Makefile.in
+++ b/xorg-server/hw/dmx/input/Makefile.in
@@ -158,6 +158,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -188,6 +189,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -198,6 +206,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -247,6 +256,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -271,6 +282,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -361,7 +374,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@