[Xquartz-changes] xserver: Branch 'PR-290-1.9' - 4 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit 16530bb9145d48512100f6cef879526383875f2b
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Apr 18 01:32:09 2010 -0700

    Fixes it, but not sure what the real fix is...
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/mi/miexpose.c b/mi/miexpose.c
index 6776064..ecf2995 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -524,6 +524,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
 void RootlessStartDrawing(WindowPtr pWin);
 void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
 Bool IsFramedWindow(WindowPtr pWin);
+
+#include "../fb/fb.h"
 #endif 
 
 void
@@ -680,7 +682,17 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
 	prect->height = pbox->y2 - pbox->y1;
     }
     prect -= numRects;
-    (*pGC->ops->PolyFillRect)(drawable, pGC, numRects, prect);
+    
+    if(solid && what == PW_BORDER) {
+	fbFillRegionSolid (drawable,
+			   prgn,
+			   0,
+			   fbReplicatePixel (pWin->border.pixel,
+					     pWin->drawable.bitsPerPixel));
+    } else {
+	(*pGC->ops->PolyFillRect)(drawable, pGC, numRects, prect);
+    }
+    
     xfree(prect);
 
     FreeScratchGC(pGC);
commit 0ac2c6b17168a050dcae7070e3e55a477d16bf61
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Apr 18 01:30:04 2010 -0700

    mi: Add some sanity checking to miPaintWindow
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/mi/miexpose.c b/mi/miexpose.c
index 75fcf0a..6776064 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -551,6 +551,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     Bool	solid = TRUE;
     DrawablePtr	drawable = &pWin->drawable;
 
+    if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+	return;
+
     if (what == PW_BACKGROUND)
     {
 #ifdef ROOTLESS
commit aa23b1d3ba15f4ca68b39cc481bbfd75af2fe05b
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Apr 18 01:29:35 2010 -0700

    mi: move ROOTLESS hunks
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/mi/miexpose.c b/mi/miexpose.c
index 1c9c3a4..75fcf0a 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -551,21 +551,19 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     Bool	solid = TRUE;
     DrawablePtr	drawable = &pWin->drawable;
 
-#ifdef ROOTLESS
-    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)
     {
+#ifdef ROOTLESS
+	if(IsFramedWindow(pWin)) {
+	    RootlessStartDrawing(pWin);
+	    RootlessDamageRegion(pWin, prgn);
+	    
+	    if(pWin->backgroundState == ParentRelative) {
+		RootlessSetPixmapOfAncestors(pWin);
+	    }
+	}
+#endif
+
 	while (pWin->backgroundState == ParentRelative)
 	    pWin = pWin->parent;
 
@@ -587,6 +585,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     {
 	PixmapPtr   pixmap;
 
+#ifdef ROOTLESS
+	if(IsFramedWindow(pWin)) {
+	    RootlessStartDrawing(pWin);
+	    RootlessDamageRegion(pWin, prgn);
+	    
+	    if(!pWin->borderIsPixel &&
+	       pWin->backgroundState == ParentRelative) {
+		RootlessSetPixmapOfAncestors(pWin);
+	    }
+	}
+#endif
+
 	tile_x_off = drawable->x;
 	tile_y_off = drawable->y;
 	
commit a460eeca9ec60fd3d9d93ab29ea9ec1565f81b38
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Apr 18 01:22:27 2010 -0700

    rootless: Remove an unneeded comment
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index e78e2c8..55c7b96 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -1553,10 +1553,6 @@ RootlessDisableRoot (ScreenPtr pScreen)
 	return;
            
     RootlessDestroyFrame (pRoot, winRec);
-    /* 
-     * gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
-     * QUESTION: Where is this xa_native_window_id set?
-     */
     DeleteProperty (serverClient, pRoot, xa_native_window_id ());
 }