X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fontconfig%2Ffontconfig.h;h=c9f20cc0074067333acd43a05f50752207919636;hb=300b495dc400df401afaacfa4e986092ea119865;hp=17048e35083b1678cdda7eb041a6fac2abc24ccc;hpb=79641a3b0c2b4a0c2e1a315028f0e54a9d846003;p=fontconfig.git diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index 17048e3..c9f20cc 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.30 2002/09/26 00:17:27 keithp Exp $ + * fontconfig/fontconfig/fontconfig.h * * Copyright © 2001 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -27,7 +27,6 @@ #include #include -#include #include #if defined(__GNUC__) && (__GNUC__ >= 4) @@ -52,8 +51,8 @@ typedef int FcBool; */ #define FC_MAJOR 2 -#define FC_MINOR 4 -#define FC_REVISION 2 +#define FC_MINOR 8 +#define FC_REVISION 0 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) @@ -67,7 +66,7 @@ typedef int FcBool; * it means multiple copies of the font information. */ -#define FC_CACHE_VERSION "2" +#define FC_CACHE_VERSION "3" #define FcTrue 1 #define FcFalse 0 @@ -111,6 +110,7 @@ typedef int FcBool; #define FC_EMBOLDEN "embolden" /* Bool - true if emboldening needed*/ #define FC_EMBEDDED_BITMAP "embeddedbitmap" /* Bool - true to enable embedded bitmaps */ #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ +#define FC_LCD_FILTER "lcdfilter" /* Int */ #define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION #define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION @@ -171,7 +171,13 @@ typedef int FcBool; #define FC_HINT_SLIGHT 1 #define FC_HINT_MEDIUM 2 #define FC_HINT_FULL 3 - + +/* LCD filter */ +#define FC_LCD_NONE 0 +#define FC_LCD_DEFAULT 1 +#define FC_LCD_LIGHT 2 +#define FC_LCD_LEGACY 3 + typedef enum _FcType { FcTypeVoid, FcTypeInteger, @@ -228,7 +234,6 @@ typedef struct _FcValue { const FcMatrix *m; const FcCharSet *c; void *f; - const FcPattern *p; const FcLangSet *l; } u; } FcValue; @@ -250,7 +255,10 @@ typedef enum _FcMatchKind { } FcMatchKind; typedef enum _FcLangResult { - FcLangEqual, FcLangDifferentCountry, FcLangDifferentLang + FcLangEqual = 0, + FcLangDifferentCountry = 1, + FcLangDifferentTerritory = 1, + FcLangDifferentLang = 2 } FcLangResult; typedef enum _FcSetName { @@ -333,6 +341,9 @@ FcConfigFilename (const FcChar8 *url); FcPublic FcConfig * FcConfigCreate (void); +FcPublic FcConfig * +FcConfigReference (FcConfig *config); + FcPublic void FcConfigDestroy (FcConfig *config); @@ -367,10 +378,10 @@ FcPublic FcStrList * FcConfigGetCacheDirs (FcConfig *config); FcPublic int -FcConfigGetRescanInverval (FcConfig *config); +FcConfigGetRescanInterval (FcConfig *config); FcPublic FcBool -FcConfigSetRescanInverval (FcConfig *config, int rescanInterval); +FcConfigSetRescanInterval (FcConfig *config, int rescanInterval); FcPublic FcFontSet * FcConfigGetFonts (FcConfig *config, @@ -427,6 +438,9 @@ FcCharSetUnion (const FcCharSet *a, const FcCharSet *b); FcPublic FcCharSet* FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b); +FcPublic FcBool +FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed); + FcPublic FcBool FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4); @@ -549,6 +563,12 @@ FcPublic FcBool FcInitBringUptoDate (void); /* fclang.c */ +FcPublic FcStrSet * +FcGetLangs (void); + +FcPublic const FcCharSet * +FcLangGetCharSet (const FcChar8 *lang); + FcPublic FcLangSet* FcLangSetCreate (void); @@ -576,6 +596,9 @@ FcLangSetEqual (const FcLangSet *lsa, const FcLangSet *lsb); FcPublic FcChar32 FcLangSetHash (const FcLangSet *ls); +FcPublic FcStrSet * +FcLangSetGetLangs (const FcLangSet *ls); + /* fclist.c */ FcPublic FcObjectSet * FcObjectSetCreate (void); @@ -725,6 +748,9 @@ FcPatternDuplicate (const FcPattern *p); FcPublic void FcPatternReference (FcPattern *p); +FcPublic FcPattern * +FcPatternFilter (FcPattern *p, const FcObjectSet *os); + FcPublic void FcValueDestroy (FcValue v); @@ -804,10 +830,13 @@ FcPublic FcResult FcPatternGetLangSet (const FcPattern *p, const char *object, int n, FcLangSet **ls); FcPublic FcPattern * -FcPatternVaBuild (FcPattern *orig, va_list va); +FcPatternVaBuild (FcPattern *p, va_list va); FcPublic FcPattern * -FcPatternBuild (FcPattern *orig, ...) FC_ATTRIBUTE_SENTINEL(0); +FcPatternBuild (FcPattern *p, ...) FC_ATTRIBUTE_SENTINEL(0); + +FcPublic FcChar8 * +FcPatternFormat (FcPattern *pat, const FcChar8 *format); /* fcstr.c */ @@ -883,25 +912,25 @@ FcPublic FcStrSet * FcStrSetCreate (void); FcPublic FcBool -FcStrSetMember (FcPublic FcStrSet *set, const FcChar8 *s); +FcStrSetMember (FcStrSet *set, const FcChar8 *s); FcPublic FcBool -FcStrSetEqual (FcPublic FcStrSet *sa, FcPublic FcStrSet *sb); +FcStrSetEqual (FcStrSet *sa, FcStrSet *sb); FcPublic FcBool -FcStrSetAdd (FcPublic FcStrSet *set, const FcChar8 *s); +FcStrSetAdd (FcStrSet *set, const FcChar8 *s); FcPublic FcBool -FcStrSetAddFilename (FcPublic FcStrSet *set, const FcChar8 *s); +FcStrSetAddFilename (FcStrSet *set, const FcChar8 *s); FcPublic FcBool -FcStrSetDel (FcPublic FcStrSet *set, const FcChar8 *s); +FcStrSetDel (FcStrSet *set, const FcChar8 *s); FcPublic void -FcStrSetDestroy (FcPublic FcStrSet *set); +FcStrSetDestroy (FcStrSet *set); FcPublic FcStrList * -FcStrListCreate (FcPublic FcStrSet *set); +FcStrListCreate (FcStrSet *set); FcPublic FcChar8 * FcStrListNext (FcStrList *list); @@ -917,4 +946,17 @@ _FCFUNCPROTOEND #undef FC_ATTRIBUTE_SENTINEL + +#ifndef _FCINT_H_ + +/* + * Deprecated functions are placed here to help users fix their code without + * digging through documentation + */ + +#define FcConfigGetRescanInverval FcConfigGetRescanInverval_REPLACE_BY_FcConfigGetRescanInterval +#define FcConfigSetRescanInverval FcConfigSetRescanInverval_REPLACE_BY_FcConfigSetRescanInterval + +#endif + #endif /* _FONTCONFIG_H_ */