[xorg-commit-diffs] xc/programs/Xserver/hw/darwin/quartz/cr Imakefile, 1.1.10.1, 1.1.10.1.6.1 crFrame.m, 1.1.4.2.4.2, 1.1.4.2.4.2.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/cr
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/darwin/quartz/cr

Modified Files:
      Tag: XPRINT
	Imakefile crFrame.m 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/cr/Imakefile,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/Imakefile	4 Mar 2004 17:47:30 -0000	1.1.10.1
+++ b/Imakefile	10 Apr 2004 09:04:26 -0000	1.1.10.1.6.1
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/Imakefile,v 1.1 2003/06/07 05:49:07 torrey Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/Imakefile,v 1.3 2004/03/19 02:05:29 torrey Exp $
 
 #include <Server.tmpl>
 
@@ -23,6 +23,10 @@
            -I$(SERVERSRC)/miext/rootless/safeAlpha -I$(SERVERSRC)/Xext \
            -I$(APPLEWMLIBSRC)
 
+#if OSMajorVersion < 6
+DEFINES = -DDEFER_NSWINDOW
+#endif
+
 NormalLibraryObjectRule()
 NormalLibraryTarget(cr,$(OBJS))
 

Index: crFrame.m
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v
retrieving revision 1.1.4.2.4.2
retrieving revision 1.1.4.2.4.2.6.1
diff -u -d -r1.1.4.2.4.2 -r1.1.4.2.4.2.6.1
--- a/crFrame.m	4 Mar 2004 20:16:13 -0000	1.1.4.2.4.2
+++ b/crFrame.m	10 Apr 2004 09:04:26 -0000	1.1.4.2.4.2.6.1
@@ -27,8 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg$ */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -36,6 +35,7 @@
 #undef BOOL
 #define BOOL xBOOL
 #include "rootless.h"
+#include "windowstr.h"
 #undef BOOL
 
 WindowPtr nextWindowToFrame = NULL;
@@ -79,7 +79,12 @@
     theWindow = [[NSWindow alloc] initWithContentRect:bounds
                                   styleMask:theStyleMask
                                   backing:NSBackingStoreBuffered
+#ifdef DEFER_NSWINDOW
+                                  defer:YES];
+#else
                                   defer:NO];
+#endif
+
     if (!theWindow) return FALSE;
 
     [theWindow setBackgroundColor:[NSColor clearColor]];  // erase transparent
@@ -96,6 +101,21 @@
     [theWindow setContentView:theView];
     [theWindow setInitialFirstResponder:theView];
 
+#ifdef DEFER_NSWINDOW
+    // We need the NSWindow to actually be created now.
+    // If we had to defer creating it, we have to order it
+    // onto the screen to force it to be created.
+
+    if (pFrame->win->prevSib) {
+        CRWindowPtr crWinPtr = (CRWindowPtr) RootlessFrameForWindow(
+                                                pFrame->win->prevSib, FALSE);
+        int upperNum = [crWinPtr->window windowNumber];
+        [theWindow orderWindow:NSWindowBelow relativeTo:upperNum];
+    } else {
+        [theWindow orderFront:nil];
+    }
+#endif
+
     [theWindow setAcceptsMouseMovedEvents:YES];
 
     crWinPtr->window = theWindow;