diff options
| -rw-r--r-- | startx.cpp | 25 | ||||
| -rw-r--r-- | xinitrc.cpp | 2 |
2 files changed, 24 insertions, 3 deletions
@@ -79,7 +79,30 @@ clientargs="" serverargs="" #ifdef __APPLE__ -if [ x`defaults read org.x.X11 no_auth` = x0 ] || ! defaults read org.x.X11 no_auth ; then + +XCOMM Initialize defaults (this will cut down on "safe" error messages) +if ! defaults read org.x.X11 cache_fonts >& /dev/null ; then + defaults write org.x.X11 cache_fonts -bool true +fi + +if ! defaults read org.x.X11 no_auth >& /dev/null ; then + defaults write org.x.X11 no_auth -bool false +fi + +if ! defaults read org.x.X11 nolisten_tcp >& /dev/null ; then + defaults write org.x.X11 nolisten_tcp -bool true +fi + +XCOMM First, start caching fonts +if [ x`defaults read org.x.X11 cache_fonts` = x1 ] ; then + if [ -x /usr/X11/bin/font_cache.sh ] ; then + /usr/X11/bin/font_cache.sh & + elif [ -x /usr/X11/bin/fc-cache ] ; then + /usr/X11/bin/fc-cache & + fi +fi + +if [ x`defaults read org.x.X11 no_auth` = x0 ] ; then enable_xauth=1 else enable_xauth=0 diff --git a/xinitrc.cpp b/xinitrc.cpp index 74424ad..e42002d 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -87,8 +87,6 @@ XCOMM This is the fallback case if nothing else is executed above #ifdef __APPLE__ -[ -x /usr/X11/bin/font_cache.sh ] && /usr/X11/bin/font_cache.sh - if [ -x /usr/X11/bin/xset ] ; then fontpath="/usr/X11/lib/X11/fonts/misc/,/usr/X11/lib/X11/fonts/TTF/,/usr/X11/lib/X11/fonts/OTF,/usr/X11/lib/X11/fonts/Type1/,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled,/usr/X11/lib/X11/fonts/75dpi:unscaled/,/usr/X11/lib/X11/fonts/100dpi/:unscaled" |