*/
#include "fcint.h"
+#include <dirent.h>
+#include <sys/types.h>
#if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
#define STRICT
if (!FcConfigSetCache (config, cache_dir))
{
FcStrFree (cache_dir);
- goto bail6;
+ goto bail8;
}
FcStrFree (cache_dir);
}
}
#endif
+ config->cacheDirs = FcStrSetCreate ();
+ if (!config->cacheDirs)
+ goto bail9;
+
config->blanks = 0;
config->substPattern = 0;
return config;
+bail9:
+ FcStrFree (config->cache);
bail8:
FcFontSetDestroy (config->rejectPatterns);
bail7:
return 0;
}
-typedef struct _FcFileTime {
- time_t time;
- FcBool set;
-} FcFileTime;
-
static FcFileTime
FcConfigNewestFile (FcStrSet *files)
{
return newest;
}
+FcFileTime
+FcConfigModifiedTime (FcConfig *config)
+{
+ if (!config)
+ {
+ FcFileTime v = { 0, FcFalse };
+ config = FcConfigGetCurrent ();
+ if (!config)
+ return v;
+ }
+ return FcConfigNewestFile (config->configFiles);
+}
+
FcBool
FcConfigUptoDate (FcConfig *config)
{
FcStrSetDestroy (config->configDirs);
FcStrSetDestroy (config->fontDirs);
+ FcStrSetDestroy (config->cacheDirs);
FcStrSetDestroy (config->configFiles);
FcStrSetDestroy (config->acceptGlobs);
FcStrSetDestroy (config->rejectGlobs);
FcConfigBuildFonts (FcConfig *config)
{
FcFontSet *fonts, *cached_fonts;
- FcGlobalCache *cache;
FcStrList *list;
FcStrSet *oldDirs;
FcChar8 *dir;
if (!fonts)
goto bail0;
- cache = FcGlobalCacheCreate ();
- if (!cache)
- goto bail1;
-
oldDirs = FcStrSetCreate ();
if (!oldDirs)
goto bail2;
- if (config->cache)
- FcGlobalCacheLoad (cache, oldDirs, config->cache);
-
- cached_fonts = FcCacheRead(config, cache);
+ cached_fonts = FcCacheRead(config);
if (!cached_fonts)
{
list = FcConfigGetFontDirs (config);
if (!list)
- goto bail2;
+ goto bail3;
while ((dir = FcStrListNext (list)))
{
if (FcDebug () & FC_DBG_FONTSET)
printf ("build scan dir %s\n", dir);
- FcDirScanConfig (fonts, config->fontDirs, cache,
+ FcDirScanConfig (fonts, config->fontDirs,
config->blanks, dir, FcFalse, config);
}
{
if (FcDebug () & FC_DBG_FONTSET)
printf ("scan dir %s\n", oldDirs->strs[i]);
- FcDirScanConfig (fonts, config->fontDirs, cache,
+ FcDirScanConfig (fonts, config->fontDirs,
config->blanks, oldDirs->strs[i],
FcFalse, config);
}
for (i = 0; i < cached_fonts->nfont; i++)
{
- if (FcConfigAcceptFont (config, cached_fonts->fonts[i]))
- FcFontSetAdd (fonts, cached_fonts->fonts[i]);
+ FcChar8 *cfn;
+ FcPattern *font = cached_fonts->fonts[i];
+ FcPatternObjectGetString (font, FC_FILE_OBJECT, 0, &cfn);
+
+ if (FcConfigAcceptFont (config, font) &&
+ (cfn && FcConfigAcceptFilename (config, cfn)))
+ FcFontSetAdd (fonts, font);
cached_fonts->fonts[i] = 0; /* prevent free in FcFontSetDestroy */
}
if (FcDebug () & FC_DBG_FONTSET)
FcFontSetPrint (fonts);
- if (config->cache)
- FcGlobalCacheSave (cache, config->cache);
- FcGlobalCacheDestroy (cache);
FcStrSetDestroy (oldDirs);
FcConfigSetFonts (config, fonts, FcSetSystem);
return FcTrue;
-bail2:
+bail3:
FcStrSetDestroy (oldDirs);
-bail1:
+bail2:
FcFontSetDestroy (fonts);
bail0:
return FcFalse;
return FcStrListCreate (config->fontDirs);
}
+FcBool
+FcConfigAddCacheDir (FcConfig *config,
+ const FcChar8 *d)
+{
+ return FcStrSetAddFilename (config->cacheDirs, d);
+}
+
+FcStrList *
+FcConfigGetCacheDirs (FcConfig *config)
+{
+ if (!config)
+ {
+ config = FcConfigGetCurrent ();
+ if (!config)
+ return 0;
+ }
+ return FcStrListCreate (config->cacheDirs);
+}
+
FcBool
FcConfigAddConfigFile (FcConfig *config,
const FcChar8 *f)
FcConfigAddBlank (FcConfig *config,
FcChar32 blank)
{
- FcBlanks *b;
+ FcBlanks *b, *freeme = 0;
b = config->blanks;
if (!b)
{
- b = FcBlanksCreate ();
+ freeme = b = FcBlanksCreate ();
if (!b)
return FcFalse;
}
if (!FcBlanksAdd (b, blank))
+ {
+ if (freeme)
+ FcBlanksDestroy (freeme);
return FcFalse;
+ }
config->blanks = b;
return FcTrue;
}
FcValue v, vl, vr;
FcResult r;
FcMatrix *m;
+ FcChar8 *str;
switch (e->op) {
case FcOpInteger:
case FcOpString:
v.type = FcTypeString;
v.u.s = FcStrStaticName(e->u.sval);
- v = FcValueSave (v);
break;
case FcOpMatrix:
v.type = FcTypeMatrix;
v.u.b = e->u.bval;
break;
case FcOpField:
- r = FcPatternGet (p, e->u.field, 0, &v);
+ r = FcPatternObjectGet (p, e->u.object, 0, &v);
if (r != FcResultMatch)
v.type = FcTypeVoid;
+ v = FcValueSave (v);
break;
case FcOpConst:
if (FcNameConstant (e->u.constant, &v.u.i))
switch (e->op) {
case FcOpPlus:
v.type = FcTypeString;
- v.u.s = FcStrStaticName (FcStrPlus (vl.u.s, vr.u.s));
+ str = FcStrPlus (vl.u.s, vr.u.s);
+ v.u.s = FcStrStaticName (str);
+ FcStrFree (str);
if (!v.u.s)
v.type = FcTypeVoid;
e = 0;
}
- for (v = values; v; v = FcValueListPtrU(v->next))
+ for (v = values; v; v = FcValueListNext(v))
{
/* Compare the pattern value to the match expression value */
if (FcConfigCompareValue (&v->value, t->op, &value))
FcConfigValues (FcPattern *p, FcExpr *e, FcValueBinding binding)
{
FcValueList *l;
- FcValueListPtr lp;
if (!e)
return 0;
if (e->op == FcOpComma)
{
l->value = FcConfigEvaluate (p, e->u.tree.left);
- l->next = FcValueListPtrCreateDynamic(FcConfigValues (p, e->u.tree.right, binding));
+ l->next = FcConfigValues (p, e->u.tree.right, binding);
}
else
{
l->value = FcConfigEvaluate (p, e);
- l->next = FcValueListPtrCreateDynamic(0);
+ l->next = NULL;
}
l->binding = binding;
- lp = FcValueListPtrCreateDynamic(l);
- while (FcValueListPtrU(lp) && FcValueListPtrU(lp)->value.type == FcTypeVoid)
+ if (l->value.type == FcTypeVoid)
{
- FcValueListPtr next = FcValueListPtrU(lp)->next;
+ FcValueList *next = FcValueListNext(l);
- if (lp.bank == FC_BANK_DYNAMIC)
- {
- FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
- free (l);
- }
- lp = next;
+ FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
+ free (l);
+ l = next;
}
+
return l;
}
sameBinding = position->binding;
else
sameBinding = FcValueBindingWeak;
- for (v = FcValueListPtrCreateDynamic(new); FcValueListPtrU(v);
- v = FcValueListPtrU(v)->next)
- if (FcValueListPtrU(v)->binding == FcValueBindingSame)
- FcValueListPtrU(v)->binding = sameBinding;
+ for (v = new; v != NULL; v = FcValueListNext(v))
+ if (v->binding == FcValueBindingSame)
+ v->binding = sameBinding;
if (append)
{
if (position)
prev = &position->next;
else
- for (prev = head; FcValueListPtrU(*prev);
- prev = &(FcValueListPtrU(*prev)->next))
+ for (prev = head; *prev != NULL;
+ prev = &(*prev)->next)
;
}
else
{
if (position)
{
- for (prev = head; FcValueListPtrU(*prev);
- prev = &(FcValueListPtrU(*prev)->next))
+ for (prev = head; *prev != NULL;
+ prev = &(*prev)->next)
{
- if (FcValueListPtrU(*prev) == position)
+ if (*prev == position)
break;
}
}
if (FcDebug () & FC_DBG_EDIT)
{
- if (!FcValueListPtrU(*prev))
+ if (*prev == NULL)
printf ("position not on list\n");
}
}
if (new)
{
- last = FcValueListPtrCreateDynamic(new);
- while (FcValueListPtrU(FcValueListPtrU(last)->next))
- last = FcValueListPtrU(last)->next;
+ last = new;
+ while (last->next != NULL)
+ last = last->next;
- FcValueListPtrU(last)->next = *prev;
- *prev = FcValueListPtrCreateDynamic(new);
+ last->next = *prev;
+ *prev = new;
}
if (FcDebug () & FC_DBG_EDIT)
{
FcValueListPtr *prev;
- for (prev = head; FcValueListPtrU(*prev);
- prev = &(FcValueListPtrU(*prev)->next))
+ for (prev = head; *prev != NULL; prev = &(*prev)->next)
{
- if (FcValueListPtrU(*prev) == position)
+ if (*prev == position)
{
*prev = position->next;
- position->next = FcValueListPtrCreateDynamic(0);
- FcValueListDestroy (FcValueListPtrCreateDynamic(position));
+ position->next = NULL;
+ FcValueListDestroy (position);
break;
}
}
static void
FcConfigPatternAdd (FcPattern *p,
- const char *object,
+ FcObject object,
FcValueList *list,
FcBool append)
{
if (list)
{
- FcPatternElt *e = FcPatternInsertElt (p, object);
+ FcPatternElt *e = FcPatternObjectInsertElt (p, object);
if (!e)
return;
*/
static void
FcConfigPatternDel (FcPattern *p,
- const char *object)
+ FcObject object)
{
- FcPatternElt *e = FcPatternFindElt (p, object);
+ FcPatternElt *e = FcPatternObjectFindElt (p, object);
if (!e)
return;
- while (FcValueListPtrU(e->values))
- FcConfigDel (&e->values, FcValueListPtrU(e->values));
+ while (e->values != NULL)
+ FcConfigDel (&e->values, e->values);
}
static void
FcConfigPatternCanon (FcPattern *p,
- const char *object)
+ FcObject object)
{
- FcPatternElt *e = FcPatternFindElt (p, object);
+ FcPatternElt *e = FcPatternObjectFindElt (p, object);
if (!e)
return;
- if (!FcValueListPtrU(e->values))
- FcPatternDel (p, object);
+ if (e->values == NULL)
+ FcPatternObjectDel (p, object);
}
FcBool
else
m = p;
if (m)
- st[i].elt = FcPatternFindElt (m, t->field);
+ st[i].elt = FcPatternObjectFindElt (m, t->object);
else
st[i].elt = 0;
/*
* Check to see if there is a match, mark the location
* to apply match-relative edits
*/
- st[i].value = FcConfigMatchValueList (m, t, FcValueListPtrU(st[i].elt->values));
+ st[i].value = FcConfigMatchValueList (m, t, st[i].elt->values);
if (!st[i].value)
break;
- if (t->qual == FcQualFirst && st[i].value != FcValueListPtrU(st[i].elt->values))
+ if (t->qual == FcQualFirst && st[i].value != st[i].elt->values)
break;
- if (t->qual == FcQualNotFirst && st[i].value == FcValueListPtrU(st[i].elt->values))
+ if (t->qual == FcQualNotFirst && st[i].value == st[i].elt->values)
break;
}
if (t)
for (t = s->test, i = 0; t; t = t->next, i++)
{
if ((t->kind == FcMatchFont || kind == FcMatchPattern) &&
- !FcStrCmpIgnoreCase ((FcChar8 *) t->field,
- (FcChar8 *) e->field))
+ t->object == e->object)
{
/*
* KLUDGE - the pattern may have been reallocated or
* the element again
*/
if (e != s->edit && st[i].elt)
- st[i].elt = FcPatternFindElt (p, t->field);
+ st[i].elt = FcPatternObjectFindElt (p, t->object);
if (!st[i].elt)
t = 0;
break;
if (t)
{
FcValueList *thisValue = st[i].value;
- FcValueList *nextValue = thisValue ? FcValueListPtrU(thisValue->next) : 0;
+ FcValueList *nextValue = thisValue;
/*
* Append the new list of values after the current value
/*
* Delete the marked value
*/
- FcConfigDel (&st[i].elt->values, thisValue);
+ if (thisValue)
+ FcConfigDel (&st[i].elt->values, thisValue);
/*
* Adjust any pointers into the value list to ensure
* future edits occur at the same place
* Delete all of the values and insert
* the new set
*/
- FcConfigPatternDel (p, e->field);
- FcConfigPatternAdd (p, e->field, l, FcTrue);
+ FcConfigPatternDel (p, e->object);
+ FcConfigPatternAdd (p, e->object, l, FcTrue);
/*
* Adjust any pointers into the value list as they no
* longer point to anything valid
}
/* fall through ... */
case FcOpPrependFirst:
- FcConfigPatternAdd (p, e->field, l, FcFalse);
+ FcConfigPatternAdd (p, e->object, l, FcFalse);
break;
case FcOpAppend:
if (t)
}
/* fall through ... */
case FcOpAppendLast:
- FcConfigPatternAdd (p, e->field, l, FcTrue);
+ FcConfigPatternAdd (p, e->object, l, FcTrue);
break;
default:
+ FcValueListDestroy (l);
break;
}
}
* any properties without data
*/
for (e = s->edit; e; e = e->next)
- FcConfigPatternCanon (p, e->field);
+ FcConfigPatternCanon (p, e->object);
if (FcDebug () & FC_DBG_EDIT)
{
FcConfigSetFonts (config, set, FcSetApplication);
}
- if (!FcFileScanConfig (set, subdirs, 0, config->blanks, file, FcFalse, config))
+ if (!FcFileScanConfig (set, subdirs, config->blanks, file, FcFalse, config))
{
FcStrSetDestroy (subdirs);
return FcFalse;
}
FcStrListDone (sublist);
}
+ FcStrSetDestroy (subdirs);
return FcTrue;
}
FcConfigSetFonts (config, set, FcSetApplication);
}
- if (!FcDirScanConfig (set, subdirs, 0, config->blanks, dir, FcFalse, config))
+ if (!FcDirScanConfig (set, subdirs, config->blanks, dir, FcFalse, config))
{
FcStrSetDestroy (subdirs);
return FcFalse;
}
FcStrListDone (sublist);
}
+ FcStrSetDestroy (subdirs);
return FcTrue;
}