diff options
| author | Jeremy Huddleston <jeremy@yuffie.local> | 2007-12-03 19:57:26 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@yuffie.local> | 2007-12-03 19:57:26 -0800 |
| commit | 3b064b7206a84aae873743b706c41324a67c1f2c (patch) | |
| tree | 8eb0482bd544ed634428bc50c835848c5aae6cf8 | |
| parent | e2963ff8acb7e20aab1f8e31a656f4553dda208a (diff) | |
Added some support for Xquartz on OS-X.
| -rw-r--r-- | xinit.c | 7 | ||||
| -rw-r--r-- | xinitrc.cpp | 5 |
2 files changed, 8 insertions, 4 deletions
@@ -136,12 +136,11 @@ const char * const server_names[] = { #ifdef XORG "Xorg Common X server for most displays", #endif -#ifdef __DARWIN__ - "XDarwin Darwin/Mac OS X IOKit displays", - "XDarwinQuartz Mac OS X Quartz displays", - "XDarwinStartup Auto-select between XDarwin and XDarwinQuartz", +#ifdef __APPLE__ + "Xquartz Mac OSX Quartz displays.", #endif "Xvfb Virtual frame buffer", + "Xfake kdrive-based virtual frame buffer", "Xnest X server nested in a window on another X server", "Xephyr kdrive-based nested X server", NULL}; diff --git a/xinitrc.cpp b/xinitrc.cpp index 4f52f13..c24bcd0 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -68,6 +68,11 @@ fi XCOMM This is the fallback case if nothing else is executed above #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ + +#ifdef __APPLE__ +[ -x /usr/bin/quartz-wm ] && exec /usr/bin/quartz-wm +#endif + TWM & XCLOCK -geometry 50x50-1+1 & XTERM -geometry 80x50+494+51 & |