xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/quartz.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 83d7a8b2ad259e2dd956000f5ddae7cd8283ba76
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sun Feb 22 00:42:09 2009 -0800

    Revert "XQuartz: DefineInitialRootWindow is gone"
    
    I pushed this to the wrong branch...
    
    This reverts commit 346b25f88f6ab74dbef0559c9634d72463e017f5.

diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 6d29abc..1274ec7 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -284,9 +284,7 @@ static void QuartzUpdateScreens(void) {
     pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
     //pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip,  PW_BACKGROUND);
     miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
-
-//  TODO: This is a noop in 1.6 and nuked in master... we may need to do something else now to handle it
-//    DefineInitialRootWindow(pRoot);
+    DefineInitialRootWindow(pRoot);
 
     DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, dixScreenOrigins[pScreen->myNum].x, dixScreenOrigins[pScreen->myNum].y);