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

[Jeremy Huddleston]

 hw/xquartz/xpr/xprFrame.c |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 997b6f3142c622541bb5bac98652abae75d1101d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Apr 6 19:21:46 2009 -0700

    XQuartz: Revert most of the previous override redirect patch
    
    The changes actually caused all windows to move to the current space.  Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.

diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 943e0af..c7cb314 100644
--- a/hw/xquartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -257,22 +257,12 @@ xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
 
     if (nextWid == NULL)
     {
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
-        WindowPtr pWin = xprGetXWindow((xp_window_id)wid);
-        wc.stack_mode = (pWin && pWin->overrideRedirect) ? XP_MAPPED_ABOVE_CURRENT_SPACE : XP_MAPPED_ABOVE;
-#else
         wc.stack_mode = XP_MAPPED_ABOVE;
-#endif
         wc.sibling = 0;
     }
     else
     {
-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3
-        WindowPtr pWin = xprGetXWindow((xp_window_id)wid);
-        wc.stack_mode = (pWin && pWin->overrideRedirect) ? XP_MAPPED_BELOW_CURRENT_SPACE : XP_MAPPED_BELOW;
-#else
         wc.stack_mode = XP_MAPPED_BELOW;
-#endif
         wc.sibling = x_cvt_vptr_to_uint(nextWid);
     }