X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcdir.c;h=282dedd200b262b81b3c15e864fb1280b380fb4d;hb=d0471dd2faca37f7ee5997ad9db8278db0e99206;hp=62314a325984452c437d9987e6aad0b2d2c3a4ff;hpb=00f059e930f12ca7c66cf2ffbc6c4ae789912af7;p=fontconfig.git diff --git a/src/fcdir.c b/src/fcdir.c index 62314a3..282dedd 100644 --- a/src/fcdir.c +++ b/src/fcdir.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcdir.c * * Copyright © 2000 Keith Packard * @@ -7,15 +7,15 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in + * documentation, and that the name of the author(s) not be used in * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no + * specific, written prior permission. The authors make no * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -27,10 +27,16 @@ FcBool FcFileIsDir (const FcChar8 *file) +{ + return FcFileIsDir2 (FcConfigGetCurrent (), file); +} + +FcBool +FcFileIsDir2 (FcConfig *config, const FcChar8 *file) { struct stat statb; - if (stat ((const char *) file, &statb) != 0) + if (FcStat (config, file, &statb) != 0) return FcFalse; return S_ISDIR(statb.st_mode); } @@ -45,7 +51,7 @@ FcFileScanFontConfig (FcFontSet *set, FcBool ret = FcTrue; int id; int count = 0; - + id = 0; do { @@ -58,18 +64,34 @@ FcFileScanFontConfig (FcFontSet *set, printf ("\tScanning file %s...", file); fflush (stdout); } - font = FcFreeTypeQuery (file, id, blanks, &count); + font = FcFreeTypeQuery2 (config, file, id, blanks, &count); if (FcDebug () & FC_DBG_SCAN) printf ("done\n"); + + /* + * Edit pattern with user-defined rules + */ + if (font && config && !FcConfigSubstitute (config, font, FcMatchScan)) + { + FcPatternDestroy (font); + font = NULL; + ret = FcFalse; + } + /* * Add the font */ - if (font && (!config || FcConfigAcceptFont (config, font))) + if (font) { + if (FcDebug() & FC_DBG_SCANV) + { + printf ("Final font pattern:\n"); + FcPatternPrint (font); + } if (!FcFontSetAdd (set, font)) { FcPatternDestroy (font); - font = 0; + font = NULL; ret = FcFalse; } } @@ -85,13 +107,9 @@ FcFileScanConfig (FcFontSet *set, FcStrSet *dirs, FcBlanks *blanks, const FcChar8 *file, - FcBool force, FcConfig *config) { - if (config && !FcConfigAcceptFilename (config, file)) - return FcTrue; - - if (FcFileIsDir (file)) + if (FcFileIsDir2 (config, file)) return FcStrSetAdd (dirs, file); else return FcFileScanFontConfig (set, blanks, file, config); @@ -105,161 +123,109 @@ FcFileScan (FcFontSet *set, const FcChar8 *file, FcBool force) { - return FcFileScanConfig (set, dirs, blanks, file, force, 0); + return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ()); } /* * Strcmp helper that takes pointers to pointers, copied from qsort(3) manpage */ - static int cmpstringp(const void *p1, const void *p2) { return strcmp(* (char **) p1, * (char **) p2); } -/* - * Scan 'dir', adding font files to 'set' and - * subdirectories to 'dirs' - */ - FcBool FcDirScanConfig (FcFontSet *set, FcStrSet *dirs, FcBlanks *blanks, - const FcChar8 *dir, - FcBool force, + const FcChar8 *dir, + FcBool force, /* XXX unused */ FcConfig *config) { DIR *d; struct dirent *e; - FcStrSet *dirlist, *filelist; + FcStrSet *files; FcChar8 *file; FcChar8 *base; + const FcChar8 *scanDir; + FcChar8 *fullDir; FcBool ret = FcTrue; - FcFontSet *tmpSet; int i; - if (config && !FcConfigAcceptFilename (config, dir)) + if (!force) + return FcFalse; + + if (!set && !dirs) return FcTrue; - if (!force) - { - if (FcDirCacheRead (set, dirs, dir, config)) - return FcTrue; - } - - if (FcDebug () & FC_DBG_FONTSET) - printf ("cache scan dir %s\n", dir); + if (!blanks) + blanks = FcConfigGetBlanks (config); /* freed below */ file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1); - if (!file) - return FcFalse; + if (!file) { + ret = FcFalse; + goto bail; + } strcpy ((char *) file, (char *) dir); strcat ((char *) file, "/"); base = file + strlen ((char *) file); - + if (FcDebug () & FC_DBG_SCAN) printf ("\tScanning dir %s\n", dir); - - d = opendir ((char *) dir); + + fullDir = FcConfigGetRootPlus (config, dir); + if (fullDir) + scanDir = fullDir; + else + scanDir = dir; + d = opendir ((char *) scanDir); + if (fullDir) + FcStrFree (fullDir); if (!d) { - free (file); /* Don't complain about missing directories */ - if (errno == ENOENT) - return FcTrue; - return FcFalse; - } - - tmpSet = FcFontSetCreate(); - if (!tmpSet) - { - ret = FcFalse; - goto bail0; + if (errno != ENOENT) + ret = FcFalse; + goto bail; } - dirlist = FcStrSetCreate (); - if (!dirlist) + files = FcStrSetCreate (); + if (!files) { ret = FcFalse; goto bail1; } - filelist = FcStrSetCreate (); - if (!filelist) - { - ret = FcFalse; - goto bail2; - } while ((e = readdir (d))) { if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN) { strcpy ((char *) base, (char *) e->d_name); - if (FcFileIsDir (file)) { - if (!FcStrSetAdd (dirlist, file)) { - ret = FcFalse; - goto bail3; - } - } else { - if (!FcStrSetAdd (filelist, file)) { - ret = FcFalse; - goto bail3; - } + if (!FcStrSetAdd (files, file)) { + ret = FcFalse; + goto bail2; } } } - /* - * Sort files and dirs to make things prettier - */ - qsort(dirlist->strs, dirlist->num, sizeof(FcChar8 *), cmpstringp); - qsort(filelist->strs, filelist->num, sizeof(FcChar8 *), cmpstringp); - - for (i = 0; i < filelist->num; i++) - FcFileScanFontConfig (tmpSet, blanks, filelist->strs[i], config); - - if (FcShouldWriteFiles ()) - { - /* - * Now that the directory has been scanned, - * write out the cache file - */ - FcDirCacheWrite (tmpSet, dirlist, dir, config); - } /* - * Add the discovered fonts to our internal non-cache list + * Sort files to make things prettier */ - for (i = 0; i < tmpSet->nfont; i++) - FcFontSetAdd (set, tmpSet->fonts[i]); + qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp); /* - * the patterns in tmpset now belong to set; don't free them + * Scan file files to build font patterns */ - tmpSet->nfont = 0; + for (i = 0; i < files->num; i++) + FcFileScanConfig (set, dirs, blanks, files->strs[i], config); - /* - * Add the discovered directories to the list to be scanned - */ - for (i = 0; i < dirlist->num; i++) - if (!FcStrSetAdd (dirs, dirlist->strs[i])) { - ret = FcFalse; - goto bail3; - } - - bail3: - FcStrSetDestroy (filelist); - bail2: - FcStrSetDestroy (dirlist); - bail1: - FcFontSetDestroy (tmpSet); - - bail0: +bail2: + FcStrSetDestroy (files); +bail1: closedir (d); - - free (file); +bail: return ret; } @@ -269,13 +235,89 @@ FcDirScan (FcFontSet *set, FcFileCache *cache, /* XXX unused */ FcBlanks *blanks, const FcChar8 *dir, - FcBool force) + FcBool force /* XXX unused */) +{ + if (cache || !force) + return FcFalse; + + return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent ()); +} + +/* + * Scan the specified directory and construct a cache of its contents + */ +FcCache * +FcDirCacheScan (const FcChar8 *dir, FcConfig *config) +{ + FcStrSet *dirs; + FcFontSet *set; + FcCache *cache = NULL; + struct stat dir_stat; + + if (FcDebug () & FC_DBG_FONTSET) + printf ("cache scan dir %s\n", dir); + + if (FcStat (config, dir, &dir_stat) < 0) + goto bail; + + set = FcFontSetCreate(); + if (!set) + goto bail; + + dirs = FcStrSetCreate (); + if (!dirs) + goto bail1; + + /* + * Scan the dir + */ + if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) + goto bail2; + + /* + * Build the cache object + */ + cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); + if (!cache) + goto bail2; + + /* + * Write out the cache file, ignoring any troubles + */ + FcDirCacheWrite (cache, config); + + bail2: + FcStrSetDestroy (dirs); + bail1: + FcFontSetDestroy (set); + bail: + return cache; +} + +/* + * Read (or construct) the cache for a directory + */ +FcCache * +FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) { - return FcDirScanConfig (set, dirs, blanks, dir, force, 0); + FcCache *cache = NULL; + + /* Try to use existing cache file */ + if (!force) + cache = FcDirCacheLoad (dir, config, NULL); + + /* Not using existing cache file, construct new cache */ + if (!cache) + cache = FcDirCacheScan (dir, config); + + return cache; } FcBool FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir) { - return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ()); + return FcFalse; /* XXX deprecated */ } +#define __fcdir__ +#include "fcaliastail.h" +#undef __fcdir__