From bc65a243930e4b02f06a861495420b0a120eae8c Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 5 Dec 2007 19:43:49 -0800 Subject: [PATCH] Darwin: Flattened quartz into darwin, renamed darwin xquartz Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2) --- configure.ac | 7 ++--- hw/Makefile.am | 4 +-- hw/darwin/Makefile.am | 21 -------------- hw/{darwin/quartz => xquartz}/Makefile.am | 26 ++++++++++++------ .../quartz => xquartz}/X11Application.h | 0 .../quartz => xquartz}/X11Application.m | 0 hw/{darwin/quartz => xquartz}/X11Controller.h | 0 hw/{darwin/quartz => xquartz}/X11Controller.m | 0 hw/{darwin/quartz => xquartz}/applewm.c | 0 hw/{darwin/quartz => xquartz}/applewmExt.h | 0 .../bundle}/English.lproj/InfoPlist.strings | Bin .../bundle}/English.lproj/Localizable.strings | Bin .../English.lproj/main.nib/classes.nib | 0 .../bundle}/English.lproj/main.nib/info.nib | 0 .../English.lproj/main.nib/keyedobjects.nib | Bin .../apple => xquartz/bundle}/Info.plist | 0 .../apple => xquartz/bundle}/Makefile.am | 0 .../quartz/apple => xquartz/bundle}/X11.icns | Bin .../bundle}/X11.xcodeproj/project.pbxproj | 0 .../apple => xquartz/bundle}/bundle-main.c | 0 .../apple => xquartz/bundle}/launcher-main.c | 0 .../apple => xquartz/bundle}/org.x.X11.plist | 0 .../apple => xquartz/bundle}/server-main.c | 0 hw/{darwin => xquartz}/darwin.c | 0 hw/{darwin => xquartz}/darwin.h | 0 hw/{darwin => xquartz}/darwinClut8.h | 0 hw/{darwin => xquartz}/darwinEvents.c | 0 hw/{darwin => xquartz}/darwinKeyboard.c | 0 hw/{darwin => xquartz}/darwinKeyboard.h | 2 +- hw/{darwin => xquartz}/darwinXinput.c | 0 hw/{darwin/quartz => xquartz}/keysym2ucs.c | 0 hw/{darwin/quartz => xquartz}/keysym2ucs.h | 0 hw/{darwin/quartz => xquartz}/pseudoramiX.c | 0 hw/{darwin/quartz => xquartz}/pseudoramiX.h | 0 hw/{darwin/quartz => xquartz}/quartz.c | 0 hw/{darwin/quartz => xquartz}/quartz.h | 0 hw/{darwin/quartz => xquartz}/quartzAudio.c | 0 hw/{darwin/quartz => xquartz}/quartzAudio.h | 0 hw/{darwin/quartz => xquartz}/quartzCocoa.m | 0 hw/{darwin/quartz => xquartz}/quartzCommon.h | 0 hw/{darwin/quartz => xquartz}/quartzCursor.c | 0 hw/{darwin/quartz => xquartz}/quartzCursor.h | 0 .../quartz => xquartz}/quartzKeyboard.c | 2 +- .../quartzKeyboard.h} | 6 ++-- .../quartz => xquartz}/quartzPasteboard.c | 0 .../quartz => xquartz}/quartzPasteboard.h | 0 hw/{darwin/quartz => xquartz}/quartzStartup.c | 0 hw/{darwin/quartz => xquartz}/xpr/Makefile.am | 5 ++-- hw/{darwin/quartz => xquartz}/xpr/Xplugin.h | 0 hw/{darwin/quartz => xquartz}/xpr/Xquartz.man | 0 hw/{darwin/quartz => xquartz}/xpr/appledri.c | 0 hw/{darwin/quartz => xquartz}/xpr/appledri.h | 0 .../quartz => xquartz}/xpr/appledristr.h | 0 hw/{darwin/quartz => xquartz}/xpr/dri.c | 0 hw/{darwin/quartz => xquartz}/xpr/dri.h | 0 hw/{darwin/quartz => xquartz}/xpr/dristruct.h | 0 hw/{darwin/quartz => xquartz}/xpr/x-hash.c | 0 hw/{darwin/quartz => xquartz}/xpr/x-hash.h | 0 hw/{darwin/quartz => xquartz}/xpr/x-hook.c | 0 hw/{darwin/quartz => xquartz}/xpr/x-hook.h | 0 hw/{darwin/quartz => xquartz}/xpr/x-list.c | 0 hw/{darwin/quartz => xquartz}/xpr/x-list.h | 0 hw/{darwin/quartz => xquartz}/xpr/xpr.h | 0 .../quartz => xquartz}/xpr/xprAppleWM.c | 2 +- hw/{darwin/quartz => xquartz}/xpr/xprCursor.c | 2 +- hw/{darwin/quartz => xquartz}/xpr/xprFrame.c | 2 +- hw/{darwin/quartz => xquartz}/xpr/xprScreen.c | 8 +++--- 67 files changed, 36 insertions(+), 51 deletions(-) delete mode 100644 hw/darwin/Makefile.am rename hw/{darwin/quartz => xquartz}/Makefile.am (59%) rename hw/{darwin/quartz => xquartz}/X11Application.h (100%) rename hw/{darwin/quartz => xquartz}/X11Application.m (100%) rename hw/{darwin/quartz => xquartz}/X11Controller.h (100%) rename hw/{darwin/quartz => xquartz}/X11Controller.m (100%) rename hw/{darwin/quartz => xquartz}/applewm.c (100%) rename hw/{darwin/quartz => xquartz}/applewmExt.h (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/InfoPlist.strings (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/Localizable.strings (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/classes.nib (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/info.nib (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/keyedobjects.nib (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/Info.plist (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/Makefile.am (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/X11.icns (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/X11.xcodeproj/project.pbxproj (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/bundle-main.c (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/launcher-main.c (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/org.x.X11.plist (100%) rename hw/{darwin/quartz/apple => xquartz/bundle}/server-main.c (100%) rename hw/{darwin => xquartz}/darwin.c (100%) rename hw/{darwin => xquartz}/darwin.h (100%) rename hw/{darwin => xquartz}/darwinClut8.h (100%) rename hw/{darwin => xquartz}/darwinEvents.c (100%) rename hw/{darwin => xquartz}/darwinKeyboard.c (100%) rename hw/{darwin => xquartz}/darwinKeyboard.h (98%) rename hw/{darwin => xquartz}/darwinXinput.c (100%) rename hw/{darwin/quartz => xquartz}/keysym2ucs.c (100%) rename hw/{darwin/quartz => xquartz}/keysym2ucs.h (100%) rename hw/{darwin/quartz => xquartz}/pseudoramiX.c (100%) rename hw/{darwin/quartz => xquartz}/pseudoramiX.h (100%) rename hw/{darwin/quartz => xquartz}/quartz.c (100%) rename hw/{darwin/quartz => xquartz}/quartz.h (100%) rename hw/{darwin/quartz => xquartz}/quartzAudio.c (100%) rename hw/{darwin/quartz => xquartz}/quartzAudio.h (100%) rename hw/{darwin/quartz => xquartz}/quartzCocoa.m (100%) rename hw/{darwin/quartz => xquartz}/quartzCommon.h (100%) rename hw/{darwin/quartz => xquartz}/quartzCursor.c (100%) rename hw/{darwin/quartz => xquartz}/quartzCursor.h (100%) rename hw/{darwin/quartz => xquartz}/quartzKeyboard.c (99%) rename hw/{darwin/darwinKeyboard_interface.h => xquartz/quartzKeyboard.h} (94%) rename hw/{darwin/quartz => xquartz}/quartzPasteboard.c (100%) rename hw/{darwin/quartz => xquartz}/quartzPasteboard.h (100%) rename hw/{darwin/quartz => xquartz}/quartzStartup.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/Makefile.am (92%) rename hw/{darwin/quartz => xquartz}/xpr/Xplugin.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/Xquartz.man (100%) rename hw/{darwin/quartz => xquartz}/xpr/appledri.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/appledri.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/appledristr.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/dri.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/dri.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/dristruct.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-hash.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-hash.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-hook.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-hook.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-list.c (100%) rename hw/{darwin/quartz => xquartz}/xpr/x-list.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/xpr.h (100%) rename hw/{darwin/quartz => xquartz}/xpr/xprAppleWM.c (98%) rename hw/{darwin/quartz => xquartz}/xpr/xprCursor.c (99%) rename hw/{darwin/quartz => xquartz}/xpr/xprFrame.c (99%) rename hw/{darwin/quartz => xquartz}/xpr/xprScreen.c (98%) diff --git a/configure.ac b/configure.ac index 04ce6f4c7..5bc3d8032 100644 --- a/configure.ac +++ b/configure.ac @@ -2170,10 +2170,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 diff --git a/hw/Makefile.am b/hw/Makefile.am index 0e65f7106..abdeabb01 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -31,7 +31,7 @@ XPRINT_SUBDIRS = xprint endif if XQUARTZ -XQUARTZ_SUBDIRS = darwin +XQUARTZ_SUBDIRS = xquartz endif SUBDIRS = \ @@ -45,7 +45,7 @@ SUBDIRS = \ $(KDRIVE_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 diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am deleted file mode 100644 index 3f29a8174..000000000 --- a/hw/darwin/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LTLIBRARIES = libXdarwin.la -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = \ - -DINXQUARTZ \ - -DUSE_NEW_CLUT \ - -DXFree86Server - -SUBDIRS = . quartz - -libXdarwin_la_SOURCES = \ - darwin.c \ - darwinEvents.c \ - darwinKeyboard.c \ - darwinXinput.c \ - $(top_srcdir)/fb/fbcmap_mi.c \ - $(top_srcdir)/mi/miinitext.c - -EXTRA_DIST = \ - darwinClut8.h \ - darwin.h \ - darwinKeyboard.h diff --git a/hw/darwin/quartz/Makefile.am b/hw/xquartz/Makefile.am similarity index 59% rename from hw/darwin/quartz/Makefile.am rename to hw/xquartz/Makefile.am index 38f48d0e2..725d20f6c 100644 --- a/hw/darwin/quartz/Makefile.am +++ b/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 \ diff --git a/hw/darwin/quartz/X11Application.h b/hw/xquartz/X11Application.h similarity index 100% rename from hw/darwin/quartz/X11Application.h rename to hw/xquartz/X11Application.h diff --git a/hw/darwin/quartz/X11Application.m b/hw/xquartz/X11Application.m similarity index 100% rename from hw/darwin/quartz/X11Application.m rename to hw/xquartz/X11Application.m diff --git a/hw/darwin/quartz/X11Controller.h b/hw/xquartz/X11Controller.h similarity index 100% rename from hw/darwin/quartz/X11Controller.h rename to hw/xquartz/X11Controller.h diff --git a/hw/darwin/quartz/X11Controller.m b/hw/xquartz/X11Controller.m similarity index 100% rename from hw/darwin/quartz/X11Controller.m rename to hw/xquartz/X11Controller.m diff --git a/hw/darwin/quartz/applewm.c b/hw/xquartz/applewm.c similarity index 100% rename from hw/darwin/quartz/applewm.c rename to hw/xquartz/applewm.c diff --git a/hw/darwin/quartz/applewmExt.h b/hw/xquartz/applewmExt.h similarity index 100% rename from hw/darwin/quartz/applewmExt.h rename to hw/xquartz/applewmExt.h diff --git a/hw/darwin/quartz/apple/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/English.lproj/InfoPlist.strings similarity index 100% rename from hw/darwin/quartz/apple/English.lproj/InfoPlist.strings rename to hw/xquartz/bundle/English.lproj/InfoPlist.strings diff --git a/hw/darwin/quartz/apple/English.lproj/Localizable.strings b/hw/xquartz/bundle/English.lproj/Localizable.strings similarity index 100% rename from hw/darwin/quartz/apple/English.lproj/Localizable.strings rename to hw/xquartz/bundle/English.lproj/Localizable.strings diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib b/hw/xquartz/bundle/English.lproj/main.nib/classes.nib similarity index 100% rename from hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib rename to hw/xquartz/bundle/English.lproj/main.nib/classes.nib diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/info.nib b/hw/xquartz/bundle/English.lproj/main.nib/info.nib similarity index 100% rename from hw/darwin/quartz/apple/English.lproj/main.nib/info.nib rename to hw/xquartz/bundle/English.lproj/main.nib/info.nib diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib similarity index 100% rename from hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib rename to hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib diff --git a/hw/darwin/quartz/apple/Info.plist b/hw/xquartz/bundle/Info.plist similarity index 100% rename from hw/darwin/quartz/apple/Info.plist rename to hw/xquartz/bundle/Info.plist diff --git a/hw/darwin/quartz/apple/Makefile.am b/hw/xquartz/bundle/Makefile.am similarity index 100% rename from hw/darwin/quartz/apple/Makefile.am rename to hw/xquartz/bundle/Makefile.am diff --git a/hw/darwin/quartz/apple/X11.icns b/hw/xquartz/bundle/X11.icns similarity index 100% rename from hw/darwin/quartz/apple/X11.icns rename to hw/xquartz/bundle/X11.icns diff --git a/hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj similarity index 100% rename from hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj rename to hw/xquartz/bundle/X11.xcodeproj/project.pbxproj diff --git a/hw/darwin/quartz/apple/bundle-main.c b/hw/xquartz/bundle/bundle-main.c similarity index 100% rename from hw/darwin/quartz/apple/bundle-main.c rename to hw/xquartz/bundle/bundle-main.c diff --git a/hw/darwin/quartz/apple/launcher-main.c b/hw/xquartz/bundle/launcher-main.c similarity index 100% rename from hw/darwin/quartz/apple/launcher-main.c rename to hw/xquartz/bundle/launcher-main.c diff --git a/hw/darwin/quartz/apple/org.x.X11.plist b/hw/xquartz/bundle/org.x.X11.plist similarity index 100% rename from hw/darwin/quartz/apple/org.x.X11.plist rename to hw/xquartz/bundle/org.x.X11.plist diff --git a/hw/darwin/quartz/apple/server-main.c b/hw/xquartz/bundle/server-main.c similarity index 100% rename from hw/darwin/quartz/apple/server-main.c rename to hw/xquartz/bundle/server-main.c diff --git a/hw/darwin/darwin.c b/hw/xquartz/darwin.c similarity index 100% rename from hw/darwin/darwin.c rename to hw/xquartz/darwin.c diff --git a/hw/darwin/darwin.h b/hw/xquartz/darwin.h similarity index 100% rename from hw/darwin/darwin.h rename to hw/xquartz/darwin.h diff --git a/hw/darwin/darwinClut8.h b/hw/xquartz/darwinClut8.h similarity index 100% rename from hw/darwin/darwinClut8.h rename to hw/xquartz/darwinClut8.h diff --git a/hw/darwin/darwinEvents.c b/hw/xquartz/darwinEvents.c similarity index 100% rename from hw/darwin/darwinEvents.c rename to hw/xquartz/darwinEvents.c diff --git a/hw/darwin/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c similarity index 100% rename from hw/darwin/darwinKeyboard.c rename to hw/xquartz/darwinKeyboard.c diff --git a/hw/darwin/darwinKeyboard.h b/hw/xquartz/darwinKeyboard.h similarity index 98% rename from hw/darwin/darwinKeyboard.h rename to hw/xquartz/darwinKeyboard.h index 12104418e..5cf64c7d1 100644 --- a/hw/darwin/darwinKeyboard.h +++ b/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; diff --git a/hw/darwin/darwinXinput.c b/hw/xquartz/darwinXinput.c similarity index 100% rename from hw/darwin/darwinXinput.c rename to hw/xquartz/darwinXinput.c diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/xquartz/keysym2ucs.c similarity index 100% rename from hw/darwin/quartz/keysym2ucs.c rename to hw/xquartz/keysym2ucs.c diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/xquartz/keysym2ucs.h similarity index 100% rename from hw/darwin/quartz/keysym2ucs.h rename to hw/xquartz/keysym2ucs.h diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c similarity index 100% rename from hw/darwin/quartz/pseudoramiX.c rename to hw/xquartz/pseudoramiX.c diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/xquartz/pseudoramiX.h similarity index 100% rename from hw/darwin/quartz/pseudoramiX.h rename to hw/xquartz/pseudoramiX.h diff --git a/hw/darwin/quartz/quartz.c b/hw/xquartz/quartz.c similarity index 100% rename from hw/darwin/quartz/quartz.c rename to hw/xquartz/quartz.c diff --git a/hw/darwin/quartz/quartz.h b/hw/xquartz/quartz.h similarity index 100% rename from hw/darwin/quartz/quartz.h rename to hw/xquartz/quartz.h diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/xquartz/quartzAudio.c similarity index 100% rename from hw/darwin/quartz/quartzAudio.c rename to hw/xquartz/quartzAudio.c diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/xquartz/quartzAudio.h similarity index 100% rename from hw/darwin/quartz/quartzAudio.h rename to hw/xquartz/quartzAudio.h diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m similarity index 100% rename from hw/darwin/quartz/quartzCocoa.m rename to hw/xquartz/quartzCocoa.m diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/xquartz/quartzCommon.h similarity index 100% rename from hw/darwin/quartz/quartzCommon.h rename to hw/xquartz/quartzCommon.h diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/xquartz/quartzCursor.c similarity index 100% rename from hw/darwin/quartz/quartzCursor.c rename to hw/xquartz/quartzCursor.c diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/xquartz/quartzCursor.h similarity index 100% rename from hw/darwin/quartz/quartzCursor.h rename to hw/xquartz/quartzCursor.h diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c similarity index 99% rename from hw/darwin/quartz/quartzKeyboard.c rename to hw/xquartz/quartzKeyboard.c index c69fb9f96..0a50d06ac 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -40,7 +40,7 @@ #include #include -#include "darwinKeyboard_interface.h" +#include "quartzKeyboard.h" #include "X11/keysym.h" #include "keysym2ucs.h" diff --git a/hw/darwin/darwinKeyboard_interface.h b/hw/xquartz/quartzKeyboard.h similarity index 94% rename from hw/darwin/darwinKeyboard_interface.h rename to hw/xquartz/quartzKeyboard.h index f41f46318..f27fcdeac 100644 --- a/hw/darwin/darwinKeyboard_interface.h +++ b/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 */ diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/xquartz/quartzPasteboard.c similarity index 100% rename from hw/darwin/quartz/quartzPasteboard.c rename to hw/xquartz/quartzPasteboard.c diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/xquartz/quartzPasteboard.h similarity index 100% rename from hw/darwin/quartz/quartzPasteboard.h rename to hw/xquartz/quartzPasteboard.h diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/xquartz/quartzStartup.c similarity index 100% rename from hw/darwin/quartz/quartzStartup.c rename to hw/xquartz/quartzStartup.c diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am similarity index 92% rename from hw/darwin/quartz/xpr/Makefile.am rename to hw/xquartz/xpr/Makefile.am index 769662276..3cc2aba12 100644 --- a/hw/darwin/quartz/xpr/Makefile.am +++ b/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 \ diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/xquartz/xpr/Xplugin.h similarity index 100% rename from hw/darwin/quartz/xpr/Xplugin.h rename to hw/xquartz/xpr/Xplugin.h diff --git a/hw/darwin/quartz/xpr/Xquartz.man b/hw/xquartz/xpr/Xquartz.man similarity index 100% rename from hw/darwin/quartz/xpr/Xquartz.man rename to hw/xquartz/xpr/Xquartz.man diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c similarity index 100% rename from hw/darwin/quartz/xpr/appledri.c rename to hw/xquartz/xpr/appledri.c diff --git a/hw/darwin/quartz/xpr/appledri.h b/hw/xquartz/xpr/appledri.h similarity index 100% rename from hw/darwin/quartz/xpr/appledri.h rename to hw/xquartz/xpr/appledri.h diff --git a/hw/darwin/quartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h similarity index 100% rename from hw/darwin/quartz/xpr/appledristr.h rename to hw/xquartz/xpr/appledristr.h diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/xquartz/xpr/dri.c similarity index 100% rename from hw/darwin/quartz/xpr/dri.c rename to hw/xquartz/xpr/dri.c diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/xquartz/xpr/dri.h similarity index 100% rename from hw/darwin/quartz/xpr/dri.h rename to hw/xquartz/xpr/dri.h diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/xquartz/xpr/dristruct.h similarity index 100% rename from hw/darwin/quartz/xpr/dristruct.h rename to hw/xquartz/xpr/dristruct.h diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/xquartz/xpr/x-hash.c similarity index 100% rename from hw/darwin/quartz/xpr/x-hash.c rename to hw/xquartz/xpr/x-hash.c diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/xquartz/xpr/x-hash.h similarity index 100% rename from hw/darwin/quartz/xpr/x-hash.h rename to hw/xquartz/xpr/x-hash.h diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c similarity index 100% rename from hw/darwin/quartz/xpr/x-hook.c rename to hw/xquartz/xpr/x-hook.c diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/xquartz/xpr/x-hook.h similarity index 100% rename from hw/darwin/quartz/xpr/x-hook.h rename to hw/xquartz/xpr/x-hook.h diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c similarity index 100% rename from hw/darwin/quartz/xpr/x-list.c rename to hw/xquartz/xpr/x-list.c diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/xquartz/xpr/x-list.h similarity index 100% rename from hw/darwin/quartz/xpr/x-list.h rename to hw/xquartz/xpr/x-list.h diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h similarity index 100% rename from hw/darwin/quartz/xpr/xpr.h rename to hw/xquartz/xpr/xpr.h diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c similarity index 98% rename from hw/darwin/quartz/xpr/xprAppleWM.c rename to hw/xquartz/xpr/xprAppleWM.c index 5539c51cc..bd82df03c 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/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 diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c similarity index 99% rename from hw/darwin/quartz/xpr/xprCursor.c rename to hw/xquartz/xpr/xprCursor.c index 160b5d908..db195a8ec 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -33,7 +33,7 @@ #include #endif -#include "quartz/quartzCommon.h" +#include "quartzCommon.h" #include "xpr.h" #include "darwin.h" #include "Xplugin.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c similarity index 99% rename from hw/darwin/quartz/xpr/xprFrame.c rename to hw/xquartz/xpr/xprFrame.c index 1b0ba9102..2d97f2754 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/xquartz/xpr/xprFrame.c @@ -36,7 +36,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" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c similarity index 98% rename from hw/darwin/quartz/xpr/xprScreen.c rename to hw/xquartz/xpr/xprScreen.c index 28ed159fe..068b7b177 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -31,17 +31,17 @@ #include #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);