Patrick Lam <plam@mit.edu>

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index c61a2326cc0047e4fc781f5dc9f6152c0cacd896..84df88de225986bb96803ffc527b63e6dd0b13a3 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -27,7 +27,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
@@ -48,6 +52,7 @@
 
 #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 ';'
@@ -250,7 +255,7 @@ typedef struct _FcStrBuf {
 } FcStrBuf;
 
 typedef struct _FcCache {
-    int            magic;              /* 0xFC02FC02 */
+    int            magic;              /* FC_CACHE_MAGIC */
     int            count;              /* number of bytes of data in block */
     int     bank;               /* bank ID */
     int     pattern_count;      /* number of FcPatterns */
@@ -323,16 +328,21 @@ typedef struct _FcCaseFold {
  * cache which is then rewritten to the users home directory
  */
 
-#define FC_CACHE_MAGIC 0xFC02FC02
+#define FC_CACHE_MAGIC 0xFC02FC03
 
 typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
 
+enum FcGCDirState {
+       FcGCDirDisabled, FcGCDirFileRead, FcGCDirConsumed, FcGCDirUpdated
+};
 struct _FcGlobalCacheDir {
     struct _FcGlobalCacheDir   *next;
     char                       *name;
     FcCache                    metadata;
     off_t                      offset;
+    FcStrSet                   *subdirs;
     void                       *ent;
+    enum FcGCDirState          state;
 };
 
 typedef struct _FcGlobalCache {
@@ -446,12 +456,15 @@ FcGlobalCacheLoad (FcGlobalCache    *cache,
 
 FcBool
 FcGlobalCacheUpdate (FcGlobalCache  *cache,
+                    FcStrSet       *dirs,
                     const char     *file,
-                    FcFontSet      *set);
+                    FcFontSet      *set,
+                    FcConfig       *config);
 
 FcBool
 FcGlobalCacheSave (FcGlobalCache    *cache,
-                  const FcChar8    *cache_file);
+                  const FcChar8    *cache_file,
+                  FcConfig         *config);
 
 FcFontSet *
 FcCacheRead (FcConfig *config, FcGlobalCache * cache);
@@ -460,7 +473,7 @@ FcBool
 FcDirCacheWrite (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir);
 
 FcBool
-FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir);
+FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config);
 
 extern int *_fcBankId, *_fcBankIdx;
 int
@@ -469,7 +482,7 @@ FcCacheBankToIndexMTF (int bank);
 static __inline__ int
 FcCacheBankToIndex (int bank)
 {
-    return _fcBankId[*_fcBankIdx] == bank ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+    return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
 }
 
 const char *
@@ -899,9 +912,6 @@ FcPatternEltU (FcPatternEltPtr pei)
     return &_fcPatternElts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
 }
 
-FcPatternElt *
-FcPatternEltU (FcPatternEltPtr pei);
-
 FcValueListPtr
 FcValueListPtrCreateDynamic(FcValueList * p);