Darwin: Flattened quartz into darwin, renamed darwin xquartz

Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point

configure.ac

@@ -2027,10 +2027,9 @@ hw/xgl/glxext/Makefile
 hw/xgl/glxext/module/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
-hw/darwin/Makefile
-hw/darwin/quartz/Makefile
-hw/darwin/quartz/apple/Makefile
-hw/darwin/quartz/xpr/Makefile
+hw/xquartz/Makefile
+hw/xquartz/bundle/Makefile
+hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
 hw/kdrive/chips/Makefile

hw/Makefile.am

@@ -23,7 +23,7 @@ XPRINT_SUBDIRS = xprint
 endif
 
 if XQUARTZ
-DARWIN_SUBDIRS = darwin
+DARWIN_SUBDIRS = xquartz
 endif
 
 SUBDIRS =			\
@@ -37,7 +37,7 @@ SUBDIRS =			\
         $(DARWIN_SUBDIRS)	\
 	$(XPRINT_SUBDIRS)
 
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
 
 relink:
 	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done

hw/darwin/Makefile.am

@@ -1,22 +0,0 @@
-noinst_LTLIBRARIES = libXdarwin.la
-AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_CPPFLAGS = \
-	-DBUILD_DATE=\"$(BUILD_DATE)\" \
-	-DINXQUARTZ \
-	-DUSE_NEW_CLUT \
-	-DXFree86Server
-
-SUBDIRS = . quartz
-
-libXdarwin_la_SOURCES = \
-	darwin.c \
-	darwinEvents.c \
-	darwinKeyboard.c \
-	darwinXinput.c \
-	$(top_srcdir)/fb/fbcmap.c \
-	$(top_srcdir)/mi/miinitext.c
-
-EXTRA_DIST = \
-	darwinClut8.h \
-	darwin.h \
-	darwinKeyboard.h

hw/xquartz/Makefile.am

@@ -1,24 +1,29 @@
-noinst_LTLIBRARIES = libXQuartz.la
-
+noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-
-# TODO: This should not pull in rootless... rootless should all be in xpr
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
 if X11APP
-X11APP_SUBDIRS = apple
+X11APP_SUBDIRS = bundle
 endif
 
 SUBDIRS = . xpr $(X11APP_SUBDIRS)
-DIST_SUBDIRS = xpr apple
+DIST_SUBDIRS = xpr bundle
 
-libXQuartz_la_SOURCES = \
+libXquartz_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/mi/miinitext.c \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
+	darwin.c \
+	darwinEvents.c \
+	darwinKeyboard.c \
+	darwinXinput.c \
 	keysym2ucs.c \
 	pseudoramiX.c \
 	quartz.c \
@@ -32,6 +37,9 @@ EXTRA_DIST = \
 	X11Application.h \
 	X11Controller.h \
 	applewmExt.h \
+	darwinClut8.h \
+	darwin.h \
+	darwinKeyboard.h \
 	keysym2ucs.h \
 	pseudoramiX.h \
 	quartzAudio.h \

hw/xquartz/darwinKeyboard.h

@@ -27,7 +27,7 @@
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 
 /* Provided for darwinEvents.c */
 extern darwinKeyboardInfo keyInfo;

hw/xquartz/quartzKeyboard.c

@@ -40,7 +40,7 @@
 #include <CoreServices/CoreServices.h>
 #include <Carbon/Carbon.h>
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 #include "X11/keysym.h"
 #include "keysym2ucs.h"
 

hw/xquartz/quartzKeyboard.h

@@ -24,8 +24,8 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#ifndef DARWIN_KEYBOARD_INTERFACE_H
-#define DARWIN_KEYBOARD_INTERFACE_H 1
+#ifndef QUARTZ_KEYBOARD_H
+#define QUARTZ_KEYBOARD_H 1
 
 #define XK_TECHNICAL		// needed to get XK_Escape
 #define XK_PUBLISHING
@@ -49,4 +49,4 @@ void DarwinKeyboardReload(DeviceIntPtr pDev);
 Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
 unsigned int DarwinModeSystemKeymapSeed(void);
 
-#endif /* DARWIN_KEYBOARD_INTERFACE_H */
+#endif /* QUARTZ_KEYBOARD_H */

hw/xquartz/xpr/Makefile.am

@@ -5,7 +5,7 @@ man1_MANS = Xquartz.man
 
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(srcdir) -I$(srcdir)/.. \
 	-I$(top_srcdir)/miext \
 	-I$(top_srcdir)/miext/rootless \
 	-I$(top_srcdir)/miext/rootless/safeAlpha
@@ -22,8 +22,7 @@ Xquartz_SOURCES = \
 	x-list.c
 
 Xquartz_LDADD = \
-	$(top_builddir)/hw/darwin/quartz/libXquartz.la \
-	$(top_builddir)/hw/darwin/libXdarwin.la \
+	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/dix/libdix.la \
 	$(top_builddir)/os/libos.la \

hw/xquartz/xpr/xprAppleWM.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "xpr.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 #include "rootless.h"
 #include "Xplugin.h"
 #include <X11/X.h>

hw/xquartz/xpr/xprCursor.c

@@ -33,7 +33,7 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
+#include "quartzCommon.h"
 #include "xpr.h"
 #include "darwin.h"
 #include "Xplugin.h"

hw/xquartz/xpr/xprFrame.c

@@ -37,7 +37,7 @@
 #include "Xplugin.h"
 #include "x-hash.h"
 #include "x-list.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 #include "propertyst.h"
 #include "dix.h"

hw/xquartz/xpr/xprScreen.c

@@ -31,17 +31,17 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
-#include "quartz/quartz.h"
+#include "quartzCommon.h"
+#include "quartz.h"
 #include "xpr.h"
-#include "quartz/pseudoramiX.h"
+#include "pseudoramiX.h"
 #include "darwin.h"
 #include "rootless.h"
 #include "safeAlpha/safeAlpha.h"
 #include "dri.h"
 #include "globals.h"
 #include "Xplugin.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 // From xprFrame.c
 WindowPtr xprGetXWindow(xp_window_id wid);