Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 223 insertions, 0 deletions

diff --git a/xorg-server/hw/dmx/dmxcb.c b/xorg-server/hw/dmx/dmxcb.c
new file mode 100644
index 000000000..2ecfe22a3
--- /dev/null
+++ b/xorg-server/hw/dmx/dmxcb.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation on the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This code queries and modifies the connection block. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxcb.h"
+#include "dmxinput.h"
+#include "dmxlog.h"
+
+extern char    *ConnectionInfo;
+extern int     connBlockScreenStart;
+
+#ifdef PANORAMIX
+extern int     PanoramiXPixWidth;
+extern int     PanoramiXPixHeight;
+extern int     PanoramiXNumScreens;
+#endif
+
+       int     dmxGlobalWidth, dmxGlobalHeight;
+
+/** We may want the wall dimensions to be different from the bounding
+ * box dimensions that Xinerama computes, so save those and update them
+ * here.
+ */
+void dmxSetWidthHeight(int width, int height)
+{
+    dmxGlobalWidth  = width;
+    dmxGlobalHeight = height;
+}
+
+/** Computes the global bounding box for DMX.  This may be larger than
+ * the one computed by Xinerama because of the DMX configuration
+ * file. */
+void dmxComputeWidthHeight(DMXRecomputeFlag flag)
+{
+    int           i;
+    DMXScreenInfo *dmxScreen;
+    int           w = 0;
+    int           h = 0;
+    
+    for (i = 0; i < dmxNumScreens; i++) {
+                                /* Don't use root* here because this is
+                                 * the global bounding box. */
+        dmxScreen = &dmxScreens[i];
+        if (w < dmxScreen->scrnWidth + dmxScreen->rootXOrigin)
+            w = dmxScreen->scrnWidth + dmxScreen->rootXOrigin;
+        if (h < dmxScreen->scrnHeight + dmxScreen->rootYOrigin)
+            h = dmxScreen->scrnHeight + dmxScreen->rootYOrigin;
+    }
+    if (!dmxGlobalWidth && !dmxGlobalHeight) {
+        dmxLog(dmxInfo, "Using %dx%d as global bounding box\n", w, h);
+    } else {
+        switch (flag) {
+        case DMX_NO_RECOMPUTE_BOUNDING_BOX:
+            dmxLog(dmxInfo,
+                   "Using old bounding box (%dx%d) instead of new (%dx%d)\n",
+                   dmxGlobalWidth, dmxGlobalHeight, w, h);
+            w = dmxGlobalWidth;
+            h = dmxGlobalHeight;
+            break;
+        case DMX_RECOMPUTE_BOUNDING_BOX:
+            dmxLog(dmxInfo,
+                   "Using %dx%d as global bounding box, instead of %dx%d\n",
+                   w, h, dmxGlobalWidth, dmxGlobalHeight);
+            break;
+        }
+    }
+        
+    dmxGlobalWidth  = w;
+    dmxGlobalHeight = h;
+}
+
+/** 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. */
+void dmxConnectionBlockCallback(void)
+{
+    xWindowRoot *root   = (xWindowRoot *)(ConnectionInfo+connBlockScreenStart);
+    int         offset  = connBlockScreenStart + sizeof(xWindowRoot);
+    int         i;
+    Bool        *found  = NULL;
+
+    MAXSCREENSALLOC(found);
+    if (!found)
+        dmxLog(dmxFatal, "dmxConnectionBlockCallback: out of memory\n");
+
+    dmxLog(dmxInfo, "===== Start of Summary =====\n");
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension) {
+        if (dmxGlobalWidth && dmxGlobalHeight
+            && (dmxGlobalWidth != PanoramiXPixWidth
+                || dmxGlobalHeight != PanoramiXPixHeight)) {
+            dmxLog(dmxInfo,
+                   "Changing Xinerama dimensions from %d %d to %d %d\n",
+                   PanoramiXPixWidth, PanoramiXPixHeight,
+                   dmxGlobalWidth, dmxGlobalHeight);
+            PanoramiXPixWidth  = root->pixWidth  = dmxGlobalWidth;
+            PanoramiXPixHeight = root->pixHeight = dmxGlobalHeight;
+        } else {
+            dmxGlobalWidth  = PanoramiXPixWidth;
+            dmxGlobalHeight = PanoramiXPixHeight;
+        }
+        dmxLog(dmxInfo, "%d screens configured with Xinerama (%d %d)\n",
+               PanoramiXNumScreens, PanoramiXPixWidth, PanoramiXPixHeight);
+	for (i = 0; i < PanoramiXNumScreens; i++) found[i] = FALSE;
+    } else {
+#endif
+                                /* This never happens because we're
+                                 * either called from a Xinerama
+                                 * callback or during reconfiguration
+                                 * (which only works with Xinerama on).
+                                 * In any case, be reasonable. */
+        dmxLog(dmxInfo, "%d screens configured (%d %d)\n",
+               screenInfo.numScreens, root->pixWidth, root->pixHeight);
+#ifdef PANORAMIX
+    }
+#endif
+
+    for (i = 0; i < root->nDepths; i++) {
+        xDepth      *depth  = (xDepth *)(ConnectionInfo + offset);
+        int         voffset = offset + sizeof(xDepth);
+        xVisualType *visual = (xVisualType *)(ConnectionInfo + voffset);
+        int         j;
+        
+        dmxLog(dmxInfo, "%d visuals at depth %d:\n",
+               depth->nVisuals, depth->depth);
+        for (j = 0; j < depth->nVisuals; j++, visual++) {
+            XVisualInfo vi;
+            
+            vi.visual        = NULL;
+            vi.visualid      = visual->visualID;
+            vi.screen        = 0;
+            vi.depth         = depth->depth;
+            vi.class         = visual->class;
+            vi.red_mask      = visual->redMask;
+            vi.green_mask    = visual->greenMask;
+            vi.blue_mask     = visual->blueMask;
+            vi.colormap_size = visual->colormapEntries;
+            vi.bits_per_rgb  = visual->bitsPerRGB;
+            dmxLogVisual(NULL, &vi, 0);
+
+#ifdef PANORAMIX
+	    if (!noPanoramiXExtension) {
+		int  k;
+		for (k = 0; k < PanoramiXNumScreens; k++) {
+		    DMXScreenInfo *dmxScreen = &dmxScreens[k];
+
+		    if (dmxScreen->beDisplay) {
+			XVisualInfo *pvi =
+			    &dmxScreen->beVisuals[dmxScreen->beDefVisualIndex];
+			if (pvi->depth == depth->depth &&
+			    pvi->class == visual->class)
+			    found[k] = TRUE;
+		    } else {
+			/* Screen #k is detatched, so it always succeeds */
+			found[k] = TRUE;
+		    }
+		}
+	    }
+#endif
+        }
+        offset = voffset + depth->nVisuals * sizeof(xVisualType);
+    }
+
+    dmxInputLogDevices();
+    dmxLog(dmxInfo, "===== End of Summary =====\n");
+
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension) {
+	Bool fatal = FALSE;
+	for (i = 0; i < PanoramiXNumScreens; i++) {
+	    fatal |= !found[i];
+	    if (!found[i]) {
+		dmxLog(dmxError,
+		       "The default visual for screen #%d does not match "
+		       "any of the\n", i);
+		dmxLog(dmxError,
+		       "consolidated visuals from Xinerama (listed above)\n");
+	    }
+	}
+	if (fatal)
+            dmxLog(dmxFatal,
+                   "dmxConnectionBlockCallback: invalid screen(s) found");
+    }
+#endif
+    MAXSCREENSFREE(found);
+}