X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcdir.c;h=8a2b97625066eeb05eeffc014cebb8a749056441;hb=HEAD;hp=86d391b5b4ab38156e9cc6d21c4a15a696379dc7;hpb=0d9e31c810a36cddadff7572fdbb5a1b505e495e;p=fontconfig.git diff --git a/src/fcdir.c b/src/fcdir.c index 86d391b..8a2b976 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 @@ -30,7 +30,7 @@ FcFileIsDir (const FcChar8 *file) { struct stat statb; - if (stat ((const char *) file, &statb) != 0) + if (FcStat (file, &statb) != 0) return FcFalse; return S_ISDIR(statb.st_mode); } @@ -45,7 +45,7 @@ FcFileScanFontConfig (FcFontSet *set, FcBool ret = FcTrue; int id; int count = 0; - + id = 0; do { @@ -61,15 +61,31 @@ FcFileScanFontConfig (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 && !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,12 +101,8 @@ FcFileScanConfig (FcFontSet *set, FcStrSet *dirs, FcBlanks *blanks, const FcChar8 *file, - FcBool force, FcConfig *config) { - if (config && !FcConfigAcceptFilename (config, file)) - return FcTrue; - if (FcFileIsDir (file)) return FcStrSetAdd (dirs, file); else @@ -105,189 +117,209 @@ 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; - FcChar8 *canon_dir; struct dirent *e; - FcStrSet *dirlist, *filelist; + FcStrSet *files; FcChar8 *file; FcChar8 *base; FcBool ret = FcTrue; - FcFontSet *tmpSet; int i; - canon_dir = FcStrCanonFilename (dir); - if (!canon_dir) canon_dir = (FcChar8 *) dir; - printf ("dir %s canon %s\n", dir, canon_dir); - - if (config && !FcConfigAcceptFilename (config, canon_dir)) { - ret = FcTrue; - goto bail; - } - if (!force) - { - if (FcDirCacheRead (set, dirs, canon_dir, config)) { - ret = FcTrue; - goto bail; - } - } - - if (FcDebug () & FC_DBG_FONTSET) - printf ("cache scan dir %s\n", canon_dir); + return FcFalse; + + if (!set && !dirs) + return FcTrue; + + if (!blanks) + blanks = FcConfigGetBlanks (config); /* freed below */ - file = (FcChar8 *) malloc (strlen ((char *) canon_dir) + 1 + FC_MAX_FILE_LEN + 1); + file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1); if (!file) { ret = FcFalse; goto bail; } - strcpy ((char *) file, (char *) canon_dir); + strcpy ((char *) file, (char *) dir); strcat ((char *) file, "/"); base = file + strlen ((char *) file); - + if (FcDebug () & FC_DBG_SCAN) - printf ("\tScanning dir %s\n", canon_dir); + printf ("\tScanning dir %s\n", dir); - d = opendir ((char *) canon_dir); + d = opendir ((char *) dir); if (!d) { /* Don't complain about missing directories */ - if (errno == ENOENT) - ret = FcTrue; - else + if (errno != ENOENT) ret = FcFalse; - goto bail_1; - } - - tmpSet = FcFontSetCreate(); - if (!tmpSet) - { - ret = FcFalse; - goto bail0; + 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 + * Sort files 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); - + qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp); + /* - * Now that the directory has been scanned, - * write out the cache file + * Scan file files to build font patterns */ - FcDirCacheWrite (tmpSet, dirlist, canon_dir, config); + for (i = 0; i < files->num; i++) + FcFileScanConfig (set, dirs, blanks, files->strs[i], config); + +bail2: + FcStrSetDestroy (files); +bail1: + closedir (d); +bail: + return ret; +} + +FcBool +FcDirScan (FcFontSet *set, + FcStrSet *dirs, + FcFileCache *cache, /* XXX unused */ + FcBlanks *blanks, + const FcChar8 *dir, + 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; + 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 (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; + } /* - * Add the discovered fonts to our internal non-cache list + * Scan the dir */ - for (i = 0; i < tmpSet->nfont; i++) - FcFontSetAdd (set, tmpSet->fonts[i]); + if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) + { + ret = FcFalse; + goto bail2; + } /* - * the patterns in tmpset now belong to set; don't free them + * Build the cache object */ - tmpSet->nfont = 0; + cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); + if (!cache) + { + ret = FcFalse; + goto bail2; + } /* - * Add the discovered directories to the list to be scanned + * Write out the cache file, ignoring any troubles */ - for (i = 0; i < dirlist->num; i++) - if (!FcStrSetAdd (dirs, dirlist->strs[i])) { - ret = FcFalse; - goto bail3; - } - - bail3: - FcStrSetDestroy (filelist); + FcDirCacheWrite (cache, config); + bail2: - FcStrSetDestroy (dirlist); + FcStrSetDestroy (dirs); bail1: - FcFontSetDestroy (tmpSet); - - bail0: - closedir (d); - - bail_1: - free (file); + FcFontSetDestroy (set); bail: - if (canon_dir != dir) free (canon_dir); - return ret; + return cache; } -FcBool -FcDirScan (FcFontSet *set, - FcStrSet *dirs, - FcFileCache *cache, /* XXX unused */ - FcBlanks *blanks, - const FcChar8 *dir, - FcBool force) +/* + * 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__