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;
}
}
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
const FcChar8 *file,
FcBool force)
{
- return FcFileScanConfig (set, dirs, blanks, file, force, 0);
+ return FcFileScanConfig (set, dirs, blanks, file, NULL);
}
/*
* Strcmp helper that takes pointers to pointers, copied from qsort(3) manpage
*/
-
static int
cmpstringp(const void *p1, const void *p2)
{
}
/*
- * Scan 'dir', adding font files to 'set' and
- * subdirectories to 'dirs'
+ * Scan the specified directory and construct a cache of its contents
*/
-
-FcBool
-FcDirScanConfig (FcFontSet *set,
- FcStrSet *dirs,
- FcBlanks *blanks,
- const FcChar8 *dir,
- FcBool force,
- FcConfig *config)
+FcCache *
+FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
{
DIR *d;
struct dirent *e;
- FcStrSet *dirlist, *filelist;
+ FcStrSet *files;
+ FcStrSet *dirs;
FcChar8 *file;
FcChar8 *base;
FcBool ret = FcTrue;
- FcFontSet *tmpSet;
+ FcFontSet *set;
int i;
+ FcBlanks *blanks = FcConfigGetBlanks (config);
+ FcCache *cache = NULL;
+ struct stat dir_stat;
- if (config && !FcConfigAcceptFilename (config, dir))
- return FcTrue;
-
- if (!force)
- {
- if (FcDirCacheRead (set, dirs, dir, config))
- return FcTrue;
- }
-
if (FcDebug () & FC_DBG_FONTSET)
printf ("cache scan dir %s\n", dir);
/* 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, "/");
d = opendir ((char *) dir);
if (!d)
{
- free (file);
/* Don't complain about missing directories */
if (errno == ENOENT)
- return FcTrue;
- return FcFalse;
+ ret = FcTrue;
+ else
+ ret = FcFalse;
+ goto bail_1;
}
-
- tmpSet = FcFontSetCreate();
- if (!tmpSet)
+ if (stat ((char *) dir, &dir_stat) < 0)
{
ret = FcFalse;
- goto bail0;
+ goto bail_1;
}
- dirlist = FcStrSetCreate ();
- if (!dirlist)
+ set = FcFontSetCreate();
+ if (!set)
{
ret = FcFalse;
- goto bail1;
+ goto bail0;
}
- filelist = FcStrSetCreate ();
- if (!filelist)
+
+ files = FcStrSetCreate ();
+ if (!files)
{
ret = FcFalse;
- goto bail2;
+ goto bail1;
}
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);
+ qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp);
- for (i = 0; i < filelist->num; i++)
- FcFileScanFontConfig (tmpSet, blanks, filelist->strs[i], config);
+ dirs = FcStrSetCreate ();
+ if (!dirs)
+ goto bail2;
- 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
+ * Scan file files to build font patterns
*/
- for (i = 0; i < tmpSet->nfont; i++)
- FcFontSetAdd (set, tmpSet->fonts[i]);
-
+ for (i = 0; i < files->num; i++)
+ FcFileScanConfig (set, dirs, blanks, files->strs[i], config);
+
/*
- * 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)
+ goto bail3;
+
/*
- * 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;
- }
+ FcDirCacheWrite (cache, config);
bail3:
- FcStrSetDestroy (filelist);
+ FcStrSetDestroy (dirs);
bail2:
- FcStrSetDestroy (dirlist);
+ FcStrSetDestroy (files);
bail1:
- FcFontSetDestroy (tmpSet);
+ FcFontSetDestroy (set);
bail0:
closedir (d);
+ bail_1:
free (file);
- return ret;
+ 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
+FcDirScanConfig (FcFontSet *set,
+ FcStrSet *dirs,
+ FcBlanks *blanks,
+ const FcChar8 *dir,
+ FcBool force,
+ FcConfig *config)
+{
+ return FcFalse; /* XXX deprecated */
}
FcBool
const FcChar8 *dir,
FcBool force)
{
- return FcDirScanConfig (set, dirs, blanks, dir, force, 0);
+ return FcFalse; /* XXX deprecated */
}
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__
git.wh0rd.org / fontconfig.git / blobdiff