Darwin: Misc cleanups to line up with master

hw/darwin/quartz/X11Application.h

@@ -1,5 +1,4 @@
 /* X11Application.h -- subclass of NSApplication to multiplex events
-   $Id: X11Application.h,v 1.26 2003/08/08 19:16:13 jharper Exp $
 
    Copyright (c) 2002-2007 Apple Inc. All rights reserved.
 

hw/darwin/quartz/X11Application.m

@@ -27,19 +27,17 @@
  promote the sale, use or other dealings in this Software without
  prior written authorization. */
 
-#include "../quartz/quartzCommon.h"
+#include "quartzCommon.h"
 
 #import "X11Application.h"
 #include <Carbon/Carbon.h>
 
 /* ouch! */
 #define BOOL X_BOOL
-//# include "Xproto.h"
 # include "darwin.h"
-# include "../quartz/quartz.h"
+# include "quartz.h"
 # define _APPLEWM_SERVER_
 # include "X11/extensions/applewm.h"
-//# include "X.h"
 # include "micmap.h"
 #undef BOOL
 

hw/darwin/quartz/X11Controller.h

@@ -1,5 +1,4 @@
 /* X11Controller.h -- connect the IB ui
-   $Id: X11Controller.h,v 1.21 2003/07/24 17:52:29 jharper Exp $
 
    Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
 
@@ -34,7 +33,7 @@
 #if __OBJC__
 
 #import <Cocoa/Cocoa.h>
-#include "../quartz/xpr/x-list.h"
+#include "xpr/x-list.h"
 
 @interface X11Controller : NSObject
 {

hw/darwin/quartz/X11Controller.m

@@ -1,5 +1,4 @@
 /* X11Controller.m -- connect the IB ui, also the NSApp delegate
-   $Id: X11Controller.m,v 1.40 2006/09/06 21:19:32 jharper Exp $
  
    Copyright (c) 2002-2007 Apple Inc. All rights reserved.
  
@@ -30,7 +29,7 @@
 
 #define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
 
-#include "../quartz/quartzCommon.h"
+#include "quartzCommon.h"
 
 #import "X11Controller.h"
 #import "X11Application.h"
@@ -38,14 +37,12 @@
 
 /* ouch! */
 #define BOOL X_BOOL
-//# include "Xproto.h"
 #include "opaque.h"
 # include "darwin.h"
-# include "../quartz/quartz.h"
+# include "quartz.h"
 # define _APPLEWM_SERVER_
 # include "X11/extensions/applewm.h"
-# include "../quartz/applewmExt.h"
+# include "applewmExt.h"
-//# include "X.h"
 #undef BOOL
 
 #include <stdio.h>
@@ -305,7 +302,7 @@
   argv[4] = "-c";
   argv[5] = command;
   argv[6] = NULL;
-    
+
   /* Do the fork-twice trick to avoid having to reap zombies */
     
   child1 = fork();

hw/darwin/quartz/applewm.c

@@ -461,7 +461,7 @@ ProcAppleWMSetWindowMenuCheck(
     REQUEST(xAppleWMSetWindowMenuCheckReq);
 
     REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
-    X11ApplicationSetWindowMenuCheck (stuff->index);
+    X11ApplicationSetWindowMenuCheck(stuff->index);
     return (client->noClientException);
 }
 

hw/darwin/quartz/cr/crAppleWM.m

@@ -29,8 +29,8 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
-#include "cr.h"
+#include "quartz/cr/cr.h"
 
 #undef BOOL
 #define BOOL xBOOL
@@ -38,7 +38,7 @@
 #include "X11/X.h"
 #define _APPLEWM_SERVER_
 #include "X11/extensions/applewm.h"
-#include "applewmExt.h"
+#include "quartz/applewmExt.h"
 #undef BOOL
 
 #define StdDocumentStyleMask (NSTitledWindowMask | \

hw/darwin/quartz/cr/crFrame.m

@@ -30,8 +30,8 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
-#include "cr.h"
+#include "quartz/cr/cr.h"
 
 #undef BOOL
 #define BOOL xBOOL

hw/darwin/quartz/cr/crScreen.m

@@ -30,8 +30,8 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
-#include "cr.h"
+#include "quartz/cr/cr.h"
 
 #undef BOOL
 #define BOOL xBOOL

hw/darwin/quartz/fullscreen/fullscreen.c

@@ -29,7 +29,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
 #include "darwin.h"
 #include "quartz/quartz.h"
 #include "quartz/quartzCursor.h"

hw/darwin/quartz/fullscreen/quartzCursor.c

@@ -31,8 +31,8 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
-#include "quartzCursor.h"
+#include "quartz/quartzCursor.h"
 #include "darwin.h"
 
 #include <pthread.h>

hw/darwin/quartz/keysym2ucs.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
  *

hw/darwin/quartz/quartzCocoa.m

@@ -6,7 +6,6 @@
  * This file is separate from the parts of Quartz support
  * that use X include files to avoid symbol collisions.
  *
- *
  * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
  *                 All Rights Reserved.
  *

hw/darwin/quartz/quartzKeyboard.c

@@ -3,7 +3,7 @@
 
    Code to build a keymap using the Carbon Keyboard Layout API.
 
-   Copyright (c) 2003-2007 Apple, Inc.
+   Copyright (c) 2003-2007 Apple Inc.
 
    Permission is hereby granted, free of charge, to any person
    obtaining a copy of this software and associated documentation files
@@ -34,6 +34,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzCommon.h"
 
 #include <CoreServices/CoreServices.h>

hw/darwin/quartz/quartzStartup.c

@@ -36,6 +36,7 @@
 #include "opaque.h"
 #include "micmap.h"
 #include <assert.h>
+
 char **envpGlobal;      // argcGlobal and argvGlobal
                         // are from dix/globals.c
 
@@ -99,9 +100,19 @@ void DarwinHandleGUI(
         }
     }
 
+
+    /* Initially I ran the X server on the main thread, and received
+       events on the second thread. But now we may be using Carbon,
+       that needs to run on the main thread. (Otherwise, when it's
+       prebound, it will initialize itself on the wrong thread)
+       
+       grr.. but doing that means that if the X thread gets scheduled
+       before the main thread when we're _not_ prebound, things fail,
+       so initialize by hand. */
+
     extern void _InitHLTB(void);
     
-    _InitHLTB();
+    _InitHLTB();    
     X11ControllerMain(argc, argv, server_thread, NULL);
     exit(0);
 }

hw/darwin/quartz/xpr/dri.c

@@ -34,9 +34,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#include <dix-config.h>
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #ifdef XFree86LOADER
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -44,7 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <dix-config.h>
 
 #define NEED_REPLIES
 #define NEED_EVENTS

hw/darwin/quartz/xpr/x-hash.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "x-hash.h"
 #include "x-list.h"
 #include <stdlib.h>

hw/darwin/quartz/xpr/x-hook.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "x-hook.h"
 #include <stdlib.h>
 #include <assert.h>

hw/darwin/quartz/xpr/x-list.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "x-list.h"
 #include <stdlib.h>
 #include <assert.h>

hw/darwin/quartz/xpr/xprAppleWM.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "xpr.h"
 #include "quartz/applewmExt.h"
 #include "rootless.h"

hw/darwin/quartz/xpr/xprCursor.c

@@ -32,6 +32,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "xpr.h"
 #include "darwin.h"

hw/darwin/quartz/xpr/xprFrame.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "xpr.h"
 #include "rootlessCommon.h"
 #include "Xplugin.h"

hw/darwin/quartz/xpr/xprScreen.c

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "quartz/quartz.h"
 #include "xpr.h"

hw/darwin/utils/Makefile.am

@@ -9,4 +9,3 @@ man1_MANS = dumpkeymap.man
 EXTRA_DIST = \
 	     README.txt \
 	     dumpkeymap.man
-