Add support for user-provided freetype faces to Xft

[fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 2bb59f6b20804549a0fc992cdf4861e1ace76b59..fa1d0e81ebe775a0e62ba9c207c2ce35c4bec3d9 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.8 2002/05/21 17:06:22 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.13 2002/05/31 04:42:42 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -37,7 +37,7 @@ typedef int           FcBool;
  */
 #define FC_MAJOR       1
 #define FC_MINOR       0
-#define FC_REVISION    0
+#define FC_REVISION    1
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -59,6 +59,7 @@ typedef int           FcBool;
 #define FC_GLOBAL_ADVANCE   "globaladvance"    /* Bool (true) */
 #define FC_FILE                    "file"              /* String */
 #define FC_INDEX           "index"             /* Int */
+#define FC_FT_FACE         "ftface"            /* FT_Face */
 #define FC_RASTERIZER      "rasterizer"        /* String */
 #define FC_OUTLINE         "outline"           /* Bool */
 #define FC_SCALABLE        "scalable"          /* Bool */
@@ -145,7 +146,8 @@ typedef enum _FcType {
     FcTypeString, 
     FcTypeBool,
     FcTypeMatrix,
-    FcTypeCharSet
+    FcTypeCharSet,
+    FcTypeFTFace
 } FcType;
 
 typedef struct _FcMatrix {
@@ -186,6 +188,7 @@ typedef struct _FcValue {
        double          d;
        const FcMatrix  *m;
        const FcCharSet *c;
+       void            *f;
     } u;
 } FcValue;
 
@@ -347,8 +350,22 @@ FcCharSetIntersectCount (const FcCharSet *a, const FcCharSet *b);
 FcChar32
 FcCharSetSubtractCount (const FcCharSet *a, const FcCharSet *b);
 
+FcBool
+FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b);
+
+#define FC_CHARSET_MAP_SIZE (256/32)
+#define FC_CHARSET_DONE        ((FcChar32) -1)
+
 FcChar32
-FcCharSetCoverage (const FcCharSet *a, FcChar32 page, FcChar32 *result);
+FcCharSetFirstPage (const FcCharSet *a, 
+                   FcChar32        map[FC_CHARSET_MAP_SIZE],
+                   FcChar32        *next);
+
+FcChar32
+FcCharSetNextPage (const FcCharSet  *a, 
+                  FcChar32         map[FC_CHARSET_MAP_SIZE],
+                  FcChar32         *next);
+
 
 /* fcdbg.c */
 void
@@ -412,6 +429,9 @@ FcInitLoadConfigAndFonts (void);
 FcBool
 FcInit (void);
 
+int
+FcGetVersion (void);
+
 FcBool
 FcInitReinitialize (void);
 
@@ -499,6 +519,16 @@ FcFontSetSort (FcConfig        *config,
               FcCharSet    **csp,
               FcResult     *result);
 
+FcFontSet *
+FcFontSort (FcConfig    *config,
+           FcPattern    *p,
+           FcBool       trim,
+           FcCharSet    **csp,
+           FcResult     *result);
+
+void
+FcFontSetSortDestroy (FcFontSet *fs);
+
 /* fcmatrix.c */
 FcMatrix *
 FcMatrixCopy (const FcMatrix *mat);