aboutsummaryrefslogtreecommitdiff
path: root/libXft/include/X11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
committermarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
commit1678a69116d1c6ce900fe15f7813613bb28416dd (patch)
tree9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXft/include/X11
parent9d911bc1246139019e555f443e934677a067bc0a (diff)
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libfontenc/src/fontenc.c
Diffstat (limited to 'libXft/include/X11')
-rw-r--r--libXft/include/X11/Xft/Xft.h.in42
1 files changed, 21 insertions, 21 deletions
diff --git a/libXft/include/X11/Xft/Xft.h.in b/libXft/include/X11/Xft/Xft.h.in
index 490945fc5..9b3b475c6 100644
--- a/libXft/include/X11/Xft/Xft.h.in
+++ b/libXft/include/X11/Xft/Xft.h.in
@@ -104,7 +104,7 @@ typedef struct _XftGlyphFontSpec {
_XFUNCPROTOBEGIN
-
+
/* xftcolor.c */
Bool
XftColorAllocName (Display *dpy,
@@ -129,13 +129,13 @@ XftColorFree (Display *dpy,
/* xftdpy.c */
Bool
XftDefaultHasRender (Display *dpy);
-
+
Bool
XftDefaultSet (Display *dpy, FcPattern *defaults);
void
XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern);
-
+
/* xftdraw.c */
XftDraw *
@@ -149,7 +149,7 @@ XftDrawCreateBitmap (Display *dpy,
Pixmap bitmap);
XftDraw *
-XftDrawCreateAlpha (Display *dpy,
+XftDrawCreateAlpha (Display *dpy,
Pixmap pixmap,
int depth);
@@ -191,7 +191,7 @@ void
XftDrawString8 (XftDraw *draw,
_Xconst XftColor *color,
XftFont *pub,
- int x,
+ int x,
int y,
_Xconst FcChar8 *string,
int len);
@@ -218,7 +218,7 @@ void
XftDrawStringUtf8 (XftDraw *draw,
_Xconst XftColor *color,
XftFont *pub,
- int x,
+ int x,
int y,
_Xconst FcChar8 *string,
int len);
@@ -262,7 +262,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
void
XftDrawRect (XftDraw *draw,
_Xconst XftColor *color,
- int x,
+ int x,
int y,
unsigned int width,
unsigned int height);
@@ -296,35 +296,35 @@ XftGlyphExtents (Display *dpy,
void
XftTextExtents8 (Display *dpy,
XftFont *pub,
- _Xconst FcChar8 *string,
+ _Xconst FcChar8 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtents16 (Display *dpy,
XftFont *pub,
- _Xconst FcChar16 *string,
+ _Xconst FcChar16 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtents32 (Display *dpy,
XftFont *pub,
- _Xconst FcChar32 *string,
+ _Xconst FcChar32 *string,
int len,
XGlyphInfo *extents);
-
+
void
XftTextExtentsUtf8 (Display *dpy,
XftFont *pub,
- _Xconst FcChar8 *string,
+ _Xconst FcChar8 *string,
int len,
XGlyphInfo *extents);
void
XftTextExtentsUtf16 (Display *dpy,
XftFont *pub,
- _Xconst FcChar8 *string,
+ _Xconst FcChar8 *string,
FcEndian endian,
int len,
XGlyphInfo *extents);
@@ -366,8 +366,8 @@ FcBool
XftFontInfoEqual (_Xconst XftFontInfo *a, _Xconst XftFontInfo *b);
XftFont *
-XftFontOpenInfo (Display *dpy,
- FcPattern *pattern,
+XftFontOpenInfo (Display *dpy,
+ FcPattern *pattern,
XftFontInfo *fi);
XftFont *
@@ -410,12 +410,12 @@ FcBool
XftCharExists (Display *dpy,
XftFont *pub,
FcChar32 ucs4);
-
+
FT_UInt
-XftCharIndex (Display *dpy,
+XftCharIndex (Display *dpy,
XftFont *pub,
FcChar32 ucs4);
-
+
/* xftinit.c */
FcBool
XftInit (_Xconst char *config);
@@ -431,7 +431,7 @@ XftListFonts (Display *dpy,
...) _X_SENTINEL(0);
/* xftname.c */
-FcPattern
+FcPattern
*XftNameParse (_Xconst char *name);
/* xftrender.c */
@@ -465,7 +465,7 @@ XftCharSpecRender (Display *dpy,
Picture src,
XftFont *pub,
Picture dst,
- int srcx,
+ int srcx,
int srcy,
_Xconst XftCharSpec *chars,
int len);
@@ -611,7 +611,7 @@ XftTextRenderUtf16 (Display *dpy,
/* xftxlfd.c */
FcPattern *
XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete);
-
+
_XFUNCPROTOEND
#endif /* _XFT_H_ */