Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	xorg-server/composite/compalloc.c
	xorg-server/configure.ac
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Makefile.am
	xorg-server/hw/xquartz/xpr/xprFrame.c
	xorg-server/include/windowstr.h

7 files changed, 946 insertions, 931 deletions

diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index a4414f70e..e64d1061b 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -434,6 +434,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 	 * critical output

 	 */

 	DamageExtSetCritical (pClient, TRUE);

+	pWin->inhibitBGPaint = TRUE;

     }

     return Success;

 }

@@ -466,6 +467,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
 		 */

 		DamageExtSetCritical (pClient, FALSE);

 		csw->update = CompositeRedirectAutomatic;

+		pWin->inhibitBGPaint = FALSE;

 		if (pWin->mapped)

 		    (*pWin->drawable.pScreen->ClearToBackground)(pWin, 0, 0, 0, 0, TRUE);

 	    }

@@ -557,7 +559,7 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
 }

 

 static PixmapPtr

-compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)

+compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)

 {

     ScreenPtr	    pScreen = pWin->drawable.pScreen;

     WindowPtr	    pParent = pWin->parent;

@@ -572,10 +574,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
     pPixmap->screen_x = x;

     pPixmap->screen_y = y;

 

-    /* resize allocations will update later in compCopyWindow, not here */

-    if (!map)

-	return pPixmap;

-

     if (pParent->drawable.depth == pWin->drawable.depth)

     {

 	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);

@@ -641,7 +639,7 @@ compAllocPixmap (WindowPtr pWin)
     int		    y = pWin->drawable.y - bw;

     int		    w = pWin->drawable.width + (bw << 1);

     int		    h = pWin->drawable.height + (bw << 1);

-    PixmapPtr	    pPixmap = compNewPixmap (pWin, x, y, w, h, TRUE);

+    PixmapPtr	    pPixmap = compNewPixmap (pWin, x, y, w, h);

     CompWindowPtr   cw = GetCompWindow (pWin);

 

     if (!pPixmap)

@@ -713,7 +711,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
     pix_h = h + (bw << 1);

     if (pix_w != pOld->drawable.width || pix_h != pOld->drawable.height)

     {

-	pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h, FALSE);

+	pNew = compNewPixmap (pWin, pix_x, pix_y, pix_w, pix_h);

 	if (!pNew)

 	    return FALSE;

 	cw->pOldPixmap = pOld;

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index b91971498..841224885 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.10.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2011-06-01"

+AC_INIT([xorg-server], 1.10.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="2011-08-03"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 38c17665b..1dec6c03a 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1014,7 +1014,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 

     if (app_prefs_domain_cfstr == NULL) {

         ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");

-        app_prefs_domain_cfstr = @BUNDLE_ID_PREFIX".X11";

+        app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX".X11");

     }

 

     [NSApp read_defaults];

diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am
index a455b147d..2f86cdc95 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.am
+++ b/xorg-server/hw/xquartz/bundle/Makefile.am
@@ -40,6 +40,9 @@ EXTRA_DIST = \
 	Resources/Dutch.lproj/InfoPlist.strings \

 	Resources/Dutch.lproj/Localizable.strings \

 	Resources/Dutch.lproj/main.nib/keyedobjects.nib \

+	Resources/el.lproj/InfoPlist.strings \

+	Resources/el.lproj/Localizable.strings \

+	Resources/el.lproj/main.nib/keyedobjects.nib \

 	Resources/English.lproj/InfoPlist.strings \

 	Resources/English.lproj/Localizable.strings \

 	Resources/English.lproj/main.nib/designable.nib \

@@ -53,6 +56,9 @@ EXTRA_DIST = \
 	Resources/German.lproj/InfoPlist.strings \

 	Resources/German.lproj/Localizable.strings \

 	Resources/German.lproj/main.nib/keyedobjects.nib \

+	Resources/he.lproj/InfoPlist.strings \

+	Resources/he.lproj/Localizable.strings \

+	Resources/he.lproj/main.nib/keyedobjects.nib \

 	Resources/Italian.lproj/InfoPlist.strings \

 	Resources/Italian.lproj/Localizable.strings \

 	Resources/Italian.lproj/main.nib/keyedobjects.nib \

@@ -77,6 +83,9 @@ EXTRA_DIST = \
 	Resources/ru.lproj/InfoPlist.strings \

 	Resources/ru.lproj/Localizable.strings \

 	Resources/ru.lproj/main.nib/keyedobjects.nib \

+	Resources/sk.lproj/InfoPlist.strings \

+	Resources/sk.lproj/Localizable.strings \

+	Resources/sk.lproj/main.nib/keyedobjects.nib \

 	Resources/Spanish.lproj/InfoPlist.strings \

 	Resources/Spanish.lproj/Localizable.strings \

 	Resources/Spanish.lproj/main.nib/keyedobjects.nib \

diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 1d90d8a3d..4214eff33 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -223,7 +223,7 @@ xprDestroyFrame(RootlessFrameID wid)
 

     err = xp_destroy_window(x_cvt_vptr_to_uint(wid));

     if (err != Success)

-        FatalError("Could not destroy window %i.", (int)x_cvt_vptr_to_uint(wid));

+        FatalError("Could not destroy window %d (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 }

 

 

@@ -364,7 +364,7 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 

     err = xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes, NULL);

     if (err != Success)

-        FatalError("Could not lock window %i for drawing.", (int)x_cvt_vptr_to_uint(wid));

+        FatalError("Could not lock window %d for drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 

     *pixelData = data[0];

     *bytesPerRow = rowbytes[0];

@@ -380,8 +380,11 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
     xp_error err;

 

     err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);

+    /* This should be a FatalError, but we started tripping over it.  Make it a

+     * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.

+     */

     if(err != Success)

-        FatalError("Could not unlock window %i after drawing.", (int)x_cvt_vptr_to_uint(wid));

+        ErrorF("Could not unlock window %d after drawing (%d).", (int)x_cvt_vptr_to_uint(wid), (int)err);

 }

 

 

diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index 19d8b597e..04553f831 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -1,221 +1,222 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

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

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

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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

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

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

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

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL 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 WINDOWSTRUCT_H

-#define WINDOWSTRUCT_H

-

-#include "window.h"

-#include "pixmapstr.h"

-#include "regionstr.h"

-#include "cursor.h"

-#include "property.h"

-#include "resource.h"	/* for ROOT_WINDOW_ID_BASE */

-#include "dix.h"

-#include "privates.h"

-#include "miscstruct.h"

-#include <X11/Xprotostr.h>

-#include "opaque.h"

-

-#define GuaranteeNothing	0

-#define GuaranteeVisBack	1

-

-#define SameBackground(as, a, bs, b)				\

-    ((as) == (bs) && ((as) == None ||				\

-		      (as) == ParentRelative ||			\

- 		      SamePixUnion(a,b,as == BackgroundPixel)))

-

-#define SameBorder(as, a, bs, b)				\

-    EqualPixUnion(as, a, bs, b)

-

-/* used as NULL-terminated list */

-typedef struct _DevCursorNode {

-    CursorPtr                   cursor;

-    DeviceIntPtr                dev;

-    struct _DevCursorNode*      next;

-} DevCursNodeRec, *DevCursNodePtr, *DevCursorList;

-

-typedef struct _WindowOpt {

-    CursorPtr		cursor;		   /* default: window.cursorNone */

-    VisualID		visual;		   /* default: same as parent */

-    Colormap		colormap;	   /* default: same as parent */

-    Mask		dontPropagateMask; /* default: window.dontPropagate */

-    Mask		otherEventMasks;   /* default: 0 */

-    struct _OtherClients *otherClients;	   /* default: NULL */

-    struct _GrabRec	*passiveGrabs;	   /* default: NULL */

-    PropertyPtr		userProps;	   /* default: NULL */

-    unsigned long	backingBitPlanes;  /* default: ~0L */

-    unsigned long	backingPixel;	   /* default: 0 */

-    RegionPtr		boundingShape;	   /* default: NULL */

-    RegionPtr		clipShape;	   /* default: NULL */

-    RegionPtr		inputShape;	   /* default: NULL */

-    struct _OtherInputMasks *inputMasks;   /* default: NULL */

-    DevCursorList       deviceCursors;     /* default: NULL */

-} WindowOptRec, *WindowOptPtr;

-

-#define BackgroundPixel	    2L

-#define BackgroundPixmap    3L

-

-/*

- * The redirectDraw field can have one of three values:

- *

- *  RedirectDrawNone

- *	A normal window; painted into the same pixmap as the parent

- *	and clipping parent and siblings to its geometry. These

- *	windows get a clip list equal to the intersection of their

- *	geometry with the parent geometry, minus the geometry

- *	of overlapping None and Clipped siblings.

- *  RedirectDrawAutomatic

- *	A redirected window which clips parent and sibling drawing.

- *	Contents for these windows are manage inside the server.

- *	These windows get an internal clip list equal to their

- *	geometry.

- *  RedirectDrawManual

- *	A redirected window which does not clip parent and sibling

- *	drawing; the window must be represented within the parent

- *	geometry by the client performing the redirection management.

- *	Contents for these windows are managed outside the server.

- *	These windows get an internal clip list equal to their

- *	geometry.

- */

-

-#define RedirectDrawNone	0

-#define RedirectDrawAutomatic	1

-#define RedirectDrawManual	2

-

-typedef struct _Window {

-    DrawableRec		drawable;

-    PrivateRec		*devPrivates;

-    WindowPtr		parent;		/* ancestor chain */

-    WindowPtr		nextSib;	/* next lower sibling */

-    WindowPtr		prevSib;	/* next higher sibling */

-    WindowPtr		firstChild;	/* top-most child */

-    WindowPtr		lastChild;	/* bottom-most child */

-    RegionRec		clipList;	/* clipping rectangle for output */

-    RegionRec		borderClip;	/* NotClippedByChildren + border */

-    union _Validate	*valdata;

-    RegionRec		winSize;

-    RegionRec		borderSize;

-    DDXPointRec		origin;		/* position relative to parent */

-    unsigned short	borderWidth;

-    unsigned long	deliverableEvents; /* all masks from all clients */

-    Mask		eventMask;      /* mask from the creating client */

-    PixUnion		background;

-    PixUnion		border;

-    pointer		backStorage;	/* null when BS disabled */

-    WindowOptPtr	optional;

-    unsigned		backgroundState:2; /* None, Relative, Pixel, Pixmap */

-    unsigned		borderIsPixel:1;

-    unsigned		cursorIsNone:1;	/* else real cursor (might inherit) */

-    unsigned		backingStore:2;

-    unsigned		saveUnder:1;

-    unsigned		DIXsaveUnder:1;

-    unsigned		bitGravity:4;

-    unsigned		winGravity:4;

-    unsigned		overrideRedirect:1;

-    unsigned		visibility:2;

-    unsigned		mapped:1;

-    unsigned		realized:1;	/* ancestors are all mapped */

-    unsigned		viewable:1;	/* realized && InputOutput */

-    unsigned		dontPropagate:3;/* index into DontPropagateMasks */

-    unsigned		forcedBS:1;	/* system-supplied backingStore */

-    unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */

-    unsigned		forcedBG:1;	/* must have an opaque background */

-#ifdef ROOTLESS

-    unsigned		rootlessUnhittable:1;	/* doesn't hit-test */

-#endif

-#ifdef COMPOSITE

-    unsigned		damagedDescendants:1;	/* some descendants are damaged */

-#endif

-} WindowRec;

-

-/*

- * Ok, a bunch of macros for accessing the optional record

- * fields (or filling the appropriate default value)

- */

-

-extern _X_EXPORT Mask	DontPropagateMasks[];

-

-#define wTrackParent(w,field)	((w)->optional ? \

-				    (w)->optional->field \

- 				 : FindWindowWithOptional(w)->optional->field)

-#define wUseDefault(w,field,def)	((w)->optional ? \

-				    (w)->optional->field \

-				 : def)

-

-#define wVisual(w)		wTrackParent(w, visual)

-#define wCursor(w)		((w)->cursorIsNone ? None : wTrackParent(w, cursor))

-#define wColormap(w)		((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))

-#define wDontPropagateMask(w)	wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])

-#define wOtherEventMasks(w)	wUseDefault(w, otherEventMasks, 0)

-#define wOtherClients(w)	wUseDefault(w, otherClients, NULL)

-#define wOtherInputMasks(w)	wUseDefault(w, inputMasks, NULL)

-#define wPassiveGrabs(w)	wUseDefault(w, passiveGrabs, NULL)

-#define wUserProps(w)		wUseDefault(w, userProps, NULL)

-#define wBackingBitPlanes(w)	wUseDefault(w, backingBitPlanes, ~0L)

-#define wBackingPixel(w)	wUseDefault(w, backingPixel, 0)

-#define wBoundingShape(w)	wUseDefault(w, boundingShape, NULL)

-#define wClipShape(w)		wUseDefault(w, clipShape, NULL)

-#define wInputShape(w)          wUseDefault(w, inputShape, NULL)

-#define wClient(w)		(clients[CLIENT_ID((w)->drawable.id)])

-#define wBorderWidth(w)		((int) (w)->borderWidth)

-

-/* true when w needs a border drawn. */

-

-#define HasBorder(w)	((w)->borderWidth || wClipShape(w))

-

-typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;

-

-#define SCREEN_IS_BLANKED   0

-#define SCREEN_ISNT_SAVED   1

-#define SCREEN_IS_TILED     2

-#define SCREEN_IS_BLACK	    3

-

-#define HasSaverWindow(pScreen)   (pScreen->screensaver.pWindow != NullWindow)

-

-extern _X_EXPORT int screenIsSaved;

-

-#endif /* WINDOWSTRUCT_H */

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL 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 WINDOWSTRUCT_H
+#define WINDOWSTRUCT_H
+
+#include "window.h"
+#include "pixmapstr.h"
+#include "regionstr.h"
+#include "cursor.h"
+#include "property.h"
+#include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
+#include "dix.h"
+#include "privates.h"
+#include "miscstruct.h"
+#include <X11/Xprotostr.h>
+#include "opaque.h"
+
+#define GuaranteeNothing	0
+#define GuaranteeVisBack	1
+
+#define SameBackground(as, a, bs, b)				\
+    ((as) == (bs) && ((as) == None ||				\
+		      (as) == ParentRelative ||			\
+ 		      SamePixUnion(a,b,as == BackgroundPixel)))
+
+#define SameBorder(as, a, bs, b)				\
+    EqualPixUnion(as, a, bs, b)
+
+/* used as NULL-terminated list */
+typedef struct _DevCursorNode {
+    CursorPtr                   cursor;
+    DeviceIntPtr                dev;
+    struct _DevCursorNode*      next;
+} DevCursNodeRec, *DevCursNodePtr, *DevCursorList;
+
+typedef struct _WindowOpt {
+    CursorPtr		cursor;		   /* default: window.cursorNone */
+    VisualID		visual;		   /* default: same as parent */
+    Colormap		colormap;	   /* default: same as parent */
+    Mask		dontPropagateMask; /* default: window.dontPropagate */
+    Mask		otherEventMasks;   /* default: 0 */
+    struct _OtherClients *otherClients;	   /* default: NULL */
+    struct _GrabRec	*passiveGrabs;	   /* default: NULL */
+    PropertyPtr		userProps;	   /* default: NULL */
+    unsigned long	backingBitPlanes;  /* default: ~0L */
+    unsigned long	backingPixel;	   /* default: 0 */
+    RegionPtr		boundingShape;	   /* default: NULL */
+    RegionPtr		clipShape;	   /* default: NULL */
+    RegionPtr		inputShape;	   /* default: NULL */
+    struct _OtherInputMasks *inputMasks;   /* default: NULL */
+    DevCursorList       deviceCursors;     /* default: NULL */
+} WindowOptRec, *WindowOptPtr;
+
+#define BackgroundPixel	    2L
+#define BackgroundPixmap    3L
+
+/*
+ * The redirectDraw field can have one of three values:
+ *
+ *  RedirectDrawNone
+ *	A normal window; painted into the same pixmap as the parent
+ *	and clipping parent and siblings to its geometry. These
+ *	windows get a clip list equal to the intersection of their
+ *	geometry with the parent geometry, minus the geometry
+ *	of overlapping None and Clipped siblings.
+ *  RedirectDrawAutomatic
+ *	A redirected window which clips parent and sibling drawing.
+ *	Contents for these windows are manage inside the server.
+ *	These windows get an internal clip list equal to their
+ *	geometry.
+ *  RedirectDrawManual
+ *	A redirected window which does not clip parent and sibling
+ *	drawing; the window must be represented within the parent
+ *	geometry by the client performing the redirection management.
+ *	Contents for these windows are managed outside the server.
+ *	These windows get an internal clip list equal to their
+ *	geometry.
+ */
+
+#define RedirectDrawNone	0
+#define RedirectDrawAutomatic	1
+#define RedirectDrawManual	2
+
+typedef struct _Window {
+    DrawableRec		drawable;
+    PrivateRec		*devPrivates;
+    WindowPtr		parent;		/* ancestor chain */
+    WindowPtr		nextSib;	/* next lower sibling */
+    WindowPtr		prevSib;	/* next higher sibling */
+    WindowPtr		firstChild;	/* top-most child */
+    WindowPtr		lastChild;	/* bottom-most child */
+    RegionRec		clipList;	/* clipping rectangle for output */
+    RegionRec		borderClip;	/* NotClippedByChildren + border */
+    union _Validate	*valdata;
+    RegionRec		winSize;
+    RegionRec		borderSize;
+    DDXPointRec		origin;		/* position relative to parent */
+    unsigned short	borderWidth;
+    unsigned long	deliverableEvents; /* all masks from all clients */
+    Mask		eventMask;      /* mask from the creating client */
+    PixUnion		background;
+    PixUnion		border;
+    pointer		backStorage;	/* null when BS disabled */
+    WindowOptPtr	optional;
+    unsigned		backgroundState:2; /* None, Relative, Pixel, Pixmap */
+    unsigned		borderIsPixel:1;
+    unsigned		cursorIsNone:1;	/* else real cursor (might inherit) */
+    unsigned		backingStore:2;
+    unsigned		saveUnder:1;
+    unsigned		DIXsaveUnder:1;
+    unsigned		bitGravity:4;
+    unsigned		winGravity:4;
+    unsigned		overrideRedirect:1;
+    unsigned		visibility:2;
+    unsigned		mapped:1;
+    unsigned		realized:1;	/* ancestors are all mapped */
+    unsigned		viewable:1;	/* realized && InputOutput */
+    unsigned		dontPropagate:3;/* index into DontPropagateMasks */
+    unsigned		forcedBS:1;	/* system-supplied backingStore */
+    unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */
+    unsigned		forcedBG:1;	/* must have an opaque background */
+#ifdef ROOTLESS
+    unsigned		rootlessUnhittable:1;	/* doesn't hit-test */
+#endif
+#ifdef COMPOSITE
+    unsigned		damagedDescendants:1;	/* some descendants are damaged */
+    unsigned		inhibitBGPaint:1;	/* paint the background? */
+#endif
+} WindowRec;
+
+/*
+ * Ok, a bunch of macros for accessing the optional record
+ * fields (or filling the appropriate default value)
+ */
+
+extern _X_EXPORT Mask	DontPropagateMasks[];
+
+#define wTrackParent(w,field)	((w)->optional ? \
+				    (w)->optional->field \
+ 				 : FindWindowWithOptional(w)->optional->field)
+#define wUseDefault(w,field,def)	((w)->optional ? \
+				    (w)->optional->field \
+				 : def)
+
+#define wVisual(w)		wTrackParent(w, visual)
+#define wCursor(w)		((w)->cursorIsNone ? None : wTrackParent(w, cursor))
+#define wColormap(w)		((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
+#define wDontPropagateMask(w)	wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
+#define wOtherEventMasks(w)	wUseDefault(w, otherEventMasks, 0)
+#define wOtherClients(w)	wUseDefault(w, otherClients, NULL)
+#define wOtherInputMasks(w)	wUseDefault(w, inputMasks, NULL)
+#define wPassiveGrabs(w)	wUseDefault(w, passiveGrabs, NULL)
+#define wUserProps(w)		wUseDefault(w, userProps, NULL)
+#define wBackingBitPlanes(w)	wUseDefault(w, backingBitPlanes, ~0L)
+#define wBackingPixel(w)	wUseDefault(w, backingPixel, 0)
+#define wBoundingShape(w)	wUseDefault(w, boundingShape, NULL)
+#define wClipShape(w)		wUseDefault(w, clipShape, NULL)
+#define wInputShape(w)          wUseDefault(w, inputShape, NULL)
+#define wClient(w)		(clients[CLIENT_ID((w)->drawable.id)])
+#define wBorderWidth(w)		((int) (w)->borderWidth)
+
+/* true when w needs a border drawn. */
+
+#define HasBorder(w)	((w)->borderWidth || wClipShape(w))
+
+typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;
+
+#define SCREEN_IS_BLANKED   0
+#define SCREEN_ISNT_SAVED   1
+#define SCREEN_IS_TILED     2
+#define SCREEN_IS_BLACK	    3
+
+#define HasSaverWindow(pScreen)   (pScreen->screensaver.pWindow != NullWindow)
+
+extern _X_EXPORT int screenIsSaved;
+
+#endif /* WINDOWSTRUCT_H */
diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c
index 89f45016d..0f1ebe59c 100644
--- a/xorg-server/mi/miexpose.c
+++ b/xorg-server/mi/miexpose.c
@@ -1,697 +1,701 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

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

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

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

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

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

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

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

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL 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) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

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

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

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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,

-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of Digital Equipment Corporation

-shall not be used in advertising or otherwise to promote the sale, use or other

-dealings in this Software without prior written authorization from Digital

-Equipment Corporation.

-

-******************************************************************/

-

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <X11/Xprotostr.h>

-

-#include "misc.h"

-#include "regionstr.h"

-#include "scrnintstr.h"

-#include "gcstruct.h"

-#include "windowstr.h"

-#include "pixmap.h"

-#include "input.h"

-

-#include "dixstruct.h"

-#include "mi.h"

-#include <X11/Xmd.h>

-

-#include "globals.h"

-

-#ifdef PANORAMIX

-#include "panoramiX.h"

-#include "panoramiXsrv.h"

-#endif

-

-/*

-    machine-independent graphics exposure code.  any device that uses

-the region package can call this.

-*/

-

-#ifndef RECTLIMIT

-#define RECTLIMIT 25		/* pick a number, any number > 8 */

-#endif

-

-/* miHandleExposures 

-    generate a region for exposures for areas that were copied from obscured or

-non-existent areas to non-obscured areas of the destination.  Paint the

-background for the region, if the destination is a window.

-

-NOTE:

-     this should generally be called, even if graphicsExposures is false,

-because this is where bits get recovered from backing store.

-

-NOTE:

-     added argument 'plane' is used to indicate how exposures from backing

-store should be accomplished. If plane is 0 (i.e. no bit plane), CopyArea

-should be used, else a CopyPlane of the indicated plane will be used. The

-exposing is done by the backing store's GraphicsExpose function, of course.

-

-*/

-

-RegionPtr

-miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,

-		  GCPtr pGC, int srcx, int srcy, int width, int height,

-		  int dstx, int dsty, unsigned long plane)

-{

-    RegionPtr prgnSrcClip;	/* drawable-relative source clip */

-    RegionRec rgnSrcRec;

-    RegionPtr prgnDstClip;	/* drawable-relative dest clip */

-    RegionRec rgnDstRec;

-    BoxRec srcBox;		/* unclipped source */

-    RegionRec rgnExposed;	/* exposed region, calculated source-

-				   relative, made dst relative to

-				   intersect with visible parts of

-				   dest and send events to client, 

-				   and then screen relative to paint 

-				   the window background

-				*/

-    WindowPtr pSrcWin;

-    BoxRec expBox;

-    Bool extents;

-

-    /* avoid work if we can */

-    if (!pGC->graphicsExposures &&

-	(pDstDrawable->type == DRAWABLE_PIXMAP) &&

-	((pSrcDrawable->type == DRAWABLE_PIXMAP) ||

-	 (((WindowPtr)pSrcDrawable)->backStorage == NULL)))

-	return NULL;

-	

-    srcBox.x1 = srcx;

-    srcBox.y1 = srcy;

-    srcBox.x2 = srcx+width;

-    srcBox.y2 = srcy+height;

-

-    if (pSrcDrawable->type != DRAWABLE_PIXMAP)

-    {

-	BoxRec TsrcBox;

-

-	TsrcBox.x1 = srcx + pSrcDrawable->x;

-	TsrcBox.y1 = srcy + pSrcDrawable->y;

-	TsrcBox.x2 = TsrcBox.x1 + width;

-	TsrcBox.y2 = TsrcBox.y1 + height;

-	pSrcWin = (WindowPtr) pSrcDrawable;

-	if (pGC->subWindowMode == IncludeInferiors)

- 	{

-	    prgnSrcClip = NotClippedByChildren (pSrcWin);

-	    if ((RegionContainsRect(prgnSrcClip, &TsrcBox)) == rgnIN)

-	    {

-		RegionDestroy(prgnSrcClip);

-		return NULL;

-	    }

-	}

- 	else

- 	{

-	    if ((RegionContainsRect(&pSrcWin->clipList, &TsrcBox)) == rgnIN)

-		return NULL;

-	    prgnSrcClip = &rgnSrcRec;

-	    RegionNull(prgnSrcClip);

-	    RegionCopy(prgnSrcClip, &pSrcWin->clipList);

-	}

-	RegionTranslate(prgnSrcClip,

-				-pSrcDrawable->x, -pSrcDrawable->y);

-    }

-    else

-    {

-	BoxRec	box;

-

-	if ((srcBox.x1 >= 0) && (srcBox.y1 >= 0) &&

-	    (srcBox.x2 <= pSrcDrawable->width) &&

- 	    (srcBox.y2 <= pSrcDrawable->height))

-	    return NULL;

-

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pSrcDrawable->width;

-	box.y2 = pSrcDrawable->height;

-	prgnSrcClip = &rgnSrcRec;

-	RegionInit(prgnSrcClip, &box, 1);

-	pSrcWin = NULL;

-    }

-

-    if (pDstDrawable == pSrcDrawable)

-    {

-	prgnDstClip = prgnSrcClip;

-    }

-    else if (pDstDrawable->type != DRAWABLE_PIXMAP)

-    {

-	if (pGC->subWindowMode == IncludeInferiors)

-	{

-	    prgnDstClip = NotClippedByChildren((WindowPtr)pDstDrawable);

-	}

-	else

-	{

-	    prgnDstClip = &rgnDstRec;

-	    RegionNull(prgnDstClip);

-	    RegionCopy(prgnDstClip,

-				&((WindowPtr)pDstDrawable)->clipList);

-	}

-	RegionTranslate(prgnDstClip,

-				 -pDstDrawable->x, -pDstDrawable->y);

-    }

-    else

-    {

-	BoxRec	box;

-

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pDstDrawable->width;

-	box.y2 = pDstDrawable->height;

-	prgnDstClip = &rgnDstRec;

-	RegionInit(prgnDstClip, &box, 1);

-    }

-

-    /* drawable-relative source region */

-    RegionInit(&rgnExposed, &srcBox, 1);

-

-    /* now get the hidden parts of the source box*/

-    RegionSubtract(&rgnExposed, &rgnExposed, prgnSrcClip);

-

-    /* move them over the destination */

-    RegionTranslate(&rgnExposed, dstx-srcx, dsty-srcy);

-

-    /* intersect with visible areas of dest */

-    RegionIntersect(&rgnExposed, &rgnExposed, prgnDstClip);

-

-    /* intersect with client clip region. */

-    if (pGC->clientClipType == CT_REGION)

-	RegionIntersect(&rgnExposed, &rgnExposed, pGC->clientClip);

-

-    /*

-     * If we have LOTS of rectangles, we decide to take the extents

-     * and force an exposure on that.  This should require much less

-     * work overall, on both client and server.  This is cheating, but

-     * isn't prohibited by the protocol ("spontaneous combustion" :-)

-     * for windows.

-     */

-    extents = pGC->graphicsExposures &&

-	      (RegionNumRects(&rgnExposed) > RECTLIMIT) &&

-	      (pDstDrawable->type != DRAWABLE_PIXMAP);

-    if (pSrcWin)

-    {

-	RegionPtr	region;

-    	if (!(region = wClipShape (pSrcWin)))

-    	    region = wBoundingShape (pSrcWin);

-    	/*

-     	 * If you try to CopyArea the extents of a shaped window, compacting the

-     	 * exposed region will undo all our work!

-     	 */

-    	if (extents && pSrcWin && region &&

-	    (RegionContainsRect(region, &srcBox) != rgnIN))

-	    	extents = FALSE;

-    }

-    if (extents)

-    {

-	expBox = *RegionExtents(&rgnExposed);

-	RegionReset(&rgnExposed, &expBox);

-    }

-    if ((pDstDrawable->type != DRAWABLE_PIXMAP) &&

-	(((WindowPtr)pDstDrawable)->backgroundState != None))

-    {

-	WindowPtr pWin = (WindowPtr)pDstDrawable;

-

-	/* make the exposed area screen-relative */

-	RegionTranslate(&rgnExposed,

-				 pDstDrawable->x, pDstDrawable->y);

-

-	if (extents)

-	{

-	    /* miPaintWindow doesn't clip, so we have to */

-	    RegionIntersect(&rgnExposed, &rgnExposed, &pWin->clipList);

-	}

-	miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND);

-

-	if (extents)

-	{

-	    RegionReset(&rgnExposed, &expBox);

-	}

-	else

-	    RegionTranslate(&rgnExposed,

-				     -pDstDrawable->x, -pDstDrawable->y);

-    }

-    if (prgnDstClip == &rgnDstRec)

-    {

-	RegionUninit(prgnDstClip);

-    }

-    else if (prgnDstClip != prgnSrcClip)

-    {

-	RegionDestroy(prgnDstClip);

-    }

-

-    if (prgnSrcClip == &rgnSrcRec)

-    {

-	RegionUninit(prgnSrcClip);

-    }

-    else

-    {

-	RegionDestroy(prgnSrcClip);

-    }

-

-    if (pGC->graphicsExposures)

-    {

-	/* don't look */

-	RegionPtr exposed = RegionCreate(NullBox, 0);

-	*exposed = rgnExposed;

-	return exposed;

-    }

-    else

-    {

-	RegionUninit(&rgnExposed);

-	return NULL;

-    }

-}

-

-/* send GraphicsExpose events, or a NoExpose event, based on the region */

-

-void

-miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,

-                      int major, int minor)

-{

-    if (pRgn && !RegionNil(pRgn))

-    {

-        xEvent *pEvent;

-	xEvent *pe;

-	BoxPtr pBox;

-	int i;

-	int numRects;

-

-	numRects = RegionNumRects(pRgn);

-	pBox = RegionRects(pRgn);

-	if(!(pEvent = malloc(numRects * sizeof(xEvent))))

-		return;

-	pe = pEvent;

-

-	for (i=1; i<=numRects; i++, pe++, pBox++)

-	{

-	    pe->u.u.type = GraphicsExpose;

-	    pe->u.graphicsExposure.drawable = drawable;

-	    pe->u.graphicsExposure.x = pBox->x1;

-	    pe->u.graphicsExposure.y = pBox->y1;

-	    pe->u.graphicsExposure.width = pBox->x2 - pBox->x1;

-	    pe->u.graphicsExposure.height = pBox->y2 - pBox->y1;

-	    pe->u.graphicsExposure.count = numRects - i;

-	    pe->u.graphicsExposure.majorEvent = major;

-	    pe->u.graphicsExposure.minorEvent = minor;

-	}

-	/* GraphicsExpose is a "critical event", which TryClientEvents

-	 * handles specially. */

-	TryClientEvents(client, NULL, pEvent, numRects,

-			    (Mask)0, NoEventMask, NullGrab);

-	free(pEvent);

-    }

-    else

-    {

-        xEvent event;

-	memset(&event, 0, sizeof(xEvent));

-	event.u.u.type = NoExpose;

-	event.u.noExposure.drawable = drawable;

-	event.u.noExposure.majorEvent = major;

-	event.u.noExposure.minorEvent = minor;

-	WriteEventsToClient(client, 1, &event);

-    }

-}

-

-

-void

-miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy)

-{

-    BoxPtr pBox;

-    int numRects;

-    xEvent *pEvent, *pe;

-    int i;

-

-    pBox = RegionRects(pRgn);

-    numRects = RegionNumRects(pRgn);

-    if(!(pEvent = calloc(1, numRects * sizeof(xEvent))))

-	return;

-

-    for (i=numRects, pe = pEvent; --i >= 0; pe++, pBox++)

-    {

-	pe->u.u.type = Expose;

-	pe->u.expose.window = pWin->drawable.id;

-	pe->u.expose.x = pBox->x1 - dx;

-	pe->u.expose.y = pBox->y1 - dy;

-	pe->u.expose.width = pBox->x2 - pBox->x1;

-	pe->u.expose.height = pBox->y2 - pBox->y1;

-	pe->u.expose.count = i;

-    }

-

-#ifdef PANORAMIX

-    if(!noPanoramiXExtension) {

-	int scrnum = pWin->drawable.pScreen->myNum;

-	int x = 0, y = 0;

-	XID realWin = 0;

-

-	if(!pWin->parent) {

-	    x = screenInfo.screens[scrnum]->x;

-	    y = screenInfo.screens[scrnum]->y;

-	    pWin = screenInfo.screens[0]->root;

-	    realWin = pWin->drawable.id;

-	} else if (scrnum) {

-	    PanoramiXRes *win;

-	    win = PanoramiXFindIDByScrnum(XRT_WINDOW, 

-			pWin->drawable.id, scrnum);

-	    if(!win) {

-		free(pEvent);

-		return;

-	    }

-	    realWin = win->info[0].id;

-	    dixLookupWindow(&pWin, realWin, serverClient, DixSendAccess);

-	}

-	if(x || y || scrnum)

-	  for (i = 0; i < numRects; i++) {

-	      pEvent[i].u.expose.window = realWin;

-	      pEvent[i].u.expose.x += x;

-	      pEvent[i].u.expose.y += y;

-	  }

-    }

-#endif

-

-    DeliverEvents(pWin, pEvent, numRects, NullWindow);

-

-    free(pEvent);

-}

-

-void

-miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)

-{

-    RegionPtr   exposures = prgn;

-    if ((prgn && !RegionNil(prgn)) ||

-	(exposures && !RegionNil(exposures)) || other_exposed)

-    {

-	RegionRec   expRec;

-	int	    clientInterested;

-

-	/*

-	 * Restore from backing-store FIRST.

-	 */

-	clientInterested = (pWin->eventMask|wOtherEventMasks(pWin)) & ExposureMask;

-	if (other_exposed)

-	{

-	    if (exposures)

-	    {

-		RegionUnion(other_exposed,

-						  exposures,

-					          other_exposed);

-		if (exposures != prgn)

-		    RegionDestroy(exposures);

-	    }

-	    exposures = other_exposed;

-	}

-	if (clientInterested && exposures && (RegionNumRects(exposures) > RECTLIMIT))

-	{

-	    /*

-	     * If we have LOTS of rectangles, we decide to take the extents

-	     * and force an exposure on that.  This should require much less

-	     * work overall, on both client and server.  This is cheating, but

-	     * isn't prohibited by the protocol ("spontaneous combustion" :-).

-	     */

-	    BoxRec box;

-

-	    box = *RegionExtents(exposures);

-	    if (exposures == prgn) {

-		exposures = &expRec;

-		RegionInit(exposures, &box, 1);

-		RegionReset(prgn, &box);

-	    } else {

-		RegionReset(exposures, &box);

-		RegionUnion(prgn, prgn, exposures);

-	    }

-	    /* miPaintWindow doesn't clip, so we have to */

-	    RegionIntersect(prgn, prgn, &pWin->clipList);

-	}

-	if (prgn && !RegionNil(prgn))

-	    miPaintWindow(pWin, prgn, PW_BACKGROUND);

-	if (clientInterested && exposures && !RegionNil(exposures))

-	    miSendExposures(pWin, exposures,

-			    pWin->drawable.x, pWin->drawable.y);

-	if (exposures == &expRec)

-	{

-	    RegionUninit(exposures);

-	}

-	else if (exposures && exposures != prgn && exposures != other_exposed)

-	    RegionDestroy(exposures);

-	if (prgn)

-	    RegionEmpty(prgn);

-    }

-    else if (exposures && exposures != prgn)

-	RegionDestroy(exposures);

-}

-

-#ifdef ROOTLESS

-/* Ugly, ugly, but we lost our hooks into miPaintWindow... =/ */

-void RootlessSetPixmapOfAncestors(WindowPtr pWin);

-void RootlessStartDrawing(WindowPtr pWin);

-void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);

-Bool IsFramedWindow(WindowPtr pWin);

-#endif 

-

-void

-miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)

-{

-    ScreenPtr	pScreen = pWin->drawable.pScreen;

-    ChangeGCVal gcval[6];

-    BITS32	gcmask;

-    GCPtr	pGC;

-    int		i;

-    BoxPtr	pbox;

-    xRectangle	*prect;

-    int		numRects;

-    /*

-     * Distance from screen to destination drawable, use this

-     * to adjust rendering coordinates which come in in screen space

-     */

-    int		draw_x_off, draw_y_off;

-    /*

-     * Tile offset for drawing; these need to align the tile

-     * to the appropriate window origin

-     */

-    int		tile_x_off, tile_y_off;

-    PixUnion	fill;

-    Bool	solid = TRUE;

-    DrawablePtr	drawable = &pWin->drawable;

-

-#ifdef ROOTLESS

-    if(!drawable || drawable->type == UNDRAWABLE_WINDOW)

-	return;

-

-    if(IsFramedWindow(pWin)) {

-        RootlessStartDrawing(pWin);

-        RootlessDamageRegion(pWin, prgn);

-    

-        if(pWin->backgroundState == ParentRelative) {

-            if((what == PW_BACKGROUND) || 

-               (what == PW_BORDER && !pWin->borderIsPixel))

-                RootlessSetPixmapOfAncestors(pWin);

-        }

-    }

-#endif

-    

-    if (what == PW_BACKGROUND)

-    {

-	while (pWin->backgroundState == ParentRelative)

-	    pWin = pWin->parent;

-

-	draw_x_off = drawable->x;

-	draw_y_off = drawable->y;

-

-	tile_x_off = pWin->drawable.x - draw_x_off;

-	tile_y_off = pWin->drawable.y - draw_y_off;

-	fill = pWin->background;

-	switch (pWin->backgroundState) {

-	case None:

-	    return;

-	case BackgroundPixmap:

-	    solid = FALSE;

-	    break;

-	}

-    }

-    else

-    {

-	PixmapPtr   pixmap;

-

-	tile_x_off = drawable->x;

-	tile_y_off = drawable->y;

-	

-	/* servers without pixmaps draw their own borders */

-	if (!pScreen->GetWindowPixmap)

-	    return;

-	pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);

-	drawable = &pixmap->drawable;

-#ifdef COMPOSITE

-	draw_x_off = pixmap->screen_x;

-	draw_y_off = pixmap->screen_y;

-	tile_x_off -= draw_x_off;

-	tile_y_off -= draw_y_off;

-#else

-	draw_x_off = 0;

-	draw_y_off = 0;

-#endif

-	fill = pWin->border;

-	solid = pWin->borderIsPixel;

-    }

-    

-    gcval[0].val = GXcopy;

-    gcmask = GCFunction;

-

-#ifdef ROOTLESS_SAFEALPHA

-/* Bit mask for alpha channel with a particular number of bits per

- * pixel. Note that we only care for 32bpp data. Mac OS X uses planar

- * alpha for 16bpp.

- */

-#define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)

-#endif

-    

-    if (solid)

-    {

-#ifdef ROOTLESS_SAFEALPHA

-	gcval[1].val = fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel);

-#else

-	gcval[1].val = fill.pixel;

-#endif

-	gcval[2].val  = FillSolid;

-	gcmask |= GCForeground | GCFillStyle;

-    }

-    else

-    {

-	int c=1;

-#ifdef ROOTLESS_SAFEALPHA

-	gcval[c++].val = ((CARD32)-1) & ~RootlessAlphaMask(pWin->drawable.bitsPerPixel);

-	gcmask |= GCPlaneMask;

-#endif

-	gcval[c++].val = FillTiled;

-	gcval[c++].ptr = (pointer)fill.pixmap;

-	gcval[c++].val = tile_x_off;

-	gcval[c++].val = tile_y_off;

-	gcmask |= GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin;

-    }

-

-    prect = malloc(RegionNumRects(prgn) * sizeof(xRectangle));

-    if (!prect)

-	return;

-

-    pGC = GetScratchGC(drawable->depth, drawable->pScreen);

-    if (!pGC)

-    {

-	free(prect);

-	return;

-    }

-    

-    ChangeGC (NullClient, pGC, gcmask, gcval);

-    ValidateGC (drawable, pGC);

-

-    numRects = RegionNumRects(prgn);

-    pbox = RegionRects(prgn);

-    for (i= numRects; --i >= 0; pbox++, prect++)

-    {

-	prect->x = pbox->x1 - draw_x_off;

-	prect->y = pbox->y1 - draw_y_off;

-	prect->width = pbox->x2 - pbox->x1;

-	prect->height = pbox->y2 - pbox->y1;

-    }

-    prect -= numRects;

-    (*pGC->ops->PolyFillRect)(drawable, pGC, numRects, prect);

-    free(prect);

-

-    FreeScratchGC(pGC);

-}

-

-

-/* MICLEARDRAWABLE -- sets the entire drawable to the background color of

- * the GC.  Useful when we have a scratch drawable and need to initialize 

- * it. */

-void

-miClearDrawable(DrawablePtr pDraw, GCPtr pGC)

-{

-    ChangeGCVal fg, bg;

-    xRectangle rect;

-

-    fg.val = pGC->fgPixel;

-    bg.val = pGC->bgPixel;

-    rect.x = 0;

-    rect.y = 0;

-    rect.width = pDraw->width;

-    rect.height = pDraw->height;

-    ChangeGC(NullClient, pGC, GCForeground, &bg);

-    ValidateGC(pDraw, pGC);

-    (*pGC->ops->PolyFillRect)(pDraw, pGC, 1, &rect);

-    ChangeGC(NullClient, pGC, GCForeground, &fg);

-    ValidateGC(pDraw, pGC);

-}

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL 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) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xprotostr.h>
+
+#include "misc.h"
+#include "regionstr.h"
+#include "scrnintstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "pixmap.h"
+#include "input.h"
+
+#include "dixstruct.h"
+#include "mi.h"
+#include <X11/Xmd.h>
+
+#include "globals.h"
+
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+#endif
+
+/*
+    machine-independent graphics exposure code.  any device that uses
+the region package can call this.
+*/
+
+#ifndef RECTLIMIT
+#define RECTLIMIT 25		/* pick a number, any number > 8 */
+#endif
+
+/* miHandleExposures 
+    generate a region for exposures for areas that were copied from obscured or
+non-existent areas to non-obscured areas of the destination.  Paint the
+background for the region, if the destination is a window.
+
+NOTE:
+     this should generally be called, even if graphicsExposures is false,
+because this is where bits get recovered from backing store.
+
+NOTE:
+     added argument 'plane' is used to indicate how exposures from backing
+store should be accomplished. If plane is 0 (i.e. no bit plane), CopyArea
+should be used, else a CopyPlane of the indicated plane will be used. The
+exposing is done by the backing store's GraphicsExpose function, of course.
+
+*/
+
+RegionPtr
+miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+		  GCPtr pGC, int srcx, int srcy, int width, int height,
+		  int dstx, int dsty, unsigned long plane)
+{
+    RegionPtr prgnSrcClip;	/* drawable-relative source clip */
+    RegionRec rgnSrcRec;
+    RegionPtr prgnDstClip;	/* drawable-relative dest clip */
+    RegionRec rgnDstRec;
+    BoxRec srcBox;		/* unclipped source */
+    RegionRec rgnExposed;	/* exposed region, calculated source-
+				   relative, made dst relative to
+				   intersect with visible parts of
+				   dest and send events to client, 
+				   and then screen relative to paint 
+				   the window background
+				*/
+    WindowPtr pSrcWin;
+    BoxRec expBox;
+    Bool extents;
+
+    /* avoid work if we can */
+    if (!pGC->graphicsExposures &&
+	(pDstDrawable->type == DRAWABLE_PIXMAP) &&
+	((pSrcDrawable->type == DRAWABLE_PIXMAP) ||
+	 (((WindowPtr)pSrcDrawable)->backStorage == NULL)))
+	return NULL;
+	
+    srcBox.x1 = srcx;
+    srcBox.y1 = srcy;
+    srcBox.x2 = srcx+width;
+    srcBox.y2 = srcy+height;
+
+    if (pSrcDrawable->type != DRAWABLE_PIXMAP)
+    {
+	BoxRec TsrcBox;
+
+	TsrcBox.x1 = srcx + pSrcDrawable->x;
+	TsrcBox.y1 = srcy + pSrcDrawable->y;
+	TsrcBox.x2 = TsrcBox.x1 + width;
+	TsrcBox.y2 = TsrcBox.y1 + height;
+	pSrcWin = (WindowPtr) pSrcDrawable;
+	if (pGC->subWindowMode == IncludeInferiors)
+ 	{
+	    prgnSrcClip = NotClippedByChildren (pSrcWin);
+	    if ((RegionContainsRect(prgnSrcClip, &TsrcBox)) == rgnIN)
+	    {
+		RegionDestroy(prgnSrcClip);
+		return NULL;
+	    }
+	}
+ 	else
+ 	{
+	    if ((RegionContainsRect(&pSrcWin->clipList, &TsrcBox)) == rgnIN)
+		return NULL;
+	    prgnSrcClip = &rgnSrcRec;
+	    RegionNull(prgnSrcClip);
+	    RegionCopy(prgnSrcClip, &pSrcWin->clipList);
+	}
+	RegionTranslate(prgnSrcClip,
+				-pSrcDrawable->x, -pSrcDrawable->y);
+    }
+    else
+    {
+	BoxRec	box;
+
+	if ((srcBox.x1 >= 0) && (srcBox.y1 >= 0) &&
+	    (srcBox.x2 <= pSrcDrawable->width) &&
+ 	    (srcBox.y2 <= pSrcDrawable->height))
+	    return NULL;
+
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pSrcDrawable->width;
+	box.y2 = pSrcDrawable->height;
+	prgnSrcClip = &rgnSrcRec;
+	RegionInit(prgnSrcClip, &box, 1);
+	pSrcWin = NULL;
+    }
+
+    if (pDstDrawable == pSrcDrawable)
+    {
+	prgnDstClip = prgnSrcClip;
+    }
+    else if (pDstDrawable->type != DRAWABLE_PIXMAP)
+    {
+	if (pGC->subWindowMode == IncludeInferiors)
+	{
+	    prgnDstClip = NotClippedByChildren((WindowPtr)pDstDrawable);
+	}
+	else
+	{
+	    prgnDstClip = &rgnDstRec;
+	    RegionNull(prgnDstClip);
+	    RegionCopy(prgnDstClip,
+				&((WindowPtr)pDstDrawable)->clipList);
+	}
+	RegionTranslate(prgnDstClip,
+				 -pDstDrawable->x, -pDstDrawable->y);
+    }
+    else
+    {
+	BoxRec	box;
+
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pDstDrawable->width;
+	box.y2 = pDstDrawable->height;
+	prgnDstClip = &rgnDstRec;
+	RegionInit(prgnDstClip, &box, 1);
+    }
+
+    /* drawable-relative source region */
+    RegionInit(&rgnExposed, &srcBox, 1);
+
+    /* now get the hidden parts of the source box*/
+    RegionSubtract(&rgnExposed, &rgnExposed, prgnSrcClip);
+
+    /* move them over the destination */
+    RegionTranslate(&rgnExposed, dstx-srcx, dsty-srcy);
+
+    /* intersect with visible areas of dest */
+    RegionIntersect(&rgnExposed, &rgnExposed, prgnDstClip);
+
+    /* intersect with client clip region. */
+    if (pGC->clientClipType == CT_REGION)
+	RegionIntersect(&rgnExposed, &rgnExposed, pGC->clientClip);
+
+    /*
+     * If we have LOTS of rectangles, we decide to take the extents
+     * and force an exposure on that.  This should require much less
+     * work overall, on both client and server.  This is cheating, but
+     * isn't prohibited by the protocol ("spontaneous combustion" :-)
+     * for windows.
+     */
+    extents = pGC->graphicsExposures &&
+	      (RegionNumRects(&rgnExposed) > RECTLIMIT) &&
+	      (pDstDrawable->type != DRAWABLE_PIXMAP);
+    if (pSrcWin)
+    {
+	RegionPtr	region;
+    	if (!(region = wClipShape (pSrcWin)))
+    	    region = wBoundingShape (pSrcWin);
+    	/*
+     	 * If you try to CopyArea the extents of a shaped window, compacting the
+     	 * exposed region will undo all our work!
+     	 */
+    	if (extents && pSrcWin && region &&
+	    (RegionContainsRect(region, &srcBox) != rgnIN))
+	    	extents = FALSE;
+    }
+    if (extents)
+    {
+	expBox = *RegionExtents(&rgnExposed);
+	RegionReset(&rgnExposed, &expBox);
+    }
+    if ((pDstDrawable->type != DRAWABLE_PIXMAP) &&
+	(((WindowPtr)pDstDrawable)->backgroundState != None))
+    {
+	WindowPtr pWin = (WindowPtr)pDstDrawable;
+
+	/* make the exposed area screen-relative */
+	RegionTranslate(&rgnExposed,
+				 pDstDrawable->x, pDstDrawable->y);
+
+	if (extents)
+	{
+	    /* miPaintWindow doesn't clip, so we have to */
+	    RegionIntersect(&rgnExposed, &rgnExposed, &pWin->clipList);
+	}
+	miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND);
+
+	if (extents)
+	{
+	    RegionReset(&rgnExposed, &expBox);
+	}
+	else
+	    RegionTranslate(&rgnExposed,
+				     -pDstDrawable->x, -pDstDrawable->y);
+    }
+    if (prgnDstClip == &rgnDstRec)
+    {
+	RegionUninit(prgnDstClip);
+    }
+    else if (prgnDstClip != prgnSrcClip)
+    {
+	RegionDestroy(prgnDstClip);
+    }
+
+    if (prgnSrcClip == &rgnSrcRec)
+    {
+	RegionUninit(prgnSrcClip);
+    }
+    else
+    {
+	RegionDestroy(prgnSrcClip);
+    }
+
+    if (pGC->graphicsExposures)
+    {
+	/* don't look */
+	RegionPtr exposed = RegionCreate(NullBox, 0);
+	*exposed = rgnExposed;
+	return exposed;
+    }
+    else
+    {
+	RegionUninit(&rgnExposed);
+	return NULL;
+    }
+}
+
+/* send GraphicsExpose events, or a NoExpose event, based on the region */
+
+void
+miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
+                      int major, int minor)
+{
+    if (pRgn && !RegionNil(pRgn))
+    {
+        xEvent *pEvent;
+	xEvent *pe;
+	BoxPtr pBox;
+	int i;
+	int numRects;
+
+	numRects = RegionNumRects(pRgn);
+	pBox = RegionRects(pRgn);
+	if(!(pEvent = malloc(numRects * sizeof(xEvent))))
+		return;
+	pe = pEvent;
+
+	for (i=1; i<=numRects; i++, pe++, pBox++)
+	{
+	    pe->u.u.type = GraphicsExpose;
+	    pe->u.graphicsExposure.drawable = drawable;
+	    pe->u.graphicsExposure.x = pBox->x1;
+	    pe->u.graphicsExposure.y = pBox->y1;
+	    pe->u.graphicsExposure.width = pBox->x2 - pBox->x1;
+	    pe->u.graphicsExposure.height = pBox->y2 - pBox->y1;
+	    pe->u.graphicsExposure.count = numRects - i;
+	    pe->u.graphicsExposure.majorEvent = major;
+	    pe->u.graphicsExposure.minorEvent = minor;
+	}
+	/* GraphicsExpose is a "critical event", which TryClientEvents
+	 * handles specially. */
+	TryClientEvents(client, NULL, pEvent, numRects,
+			    (Mask)0, NoEventMask, NullGrab);
+	free(pEvent);
+    }
+    else
+    {
+        xEvent event;
+	memset(&event, 0, sizeof(xEvent));
+	event.u.u.type = NoExpose;
+	event.u.noExposure.drawable = drawable;
+	event.u.noExposure.majorEvent = major;
+	event.u.noExposure.minorEvent = minor;
+	WriteEventsToClient(client, 1, &event);
+    }
+}
+
+
+void
+miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy)
+{
+    BoxPtr pBox;
+    int numRects;
+    xEvent *pEvent, *pe;
+    int i;
+
+    pBox = RegionRects(pRgn);
+    numRects = RegionNumRects(pRgn);
+    if(!(pEvent = calloc(1, numRects * sizeof(xEvent))))
+	return;
+
+    for (i=numRects, pe = pEvent; --i >= 0; pe++, pBox++)
+    {
+	pe->u.u.type = Expose;
+	pe->u.expose.window = pWin->drawable.id;
+	pe->u.expose.x = pBox->x1 - dx;
+	pe->u.expose.y = pBox->y1 - dy;
+	pe->u.expose.width = pBox->x2 - pBox->x1;
+	pe->u.expose.height = pBox->y2 - pBox->y1;
+	pe->u.expose.count = i;
+    }
+
+#ifdef PANORAMIX
+    if(!noPanoramiXExtension) {
+	int scrnum = pWin->drawable.pScreen->myNum;
+	int x = 0, y = 0;
+	XID realWin = 0;
+
+	if(!pWin->parent) {
+	    x = screenInfo.screens[scrnum]->x;
+	    y = screenInfo.screens[scrnum]->y;
+	    pWin = screenInfo.screens[0]->root;
+	    realWin = pWin->drawable.id;
+	} else if (scrnum) {
+	    PanoramiXRes *win;
+	    win = PanoramiXFindIDByScrnum(XRT_WINDOW, 
+			pWin->drawable.id, scrnum);
+	    if(!win) {
+		free(pEvent);
+		return;
+	    }
+	    realWin = win->info[0].id;
+	    dixLookupWindow(&pWin, realWin, serverClient, DixSendAccess);
+	}
+	if(x || y || scrnum)
+	  for (i = 0; i < numRects; i++) {
+	      pEvent[i].u.expose.window = realWin;
+	      pEvent[i].u.expose.x += x;
+	      pEvent[i].u.expose.y += y;
+	  }
+    }
+#endif
+
+    DeliverEvents(pWin, pEvent, numRects, NullWindow);
+
+    free(pEvent);
+}
+
+void
+miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
+{
+    RegionPtr   exposures = prgn;
+    if ((prgn && !RegionNil(prgn)) ||
+	(exposures && !RegionNil(exposures)) || other_exposed)
+    {
+	RegionRec   expRec;
+	int	    clientInterested;
+
+	/*
+	 * Restore from backing-store FIRST.
+	 */
+	clientInterested = (pWin->eventMask|wOtherEventMasks(pWin)) & ExposureMask;
+	if (other_exposed)
+	{
+	    if (exposures)
+	    {
+		RegionUnion(other_exposed,
+						  exposures,
+					          other_exposed);
+		if (exposures != prgn)
+		    RegionDestroy(exposures);
+	    }
+	    exposures = other_exposed;
+	}
+	if (clientInterested && exposures && (RegionNumRects(exposures) > RECTLIMIT))
+	{
+	    /*
+	     * If we have LOTS of rectangles, we decide to take the extents
+	     * and force an exposure on that.  This should require much less
+	     * work overall, on both client and server.  This is cheating, but
+	     * isn't prohibited by the protocol ("spontaneous combustion" :-).
+	     */
+	    BoxRec box;
+
+	    box = *RegionExtents(exposures);
+	    if (exposures == prgn) {
+		exposures = &expRec;
+		RegionInit(exposures, &box, 1);
+		RegionReset(prgn, &box);
+	    } else {
+		RegionReset(exposures, &box);
+		RegionUnion(prgn, prgn, exposures);
+	    }
+	    /* miPaintWindow doesn't clip, so we have to */
+	    RegionIntersect(prgn, prgn, &pWin->clipList);
+	}
+	if (prgn && !RegionNil(prgn))
+	    miPaintWindow(pWin, prgn, PW_BACKGROUND);
+	if (clientInterested && exposures && !RegionNil(exposures))
+	    miSendExposures(pWin, exposures,
+			    pWin->drawable.x, pWin->drawable.y);
+	if (exposures == &expRec)
+	{
+	    RegionUninit(exposures);
+	}
+	else if (exposures && exposures != prgn && exposures != other_exposed)
+	    RegionDestroy(exposures);
+	if (prgn)
+	    RegionEmpty(prgn);
+    }
+    else if (exposures && exposures != prgn)
+	RegionDestroy(exposures);
+}
+
+#ifdef ROOTLESS
+/* Ugly, ugly, but we lost our hooks into miPaintWindow... =/ */
+void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+void RootlessStartDrawing(WindowPtr pWin);
+void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
+Bool IsFramedWindow(WindowPtr pWin);
+#endif 
+
+void
+miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+{
+    ScreenPtr	pScreen = pWin->drawable.pScreen;
+    ChangeGCVal gcval[6];
+    BITS32	gcmask;
+    GCPtr	pGC;
+    int		i;
+    BoxPtr	pbox;
+    xRectangle	*prect;
+    int		numRects;
+    /*
+     * Distance from screen to destination drawable, use this
+     * to adjust rendering coordinates which come in in screen space
+     */
+    int		draw_x_off, draw_y_off;
+    /*
+     * Tile offset for drawing; these need to align the tile
+     * to the appropriate window origin
+     */
+    int		tile_x_off, tile_y_off;
+    PixUnion	fill;
+    Bool	solid = TRUE;
+    DrawablePtr	drawable = &pWin->drawable;
+
+#ifdef ROOTLESS
+    if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+	return;
+
+    if(IsFramedWindow(pWin)) {
+        RootlessStartDrawing(pWin);
+        RootlessDamageRegion(pWin, prgn);
+    
+        if(pWin->backgroundState == ParentRelative) {
+            if((what == PW_BACKGROUND) || 
+               (what == PW_BORDER && !pWin->borderIsPixel))
+                RootlessSetPixmapOfAncestors(pWin);
+        }
+    }
+#endif
+    
+    if (what == PW_BACKGROUND)
+    {
+	while (pWin->backgroundState == ParentRelative)
+	    pWin = pWin->parent;
+
+	draw_x_off = drawable->x;
+	draw_y_off = drawable->y;
+
+	tile_x_off = pWin->drawable.x - draw_x_off;
+	tile_y_off = pWin->drawable.y - draw_y_off;
+	fill = pWin->background;
+#ifdef COMPOSITE
+	if (pWin->inhibitBGPaint)
+	    return;
+#endif
+	switch (pWin->backgroundState) {
+	case None:
+	    return;
+	case BackgroundPixmap:
+	    solid = FALSE;
+	    break;
+	}
+    }
+    else
+    {
+	PixmapPtr   pixmap;
+
+	tile_x_off = drawable->x;
+	tile_y_off = drawable->y;
+	
+	/* servers without pixmaps draw their own borders */
+	if (!pScreen->GetWindowPixmap)
+	    return;
+	pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
+	drawable = &pixmap->drawable;
+#ifdef COMPOSITE
+	draw_x_off = pixmap->screen_x;
+	draw_y_off = pixmap->screen_y;
+	tile_x_off -= draw_x_off;
+	tile_y_off -= draw_y_off;
+#else
+	draw_x_off = 0;
+	draw_y_off = 0;
+#endif
+	fill = pWin->border;
+	solid = pWin->borderIsPixel;
+    }
+    
+    gcval[0].val = GXcopy;
+    gcmask = GCFunction;
+
+#ifdef ROOTLESS_SAFEALPHA
+/* Bit mask for alpha channel with a particular number of bits per
+ * pixel. Note that we only care for 32bpp data. Mac OS X uses planar
+ * alpha for 16bpp.
+ */
+#define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
+#endif
+    
+    if (solid)
+    {
+#ifdef ROOTLESS_SAFEALPHA
+	gcval[1].val = fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel);
+#else
+	gcval[1].val = fill.pixel;
+#endif
+	gcval[2].val  = FillSolid;
+	gcmask |= GCForeground | GCFillStyle;
+    }
+    else
+    {
+	int c=1;
+#ifdef ROOTLESS_SAFEALPHA
+	gcval[c++].val = ((CARD32)-1) & ~RootlessAlphaMask(pWin->drawable.bitsPerPixel);
+	gcmask |= GCPlaneMask;
+#endif
+	gcval[c++].val = FillTiled;
+	gcval[c++].ptr = (pointer)fill.pixmap;
+	gcval[c++].val = tile_x_off;
+	gcval[c++].val = tile_y_off;
+	gcmask |= GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin;
+    }
+
+    prect = malloc(RegionNumRects(prgn) * sizeof(xRectangle));
+    if (!prect)
+	return;
+
+    pGC = GetScratchGC(drawable->depth, drawable->pScreen);
+    if (!pGC)
+    {
+	free(prect);
+	return;
+    }
+    
+    ChangeGC (NullClient, pGC, gcmask, gcval);
+    ValidateGC (drawable, pGC);
+
+    numRects = RegionNumRects(prgn);
+    pbox = RegionRects(prgn);
+    for (i= numRects; --i >= 0; pbox++, prect++)
+    {
+	prect->x = pbox->x1 - draw_x_off;
+	prect->y = pbox->y1 - draw_y_off;
+	prect->width = pbox->x2 - pbox->x1;
+	prect->height = pbox->y2 - pbox->y1;
+    }
+    prect -= numRects;
+    (*pGC->ops->PolyFillRect)(drawable, pGC, numRects, prect);
+    free(prect);
+
+    FreeScratchGC(pGC);
+}
+
+
+/* MICLEARDRAWABLE -- sets the entire drawable to the background color of
+ * the GC.  Useful when we have a scratch drawable and need to initialize 
+ * it. */
+void
+miClearDrawable(DrawablePtr pDraw, GCPtr pGC)
+{
+    ChangeGCVal fg, bg;
+    xRectangle rect;
+
+    fg.val = pGC->fgPixel;
+    bg.val = pGC->bgPixel;
+    rect.x = 0;
+    rect.y = 0;
+    rect.width = pDraw->width;
+    rect.height = pDraw->height;
+    ChangeGC(NullClient, pGC, GCForeground, &bg);
+    ValidateGC(pDraw, pGC);
+    (*pGC->ops->PolyFillRect)(pDraw, pGC, 1, &rect);
+    ChangeGC(NullClient, pGC, GCForeground, &fg);
+    ValidateGC(pDraw, pGC);
+}