Normalize font dirs by using the form, as given in fonts.conf, and recorded

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 3019abb7e019108448e14e8080c5a065a9b1172b..8043e86490bebfe7e6f77b8b2e0840c3c4e4e87a 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -48,6 +48,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 ';'
@@ -460,10 +461,17 @@ 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
-FcCacheBankToIndex (int bank);
+FcCacheBankToIndexMTF (int bank);
+
+static __inline__ int
+FcCacheBankToIndex (int bank)
+{
+    return (_fcBankId[*_fcBankIdx] == bank) ? *_fcBankIdx : FcCacheBankToIndexMTF(bank);
+}
 
 const char *
 FcCacheFindBankDir (int bank);
@@ -486,6 +494,10 @@ FcBool
 FcConfigAddConfigFile (FcConfig                *config,
                       const FcChar8    *f);
 
+const FcChar8 *
+FcConfigNormalizeFontDir (FcConfig     *config, 
+                         const FcChar8 *d);
+
 FcBool
 FcConfigSetCache (FcConfig     *config,
                  const FcChar8 *c);
@@ -567,7 +579,7 @@ FcCharSet *
 FcCharSetSerialize(int bank, FcCharSet *c);
 
 void *
-FcCharSetUnserialize (FcCache metadata, void *block_ptr);
+FcCharSetUnserialize (FcCache * metadata, void *block_ptr);
 
 FcCharLeaf *
 FcCharSetGetLeaf(const FcCharSet *c, int i);
@@ -670,7 +682,7 @@ FcBool
 FcFontSetSerialize (int bank, FcFontSet * s);
 
 FcBool
-FcFontSetUnserialize(FcCache metadata, FcFontSet * s, void * block_ptr);
+FcFontSetUnserialize(FcCache * metadata, FcFontSet * s, void * block_ptr);
 
 /* fcgram.y */
 int
@@ -769,7 +781,7 @@ FcLangSet *
 FcLangSetSerialize (int bank, FcLangSet *l);
 
 void *
-FcLangSetUnserialize (FcCache metadata, void *block_ptr);
+FcLangSetUnserialize (FcCache * metadata, void *block_ptr);
 
 /* fclist.c */
 
@@ -798,7 +810,7 @@ int
 FcObjectNeededBytesAlign (void);
 
 void *
-FcObjectUnserialize (FcCache metadata, void *block_ptr);
+FcObjectUnserialize (FcCache * metadata, void *block_ptr);
 
 void
 FcObjectSerialize (void);
@@ -871,8 +883,8 @@ FcPatternDistributeBytes (FcCache * metadata, void * block_ptr);
 
 /* please don't access these outside of fcpat.c! only visible so that
  * *PtrU can be inlined. */
-extern FcValueList ** fcvaluelists;
-extern FcPatternElt ** fcpatternelts;
+extern FcValueList ** _fcValueLists;
+extern FcPatternElt ** _fcPatternElts;
 
 static __inline__ FcValueList * 
 FcValueListPtrU (FcValueListPtr pi)
@@ -880,7 +892,7 @@ FcValueListPtrU (FcValueListPtr pi)
     if (pi.bank == FC_BANK_DYNAMIC)
         return pi.u.dyn;
 
-    return &fcvaluelists[FcCacheBankToIndex(pi.bank)][pi.u.stat];
+    return &_fcValueLists[FcCacheBankToIndex(pi.bank)][pi.u.stat];
 }
 
 static __inline__ FcPatternElt *
@@ -889,7 +901,7 @@ FcPatternEltU (FcPatternEltPtr pei)
     if (pei.bank == FC_BANK_DYNAMIC)
        return pei.u.dyn;
 
-    return &fcpatternelts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
+    return &_fcPatternElts[FcCacheBankToIndex(pei.bank)][pei.u.stat];
 }
 
 FcPatternElt *
@@ -902,7 +914,7 @@ FcPattern *
 FcPatternSerialize (int bank, FcPattern * p);
 
 void *
-FcPatternUnserialize (FcCache metadata, void *block_ptr);
+FcPatternUnserialize (FcCache * metadata, void *block_ptr);
 
 /* fcrender.c */