[teklib-general] changeset in /hg/teklib/current: added some fontconfig functions...

[Franciska Schulze]

changeset 9dfb79f44af2 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=9dfb79f44af2
description:
	added some fontconfig functions to FcInterface

diffs (61 lines):

diff -r 5547c3fb1092 -r 9dfb79f44af2 src/display_x11/display_x11_font.h
--- a/src/display_x11/display_x11_font.h	Wed Sep 26 23:31:00 2007 +0200
+++ b/src/display_x11/display_x11_font.h	Thu Sep 27 16:54:53 2007 +0200
@@ -70,29 +70,30 @@ struct XftInterface
 	XftFont *(*XftFontOpen)(Display *dpy, int screen, ...);
 	void (*XftFontClose)(Display *dpy, XftFont *pub);
 	void (*XftTextExtentsUtf8)(Display *dpy, XftFont *pub, _Xconst FcChar8 *string,
-           						int len, XGlyphInfo *extents);
+		int len, XGlyphInfo *extents);
 	void (*XftDrawStringUtf8)(XftDraw *draw, _Xconst XftColor *color, XftFont *pub,
-								int x, int y, _Xconst FcChar8  *string, int len);
+		int x, int y, _Xconst FcChar8  *string, int len);
 	void (*XftDrawRect)(XftDraw *draw, _Xconst XftColor *color, int x, int y,
-						unsigned int width, unsigned int height);
+		unsigned int width, unsigned int height);
 	FT_Face (*XftLockFace)(XftFont *pub);
 	void (*XftUnlockFace)(XftFont *pub);
 	Bool (*XftColorAllocValue)(Display *dpy, Visual *visual, Colormap cmap,
-								_Xconst XRenderColor *color, XftColor *result);
-	void (*XftColorFree)(Display *dpy, Visual *visual, Colormap  cmap, XftColor *color);
+		_Xconst XRenderColor *color, XftColor *result);
+	void (*XftColorFree)(Display *dpy, Visual *visual, Colormap  cmap,
+		XftColor *color);
 	XftDraw *(*XftDrawCreate)(Display *dpy, Drawable  drawable, Visual *visual,
-								Colormap colormap);
+		Colormap colormap);
 	void (*XftDrawDestroy)(XftDraw *draw);
 };
 
-#define	LIBFC_NUMSYMS	12
+#define	LIBFC_NUMSYMS	16
 
 struct FcInterface
 {
 	void (*FcDefaultSubstitute)(FcPattern *pattern);
 	void (*FcFontSetDestroy)(FcFontSet *s);
-	FcFontSet *(*FcFontSort)(FcConfig *config, FcPattern *p, FcBool trim, FcCharSet **csp,
-								FcResult *result);
+	FcFontSet *(*FcFontSort)(FcConfig *config, FcPattern *p, FcBool trim,
+		FcCharSet **csp, FcResult *result);
 	FcBool (*FcObjectSetAdd)(FcObjectSet *os, const char *object);
 	FcObjectSet *(*FcObjectSetCreate)(void);
 	FcBool (*FcPatternAddBool)(FcPattern *p, const char *object, FcBool b);
@@ -101,8 +102,16 @@ struct FcInterface
 	FcPattern *(*FcPatternBuild)(FcPattern *orig, ...);
 	void (*FcPatternDestroy)(FcPattern *p);
 	FcBool (*FcPatternEqualSubset)(const FcPattern *pa, const FcPattern *pb,
-									const FcObjectSet *os);
+		const FcObjectSet *os);
 	void (*FcPatternPrint)(const FcPattern *p);
+	FcResult (*FcPatternGetString)(const FcPattern *p, const char *object,
+		int n, FcChar8 **s);
+	FcResult (*FcPatternGetDouble)(const FcPattern *p, const char *object,
+		int n, double *d);
+	FcResult (*FcPatternGetInteger)(const FcPattern *p, const char *object,
+		int n, int *i);
+	FcResult (*FcPatternGetBool)(const FcPattern *p, const char *object,
+		int n, FcBool *b);
 };
 
 /*****************************************************************************/