Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 262 insertions, 251 deletions

diff --git a/xorg-server/hw/dmx/dmxpixmap.c b/xorg-server/hw/dmx/dmxpixmap.c
index 119dd1134..17aca9224 100644
--- a/xorg-server/hw/dmx/dmxpixmap.c
+++ b/xorg-server/hw/dmx/dmxpixmap.c
@@ -1,251 +1,262 @@
-/*

- * 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:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * Provides pixmap support. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxpixmap.h"

-

-#include "pixmapstr.h"

-#include "servermd.h"

-#include "privates.h"

-

-/** Initialize a private area in \a pScreen for pixmap information. */

-Bool dmxInitPixmap(ScreenPtr pScreen)

-{

-    if (!dixRegisterPrivateKey(&dmxPixPrivateKeyRec, PRIVATE_PIXMAP, sizeof(dmxPixPrivRec)))

-	return FALSE;

-

-    return TRUE;

-}

-

-/** Create a pixmap on the back-end server. */

-void dmxBECreatePixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv  = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-    /* Make sure we haven't already created this pixmap.  This can

-     * happen when the pixmap is used elsewhere (e.g., as a background

-     * or border for a window) and the refcnt > 1.

-     */

-    if (pPixPriv->pixmap)

-	return;

-

-    if (pPixmap->drawable.width && pPixmap->drawable.height) {

-	pPixPriv->pixmap = XCreatePixmap(dmxScreen->beDisplay,

-					 dmxScreen->scrnWin,

-					 pPixmap->drawable.width,

-					 pPixmap->drawable.height,

-					 pPixmap->drawable.depth);

-	dmxSync(dmxScreen, FALSE);

-    }

-}

-

-/** Create a pixmap for \a pScreen with the specified \a width, \a

- *  height, and \a depth. */

-PixmapPtr dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,

-			  unsigned usage_hint)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    PixmapPtr      pPixmap;

-    int            bpp;

-    dmxPixPrivPtr  pPixPriv;

-

-#if 0

-    DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);

-    if (pScreen->CreatePixmap)

-	ret = pScreen->CreatePixmap(pPixmap);

-#endif

-

-    /* Create pixmap on back-end server */

-    if (depth == 24) bpp = 32;

-    else             bpp = depth;

-

-    pPixmap = AllocatePixmap(pScreen, 0);

-    if (!pPixmap)

-	return NullPixmap;

-

-    pPixmap->drawable.type = DRAWABLE_PIXMAP;

-    pPixmap->drawable.class = 0;

-    pPixmap->drawable.pScreen = pScreen;

-    pPixmap->drawable.depth = depth;

-    pPixmap->drawable.bitsPerPixel = bpp;

-    pPixmap->drawable.id = 0;

-    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-    pPixmap->drawable.x = 0;

-    pPixmap->drawable.y = 0;

-    pPixmap->drawable.width = width;

-    pPixmap->drawable.height = height;

-    pPixmap->devKind = PixmapBytePad(width, bpp);

-    pPixmap->refcnt = 1;

-    pPixmap->usage_hint = usage_hint;

-

-    pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-    pPixPriv->pixmap = (Pixmap)0;

-    pPixPriv->detachedImage = NULL;

-

-    /* Create the pixmap on the back-end server */

-    if (dmxScreen->beDisplay) {

-	dmxBECreatePixmap(pPixmap);

-    }

-

-#if 0

-    DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);

-#endif

-

-    return pPixmap;

-}

-

-/** Destroy the pixmap on the back-end server. */

-Bool dmxBEFreePixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-    if (pPixPriv->pixmap) {

-	XFreePixmap(dmxScreen->beDisplay, pPixPriv->pixmap);

-	pPixPriv->pixmap = (Pixmap)0;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Destroy the pixmap pointed to by \a pPixmap. */

-Bool dmxDestroyPixmap(PixmapPtr pPixmap)

-{

-    ScreenPtr      pScreen = pPixmap->drawable.pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    Bool           ret = TRUE;

-

-#if 0

-    DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);

-#endif

-

-    if (--pPixmap->refcnt)

-	return TRUE;

-

-    /* Destroy pixmap on back-end server */

-    if (dmxScreen->beDisplay) {

-	if (dmxBEFreePixmap(pPixmap)) {

-	    /* Also make sure that we destroy any detached image */

-	    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-	    if (pPixPriv->detachedImage)

-		XDestroyImage(pPixPriv->detachedImage);

-	    dmxSync(dmxScreen, FALSE);

-	}

-    }

-    FreePixmap(pPixmap);

-

-#if 0

-    if (pScreen->DestroyPixmap)

-	ret = pScreen->DestroyPixmap(pPixmap);

-    DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);

-#endif

-

-    return ret;

-}

-

-/** Create and return a region based on the pixmap pointed to by \a

- *  pPixmap. */

-RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pPixmap->drawable.pScreen->myNum];

-    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-    XImage        *ximage;

-    RegionPtr      pReg, pTmpReg;

-    int            x, y;

-    unsigned long  previousPixel, currentPixel;

-    BoxRec         Box;

-    Bool           overlap;

-  

-    if (!dmxScreen->beDisplay) {

-	pReg = RegionCreate(NullBox, 1);

-	return pReg;

-    }

-

-    ximage = XGetImage(dmxScreen->beDisplay, pPixPriv->pixmap, 0, 0,

-		       pPixmap->drawable.width, pPixmap->drawable.height,

-		       1, XYPixmap);

-

-    pReg = RegionCreate(NullBox, 1);

-    pTmpReg = RegionCreate(NullBox, 1);

-    if(!pReg || !pTmpReg) {

-	XDestroyImage(ximage);

-	return NullRegion;

-    }

-

-    for (y = 0; y < pPixmap->drawable.height; y++) {

-	Box.y1 = y;

-	Box.y2 = y + 1;

-	previousPixel = 0L;

-	for (x = 0; x < pPixmap->drawable.width; x++) {

-	    currentPixel = XGetPixel(ximage, x, y);

-	    if (previousPixel != currentPixel) {

-		if (previousPixel == 0L) { 

-		    /* left edge */

-		    Box.x1 = x;

-		} else if (currentPixel == 0L) {

-		    /* right edge */

-		    Box.x2 = x;

-		    RegionReset(pTmpReg, &Box);

-		    RegionAppend(pReg, pTmpReg);

-		}

-		previousPixel = currentPixel;

-	    }

-	}

-	if (previousPixel != 0L) {

-	    /* right edge because of the end of pixmap */

-	    Box.x2 = pPixmap->drawable.width;

-	    RegionReset(pTmpReg, &Box);

-	    RegionAppend(pReg, pTmpReg);

-	}

-    }

-  

-    RegionDestroy(pTmpReg);

-    XDestroyImage(ximage);

-

-    RegionValidate(pReg, &overlap);

-

-    dmxSync(dmxScreen, FALSE);

-    return pReg;

-}

+/*
+ * 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:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Provides pixmap support. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxpixmap.h"
+
+#include "pixmapstr.h"
+#include "servermd.h"
+#include "privates.h"
+
+/** Initialize a private area in \a pScreen for pixmap information. */
+Bool
+dmxInitPixmap(ScreenPtr pScreen)
+{
+    if (!dixRegisterPrivateKey
+        (&dmxPixPrivateKeyRec, PRIVATE_PIXMAP, sizeof(dmxPixPrivRec)))
+        return FALSE;
+
+    return TRUE;
+}
+
+/** Create a pixmap on the back-end server. */
+void
+dmxBECreatePixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+    /* Make sure we haven't already created this pixmap.  This can
+     * happen when the pixmap is used elsewhere (e.g., as a background
+     * or border for a window) and the refcnt > 1.
+     */
+    if (pPixPriv->pixmap)
+        return;
+
+    if (pPixmap->drawable.width && pPixmap->drawable.height) {
+        pPixPriv->pixmap = XCreatePixmap(dmxScreen->beDisplay,
+                                         dmxScreen->scrnWin,
+                                         pPixmap->drawable.width,
+                                         pPixmap->drawable.height,
+                                         pPixmap->drawable.depth);
+        dmxSync(dmxScreen, FALSE);
+    }
+}
+
+/** Create a pixmap for \a pScreen with the specified \a width, \a
+ *  height, and \a depth. */
+PixmapPtr
+dmxCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
+                unsigned usage_hint)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    PixmapPtr pPixmap;
+    int bpp;
+    dmxPixPrivPtr pPixPriv;
+
+#if 0
+    DMX_UNWRAP(CreatePixmap, dmxScreen, pScreen);
+    if (pScreen->CreatePixmap)
+        ret = pScreen->CreatePixmap(pPixmap);
+#endif
+
+    /* Create pixmap on back-end server */
+    if (depth == 24)
+        bpp = 32;
+    else
+        bpp = depth;
+
+    pPixmap = AllocatePixmap(pScreen, 0);
+    if (!pPixmap)
+        return NullPixmap;
+
+    pPixmap->drawable.type = DRAWABLE_PIXMAP;
+    pPixmap->drawable.class = 0;
+    pPixmap->drawable.pScreen = pScreen;
+    pPixmap->drawable.depth = depth;
+    pPixmap->drawable.bitsPerPixel = bpp;
+    pPixmap->drawable.id = 0;
+    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pPixmap->drawable.x = 0;
+    pPixmap->drawable.y = 0;
+    pPixmap->drawable.width = width;
+    pPixmap->drawable.height = height;
+    pPixmap->devKind = PixmapBytePad(width, bpp);
+    pPixmap->refcnt = 1;
+    pPixmap->usage_hint = usage_hint;
+
+    pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+    pPixPriv->pixmap = (Pixmap) 0;
+    pPixPriv->detachedImage = NULL;
+
+    /* Create the pixmap on the back-end server */
+    if (dmxScreen->beDisplay) {
+        dmxBECreatePixmap(pPixmap);
+    }
+
+#if 0
+    DMX_WRAP(CreatePixmap, dmxCreatePixmap, dmxScreen, pScreen);
+#endif
+
+    return pPixmap;
+}
+
+/** Destroy the pixmap on the back-end server. */
+Bool
+dmxBEFreePixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+    if (pPixPriv->pixmap) {
+        XFreePixmap(dmxScreen->beDisplay, pPixPriv->pixmap);
+        pPixPriv->pixmap = (Pixmap) 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy the pixmap pointed to by \a pPixmap. */
+Bool
+dmxDestroyPixmap(PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    Bool ret = TRUE;
+
+#if 0
+    DMX_UNWRAP(DestroyPixmap, dmxScreen, pScreen);
+#endif
+
+    if (--pPixmap->refcnt)
+        return TRUE;
+
+    /* Destroy pixmap on back-end server */
+    if (dmxScreen->beDisplay) {
+        if (dmxBEFreePixmap(pPixmap)) {
+            /* Also make sure that we destroy any detached image */
+            dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+            if (pPixPriv->detachedImage)
+                XDestroyImage(pPixPriv->detachedImage);
+            dmxSync(dmxScreen, FALSE);
+        }
+    }
+    FreePixmap(pPixmap);
+
+#if 0
+    if (pScreen->DestroyPixmap)
+        ret = pScreen->DestroyPixmap(pPixmap);
+    DMX_WRAP(DestroyPixmap, dmxDestroyPixmap, dmxScreen, pScreen);
+#endif
+
+    return ret;
+}
+
+/** Create and return a region based on the pixmap pointed to by \a
+ *  pPixmap. */
+RegionPtr
+dmxBitmapToRegion(PixmapPtr pPixmap)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pPixmap->drawable.pScreen->myNum];
+    dmxPixPrivPtr pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+    XImage *ximage;
+    RegionPtr pReg, pTmpReg;
+    int x, y;
+    unsigned long previousPixel, currentPixel;
+    BoxRec Box;
+    Bool overlap;
+
+    if (!dmxScreen->beDisplay) {
+        pReg = RegionCreate(NullBox, 1);
+        return pReg;
+    }
+
+    ximage = XGetImage(dmxScreen->beDisplay, pPixPriv->pixmap, 0, 0,
+                       pPixmap->drawable.width, pPixmap->drawable.height,
+                       1, XYPixmap);
+
+    pReg = RegionCreate(NullBox, 1);
+    pTmpReg = RegionCreate(NullBox, 1);
+    if (!pReg || !pTmpReg) {
+        XDestroyImage(ximage);
+        return NullRegion;
+    }
+
+    for (y = 0; y < pPixmap->drawable.height; y++) {
+        Box.y1 = y;
+        Box.y2 = y + 1;
+        previousPixel = 0L;
+        for (x = 0; x < pPixmap->drawable.width; x++) {
+            currentPixel = XGetPixel(ximage, x, y);
+            if (previousPixel != currentPixel) {
+                if (previousPixel == 0L) {
+                    /* left edge */
+                    Box.x1 = x;
+                }
+                else if (currentPixel == 0L) {
+                    /* right edge */
+                    Box.x2 = x;
+                    RegionReset(pTmpReg, &Box);
+                    RegionAppend(pReg, pTmpReg);
+                }
+                previousPixel = currentPixel;
+            }
+        }
+        if (previousPixel != 0L) {
+            /* right edge because of the end of pixmap */
+            Box.x2 = pPixmap->drawable.width;
+            RegionReset(pTmpReg, &Box);
+            RegionAppend(pReg, pTmpReg);
+        }
+    }
+
+    RegionDestroy(pTmpReg);
+    XDestroyImage(ximage);
+
+    RegionValidate(pReg, &overlap);
+
+    dmxSync(dmxScreen, FALSE);
+    return pReg;
+}