diff options
| author | Jeremy Huddleston <jeremy@tifa.local> | 2008-02-10 02:04:16 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@tifa.local> | 2008-02-10 02:04:16 -0800 |
| commit | 4e899293d7f7bb0a67b094402fad7db55169acec (patch) | |
| tree | 882a3b3d4e2503b2119a2f66a0754a5df7227023 /xinitrc.cpp | |
| parent | 238b74a47eb66bfa24627b099bf9c6a06e91d35a (diff) | |
| download | xorg-app-xinit-4e899293d7f7bb0a67b094402fad7db55169acec.tar.gz | |
Apple: Cleaned up font path setting and added font caching to xinitrc
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index c44e0fd..01fbf17 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -87,17 +87,14 @@ 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" - if [ -d "$HOME/Library/Fonts" ] ; then - if [ ! -e $HOME/Library/Fonts/fonts.dir ] ; then - [ -x /usr/X11/bin/mkfontdir ] && mkfontdir $HOME/Library/Fonts - [ -x /usr/X11/bin/mkfontscale ] && mkfontscale $HOME/Library/Fonts - fi - [ -e $HOME/Library/Fonts/fonts.dir ] && fontpath="$fontpath,$HOME/Library/Fonts" - fi - + [ -e $HOME/.fonts/fonts.dir ] && fontpath="$fontpath,$HOME/.fonts" + [ -e $HOME/Library/Fonts/fonts.dir ] && fontpath="$fontpath,$HOME/Library/Fonts" + [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts" [ -e /Library/Fonts/fonts.dir ] && fontpath="$fontpath,/Library/Fonts" [ -e /System/Library/Fonts/fonts.dir ] && fontpath="$fontpath,/System/Library/Fonts" |