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

[Jeremy Huddleston]

 configure.ac                    |    2 +-
 miext/rootless/rootlessScreen.c |    2 +-
 miext/rootless/rootlessWindow.c |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 37133b9d948daef4e6182751dbc835a1ae1387e5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Dec 17 15:10:07 2008 -0800

    1.4.2-apple28

diff --git a/configure.ac b/configure.ac
index 6ce1dcd..15afe64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple27, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple28, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 3269959033ed0c675a3a906666454df34086896a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Dec 17 15:09:35 2008 -0800

    XQuartz: Get rid of white rectangle bug

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 74c5dbb..da02fe0 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -632,7 +632,7 @@ RootlessReorderWindow(WindowPtr pWin)
 {
     RootlessWindowRec *winRec = WINREC(pWin);
 
-    if (winRec != NULL && !winRec->is_reorder_pending) {
+    if (pWin->realized && winRec != NULL && !winRec->is_reorder_pending && !windows_hidden) {
         WindowPtr newPrevW;
         RootlessWindowRec *newPrev;
         RootlessFrameID newPrevID;
@@ -1662,7 +1662,10 @@ RootlessOrderAllWindows (void)
 {
     int i;
     WindowPtr pWin;
-    
+
+    if (windows_hidden)
+        return;    
+
     RL_DEBUG_MSG("RootlessOrderAllWindows() ");
     for (i = 0; i < screenInfo.numScreens; i++) {
       if (screenInfo.screens[i] == NULL) continue;
commit 60c8d2697036a125ca5381df8e2eaedabad4d242
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Dec 17 14:43:02 2008 -0800

    rootless: Make expose_1 static

diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index c21c7b2..6be4312 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -471,7 +471,7 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
     return result;
 }
 
-void expose_1 (WindowPtr pWin) {
+static void expose_1 (WindowPtr pWin) {
     WindowPtr pChild;
     
     if (!pWin->realized)