#ifndef _FCINT_H_
#define _FCINT_H_
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <stdio.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
#include <stdint.h>
+#else
+#error missing C99 integer data types
+#endif
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcprivate.h>
#include <fontconfig/fcfreetype.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
#ifndef FC_CONFIG_PATH
#define FC_CONFIG_PATH "fonts.conf"
#define FC_FONT_FILE_INVALID ((FcChar8 *) ".")
#define FC_FONT_FILE_DIR ((FcChar8 *) ".dir")
+#define FC_GLOBAL_MAGIC_COOKIE "GLOBAL"
#ifdef _WIN32
#define FC_SEARCH_PATH_SEPARATOR ';'
int num; /* size of leaves and numbers arrays */
int bank;
union {
- struct {
- FcCharLeaf **leaves;
- FcChar16 *numbers;
- } dyn;
struct {
int leafidx_offset;
int numbers_offset;
} stat;
+ struct {
+ FcCharLeaf **leaves;
+ FcChar16 *numbers;
+ } dyn;
} u;
};
} FcStrBuf;
typedef struct _FcCache {
- int magic; /* 0xFC02FC02 */
- int count; /* number of bytes of data in block */
+ int magic; /* FC_CACHE_MAGIC */
+ int subdirs; /* number of subdir strings */
+ off_t pos; /* position of data block in file */
+ off_t count; /* number of bytes of data in block */
int bank; /* bank ID */
int pattern_count; /* number of FcPatterns */
int patternelt_count; /* number of FcPatternElts */
#define fc_value_langset(v) (((v)->type & FC_STORAGE_STATIC) ? (const FcLangSet *)(((char *) v) + (v)->u.l_off) : (v) -> u.l)
#define fc_storage_type(v) ((v)->type & ~FC_STORAGE_STATIC)
-/*
- * The per-user ~/.fonts.cache-<version> file is loaded into
- * this data structure. Each directory gets a substructure
- * which is validated by comparing the directory timestamp with
- * that saved in the cache. When valid, the entire directory cache
- * can be immediately loaded without reading the directory. Otherwise,
- * the files are checked individually; updated files are loaded into the
- * cache which is then rewritten to the users home directory
- */
-
-#define FC_CACHE_MAGIC 0xFC02FC02
+#define fc_alignof(type) offsetof (struct { char c; type member; }, member)
-typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
-
-struct _FcGlobalCacheDir {
- struct _FcGlobalCacheDir *next;
- char *name;
- FcCache metadata;
- off_t offset;
- void *ent;
-};
-
-typedef struct _FcGlobalCache {
- FcGlobalCacheDir *dirs;
- FcBool updated;
- int fd;
-} FcGlobalCache;
+#define FC_CACHE_MAGIC 0xFC02FC04
struct _FcAtomic {
FcChar8 *file; /* original file name */
* of configured directories
*/
FcStrSet *fontDirs;
+ /*
+ * List of directories containing cache files.
+ */
+ FcStrSet *cacheDirs;
/*
* Names of all of the configuration files used
* to create this configuration
typedef struct _FcCharMap FcCharMap;
-#define ALIGN(v,type) ((__typeof__(v))(((uintptr_t)(v) + __alignof__(type) - 1) & ~(__alignof__(type) - 1)))
+/* watch out; assumes that v is void * -PL */
+#define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1)))
/* fcblanks.c */
/* fccache.c */
-FcGlobalCache *
-FcGlobalCacheCreate (void);
-
-void
-FcGlobalCacheDestroy (FcGlobalCache *cache);
-
-FcBool
-FcGlobalCacheReadDir (FcFontSet *set,
- FcStrSet *dirs,
- FcGlobalCache *cache,
- const char *dir,
- FcConfig *config);
-
-void
-FcGlobalCacheLoad (FcGlobalCache *cache,
- FcStrSet *staleDirs,
- const FcChar8 *cache_file,
- FcConfig *config);
-
-FcBool
-FcGlobalCacheUpdate (FcGlobalCache *cache,
- const char *file,
- FcFontSet *set);
-
-FcBool
-FcGlobalCacheSave (FcGlobalCache *cache,
- const FcChar8 *cache_file);
-
FcFontSet *
-FcCacheRead (FcConfig *config, FcGlobalCache * cache);
+FcCacheRead (FcConfig *config);
FcBool
-FcDirCacheWrite (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir);
+FcDirCacheWrite (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config);
FcBool
-FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir);
+FcDirCacheConsume (FILE *file, FcFontSet *set, FcStrSet *dirs,
+ const FcChar8 *dir, char *dirname);
+
+FcBool
+FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config);
+extern int *_fcBankId, *_fcBankIdx;
int
-FcCacheBankToIndex (int bank);
+FcCacheBankToIndexMTF (int bank);
+
+static inline int
+FcCacheBankToIndex (int bank)
+{
+ return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+}
const char *
FcCacheFindBankDir (int bank);
FcConfigAddDir (FcConfig *config,
const FcChar8 *d);
+FcBool
+FcConfigAddCacheDir (FcConfig *config,
+ const FcChar8 *d);
+
+FcStrList *
+FcConfigGetCacheDirs (FcConfig *config);
+
FcBool
FcConfigAddConfigFile (FcConfig *config,
const FcChar8 *f);
extern int FcDebugVal;
-static __inline__ int
+static inline int
FcDebug (void) { return FcDebugVal; }
void
FcBool
FcFileScanConfig (FcFontSet *set,
FcStrSet *dirs,
- FcFileCache *cache,
FcBlanks *blanks,
const FcChar8 *file,
FcBool force,
FcBool
FcDirScanConfig (FcFontSet *set,
FcStrSet *dirs,
- FcFileCache *cache,
FcBlanks *blanks,
const FcChar8 *dir,
FcBool force,
const char *
FcObjectPtrU (FcObjectPtr p);
-static __inline__ int
+static inline int
FcObjectPtrCompare (const FcObjectPtr a, const FcObjectPtr b)
{
return a - b;
FcValueBinding binding,
FcBool append);
-FcPattern *
-FcPatternFreeze (FcPattern *p);
-
void
FcPatternFini (void);
FcBool
FcPatternAppend (FcPattern *p, FcPattern *s);
-void
-FcPatternAddFullFname (const FcPattern *p, const char *fname);
-
-void
-FcPatternTransferFullFname (const FcPattern *new, const FcPattern *orig);
-
const FcChar8 *
FcStrStaticName (const FcChar8 *name);
extern FcValueList ** _fcValueLists;
extern FcPatternElt ** _fcPatternElts;
-static __inline__ FcValueList *
+static inline FcValueList *
FcValueListPtrU (FcValueListPtr pi)
{
if (pi.bank == FC_BANK_DYNAMIC)
return &_fcValueLists[FcCacheBankToIndex(pi.bank)][pi.u.stat];
}
-static __inline__ FcPatternElt *
+static inline FcPatternElt *
FcPatternEltU (FcPatternEltPtr pei)
{
if (pei.bank == FC_BANK_DYNAMIC)
return &_fcPatternElts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
}
-FcPatternElt *
-FcPatternEltU (FcPatternEltPtr pei);
-
FcValueListPtr
FcValueListPtrCreateDynamic(FcValueList * p);
FcChar32
FcStrHashIgnoreCase (const FcChar8 *s);
+FcChar8 *
+FcStrCanonFilename (const FcChar8 *s);
+
#endif /* _FC_INT_H_ */