X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcdir.c;h=f927c0b280bba171b805a86a1c961df2c9fdced9;hb=dffcb2a083bc5f959ed96dbdf0f365ebc0e710cc;hp=4463b3130cceba58000af27378d3708b2c3853e8;hpb=65448e8b2af9bec38f86ab45916a9bcc7726ae30;p=fontconfig.git diff --git a/src/fcdir.c b/src/fcdir.c index 4463b31..f927c0b 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 * @@ -13,9 +13,9 @@ * 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 @@ -30,31 +30,22 @@ FcFileIsDir (const FcChar8 *file) { struct stat statb; - if (stat ((const char *) file, &statb) != 0) + if (FcStat ((const char *) file, &statb) != 0) return FcFalse; return S_ISDIR(statb.st_mode); } -FcBool -FcFileScanConfig (FcFontSet *set, - FcStrSet *dirs, - FcGlobalCache *cache, - FcBlanks *blanks, - const FcChar8 *file, - FcBool force, - FcConfig *config) +static FcBool +FcFileScanFontConfig (FcFontSet *set, + FcBlanks *blanks, + const FcChar8 *file, + FcConfig *config) { - int id; - FcPattern *font; - FcBool ret = FcTrue; - int count = 0; + FcPattern *font; + FcBool ret = FcTrue; + int id; + int count = 0; - if (config && !FcConfigAcceptFilename (config, file)) - return FcTrue; - - if (FcFileIsDir (file)) - return FcStrSetAdd (dirs, file); - id = 0; do { @@ -70,15 +61,31 @@ FcFileScanConfig (FcFontSet *set, font = FcFreeTypeQuery (file, id, blanks, &count); if (FcDebug () & FC_DBG_SCAN) printf ("done\n"); + + /* + * Edit pattern with user-defined rules + */ + if (font && config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan)) + { + FcPatternDestroy (font); + font = NULL; + ret = FcFalse; + } + /* * Add the font */ if (font && (!config || FcConfigAcceptFont (config, 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; } } @@ -89,78 +96,70 @@ FcFileScanConfig (FcFontSet *set, return ret; } +FcBool +FcFileScanConfig (FcFontSet *set, + FcStrSet *dirs, + FcBlanks *blanks, + const FcChar8 *file, + FcConfig *config) +{ + if (FcFileIsDir (file)) + return FcStrSetAdd (dirs, file); + else + return FcFileScanFontConfig (set, blanks, file, config); +} + FcBool FcFileScan (FcFontSet *set, FcStrSet *dirs, - FcGlobalCache *cache, + FcFileCache *cache, /* XXX unused */ FcBlanks *blanks, const FcChar8 *file, FcBool force) { - return FcFileScanConfig (set, dirs, cache, 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, - FcGlobalCache *cache, FcBlanks *blanks, - const FcChar8 *dir, - FcBool force, + const FcChar8 *dir, + FcBool force, /* XXX unused */ FcConfig *config) { DIR *d; struct dirent *e; - FcChar8 **dirlist; - int dirlistlen, dirlistalloc; + FcStrSet *files; FcChar8 *file; - const FcChar8 *d_can = 0; FcChar8 *base; FcBool ret = FcTrue; - FcFontSet *tmpSet; int i; - if (config && !FcConfigAcceptFilename (config, dir)) - return FcTrue; + if (!force) + return FcFalse; - if (config) - d_can = FcConfigNormalizeFontDir (config, dir); - if (d_can) - dir = d_can; + if (!set && !dirs) + return FcTrue; - if (!force) - { - /* - * Check ~/.fonts.cache- file - */ - if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config)) - return FcTrue; + if (!blanks) + blanks = FcConfigGetBlanks (config); - if (FcDirCacheValid (dir) && - FcDirCacheHasCurrentArch (dir) && - FcDirCacheRead (set, dirs, dir, config)) - return FcTrue; - } - /* 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, "/"); @@ -172,24 +171,14 @@ FcDirScanConfig (FcFontSet *set, d = opendir ((char *) dir); if (!d) { - free (file); /* Don't complain about missing directories */ - if (errno == ENOENT) - return FcTrue; - return FcFalse; + if (errno != ENOENT) + ret = FcFalse; + goto bail; } - tmpSet = FcFontSetCreate(); - if (!tmpSet) - { - ret = FcFalse; - goto bail0; - } - - dirlistlen = 0; - dirlistalloc = 8; - dirlist = malloc(dirlistalloc * sizeof(FcChar8 *)); - if (!dirlist) + files = FcStrSetCreate (); + if (!files) { ret = FcFalse; goto bail1; @@ -198,84 +187,142 @@ FcDirScanConfig (FcFontSet *set, { if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN) { - if (dirlistlen == dirlistalloc) - { - FcChar8 **tmp_dirlist; - - dirlistalloc *= 2; - tmp_dirlist = realloc(dirlist, - dirlistalloc * sizeof(FcChar8 *)); - if (!tmp_dirlist) - { - ret = FcFalse; - goto bail2; - } - dirlist = tmp_dirlist; - } - dirlist[dirlistlen] = malloc(strlen (e->d_name) + 1); - if (!dirlist[dirlistlen]) - { + strcpy ((char *) base, (char *) e->d_name); + if (!FcStrSetAdd (files, file)) { ret = FcFalse; goto bail2; } - strcpy((char *)dirlist[dirlistlen], e->d_name); - dirlistlen++; } } - qsort(dirlist, dirlistlen, sizeof(FcChar8 *), cmpstringp); - i = 0; - while (ret && i < dirlistlen) - { - strcpy ((char *) base, (char *) dirlist[i]); - ret = FcFileScanConfig (tmpSet, dirs, cache, blanks, file, force, config); - i++; - } + /* - * Now that the directory has been scanned, - * add the cache entry + * Sort files to make things prettier */ - if (ret && cache) - FcGlobalCacheUpdate (cache, dirs, (char *)dir, tmpSet, config); + qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp); - for (i = 0; i < tmpSet->nfont; i++) - FcFontSetAdd (set, tmpSet->fonts[i]); - - if (tmpSet->fonts) - { - FcMemFree (FC_MEM_FONTPTR, tmpSet->sfont * sizeof (FcPattern *)); - free (tmpSet->fonts); - } - FcMemFree (FC_MEM_FONTSET, sizeof (FcFontSet)); - - bail2: - for (i = 0; i < dirlistlen; i++) - free(dirlist[i]); - - free (dirlist); - - bail1: - free (tmpSet); + /* + * Scan file files to build font patterns + */ + for (i = 0; i < files->num; i++) + FcFileScanConfig (set, dirs, blanks, files->strs[i], config); - bail0: +bail2: + FcStrSetDestroy (files); +bail1: closedir (d); - - free (file); +bail: return ret; } FcBool FcDirScan (FcFontSet *set, FcStrSet *dirs, - FcGlobalCache *cache, + FcFileCache *cache, /* XXX unused */ FcBlanks *blanks, const FcChar8 *dir, - FcBool force) + FcBool force /* XXX unused */) { - return FcDirScanConfig (set, dirs, cache, blanks, dir, force, 0); + 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; + FcBool ret = FcTrue; + FcFontSet *set; + FcCache *cache = NULL; + struct stat dir_stat; + + if (FcDebug () & FC_DBG_FONTSET) + printf ("cache scan dir %s\n", dir); + + if (FcStat ((char *) dir, &dir_stat) < 0) + { + if (errno != ENOENT) + ret = FcFalse; + goto bail; + } + + set = FcFontSetCreate(); + if (!set) + { + ret = FcFalse; + goto bail; + } + + dirs = FcStrSetCreate (); + if (!dirs) + { + ret = FcFalse; + goto bail1; + } + + /* + * Scan the dir + */ + if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) + { + ret = FcFalse; + goto bail2; + } + + /* + * Build the cache object + */ + cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); + if (!cache) + { + ret = FcFalse; + 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) +{ + FcCache *cache = NULL; + + if (config && !FcConfigAcceptFilename (config, dir)) + return 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); + return FcFalse; /* XXX deprecated */ } +#define __fcdir__ +#include "fcaliastail.h" +#undef __fcdir__