xft: Changes to 'upstream-unstable'
.gitignore | 11
Makefile.am | 6
NEWS | 57 ++++
README | 59 +---
configure.ac | 34 +-
include/X11/Xft/Xft.h | 630 -----------------------------------------------
include/X11/Xft/Xft.h.in | 617 ++++++++++++++++++++++++++++++++++++++++++++++
man/.gitignore | 4
src/.gitignore | 6
src/Makefile.am | 4
src/xftcore.c | 6
src/xftdpy.c | 18 -
src/xftdraw.c | 30 +-
src/xftextent.c | 2
src/xftfont.c | 26 -
src/xftfreetype.c | 57 ++--
src/xftglyphs.c | 12
src/xftinit.c | 2
src/xftlist.c | 6
src/xftname.c | 2
src/xftrender.c | 8
src/xftxlfd.c | 38 +-
22 files changed, 844 insertions(+), 791 deletions(-)
New commits:
commit fc248fb44413d11fed288793d0d8c2af76aeeb40
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 16:45:25 2009 -0700
libXft 2.1.14
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/NEWS b/NEWS
index e6e8f26..6e4e225 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
Xft
X FreeType library
- Version 2.1.13
- 2008-7-2
+ Version 2.1.14
+ 2009-10-09
Xft version 2.1 is the first stand alone release of Xft, a library that
connects X applications with the FreeType font rasterization library. Xft
uses fontconfig to locate fonts so it has no configuration files.
+Version 2.1.14
+
+Added fake bold support (#1579, Novell #38202/223682).
+
Version 2.1.13
Fix hashing in 64-bit versions. Register objects with freetype.
diff --git a/configure.ac b/configure.ac
index cd76278..141fd25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl This is the package version number, not the shared library
dnl version. This version number will be substituted into Xft.h
dnl Please bump the minor library number at each release as well.
dnl
-AC_INIT(libXft, 2.1.13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
+AC_INIT(libXft, 2.1.14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
commit 0f2a55b55d18272824444071f71473d988112465
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 09:18:43 2009 -0700
Add generated Xft.h to .gitignore
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/.gitignore b/.gitignore
index cf30f02..0658e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ xft.pc
libXft-*.tar.*
ChangeLog
tags
+include/X11/Xft/Xft.h
commit c36e28b3ed913d2dcb5c7876e49ccf2631a11df4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 15:00:04 2009 -0700
Fix install of generated Xft.h when builddir != srcdir
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index d3c99b7..6417dbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
- $(CWARNFLAGS) -I$(top_srcdir)/include/X11/Xft
+ $(CWARNFLAGS) -I$(top_builddir)/include/X11/Xft
lib_LTLIBRARIES = libXft.la
@@ -28,5 +28,5 @@ libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \
- $(top_srcdir)/include/X11/Xft/Xft.h \
+ $(top_builddir)/include/X11/Xft/Xft.h \
$(top_srcdir)/include/X11/Xft/XftCompat.h
commit c498ec3e4fb8e07bad7b053535d832273ac9b402
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 01:01:07 2009 -0700
Split NEWS & README, update both
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/NEWS b/NEWS
index e69de29..e6e8f26 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,53 @@
+ Xft
+ X FreeType library
+ Version 2.1.13
+ 2008-7-2
+
+Xft version 2.1 is the first stand alone release of Xft, a library that
+connects X applications with the FreeType font rasterization library. Xft
+uses fontconfig to locate fonts so it has no configuration files.
+
+Version 2.1.13
+
+Fix hashing in 64-bit versions. Register objects with freetype.
+Fix XftDrawRect when Render not supported.
+
+Version 2.1.12
+
+Fix exporting of XftNameUnparse function.
+
+Version 2.1.9
+
+Stop exporting unnecessary symbols.
+
+Version 2.1.7
+
+Change FC_CHARCELL and FC_MONO interpretation. FC_MONO no longer clips
+glyphs to charcell, you must specify FC_CHARCELL for that.
+
+Add support for FT_GlyphSlot_Embolden where it exists (which it usually
+doesn't).
+
+Avoid crashing when using FT_Face objects.
+
+Version 2.1.6
+
+Deal with broken FreeType 2.1.7 BDF/PCF loaders by trying both y_ppem/x_ppem
+and width/height values.
+
+Version 2.1.5
+
+Left some #warnings from testing in the 2.1.4 release. Spin again.
+
+Version 2.1.4
+
+Work with older versions of Fontconfig by using various pattern elements
+only when defined.
+
+Version 2.1.3
+
+Change Freetype includes to new syntax.
+
+Search for nearest bitmap for bitmap-only fonts.
+
+Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.
diff --git a/README b/README
index 24dc8d6..b1097eb 100644
--- a/README
+++ b/README
@@ -1,63 +1,52 @@
Xft
X FreeType library
- Version 2.1.7
- 2005-3-29
Xft version 2.1 is the first stand alone release of Xft, a library that
connects X applications with the FreeType font rasterization library. Xft
uses fontconfig to locate fonts so it has no configuration files.
-Version 2.1.7
+Before building Xft you will need to have installed:
+ freetype http://freetype.org/
+ fontconfig http://fontconfig.org/
+ libX11, libXext, & libXrender http://x.org/
-Change FC_CHARCELL and FC_MONO interpretation. FC_MONO no longer clips
-glyphs to charcell, you must specify FC_CHARCELL for that.
+All questions regarding this software should be directed at the
+Xorg mailing list:
-Add support for FT_GlyphSlot_Embolden where it exists (which it usually
-doesn't).
+ http://lists.freedesktop.org/mailman/listinfo/xorg
-Avoid crashing when using FT_Face objects.
+Please submit bug reports to the Xorg bugzilla:
-Version 2.1.6
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-Deal with broken FreeType 2.1.7 BDF/PCF loaders by trying both y_ppem/x_ppem
-and width/height values.
+The master development code repository can be found at:
-Version 2.1.5
+ git://anongit.freedesktop.org/git/xorg/lib/libXft
-Left some #warnings from testing in the 2.1.4 release. Spin again.
+ http://cgit.freedesktop.org/xorg/lib/libXft
-Version 2.1.4
+For patch submission instructions, see:
-Work with older versions of Fontconfig by using various pattern elements
-only when defined.
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-Version 2.1.3
+For more information on the git code manager, see:
-Change Freetype includes to new syntax.
-
-Search for nearest bitmap for bitmap-only fonts.
-
-Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.
+ http://wiki.x.org/wiki/GitPage
To release a version of this library:
1. Update the version number in configure.ac
- 2. Fix the README
+ 2. Fix the NEWS file
Change version number
Set the date
+ add highlights
3. Commit those changes
4. rebuild the configuration files with autogen.sh
sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man
- 5. make distcheck
- 6. tag the tree
- cvs tag Xft-2_1_xx
- 7. Copy Xft-2.1.xx.tar.gz and Xft-2.1.xx.tar.bz2 to
- freedesktop.org:/srv/xlibs.freedesktop.org/www/release
- 8. Compute md5sums for release files:
- md5sum Xft-2.1.xx.tar.gz Xft-2.1.xx.tar.bz2
- 9. Post a note to xorg@freedesktop.org. Include the md5sums.
- gpg sign the message.
-
+ 5. Follow the steps listed in
+ http://xorg.freedesktop.org/wiki/Development/Documentation/ReleaseHOWTO
Keith Packard
keithp@keithp.com
+
+
commit dac73a51981632908ce86cff26af5b0bcfcdd770
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 00:39:14 2009 -0700
Set Xft.h version numbers from configure.ac
Keep the two in sync automatically instead of manually
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index 4a18a4c..24dc8d6 100644
--- a/README
+++ b/README
@@ -41,9 +41,7 @@ Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.
To release a version of this library:
- 1. Update the version numbers
- configure.ac
- Xft.h
+ 1. Update the version number in configure.ac
2. Fix the README
Change version number
Set the date
diff --git a/configure.ac b/configure.ac
index 35a3c7f..cd76278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,7 @@ AC_PREREQ([2.57])
dnl
dnl This is the package version number, not the shared library
-dnl version. This same version number must appear in Xft.h
-dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
-dnl not possible to extract the version number here from Xft.h
+dnl version. This version number will be substituted into Xft.h
dnl Please bump the minor library number at each release as well.
dnl
AC_INIT(libXft, 2.1.13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
@@ -46,6 +44,19 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
+# Set library version for Xft.h from package version set in AC_INIT
+# copied from PACKAGE_VERSION_* settings in XORG_VERSION
+AC_CONFIG_HEADERS([include/X11/Xft/Xft.h])
+AC_DEFINE_UNQUOTED([XFT_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of Xft])
+AC_DEFINE_UNQUOTED([XFT_MINOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`],
+ [Minor version of Xft])
+AC_DEFINE_UNQUOTED([XFT_REVISION],
+ [`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`],
+ [Micro revision of Xft])
+
#
# Check for Xrender
#
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h
deleted file mode 100644
index 569807c..0000000
--- a/include/X11/Xft/Xft.h
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * 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,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _XFT_H_
-#define _XFT_H_
-
-/*
- * Current Xft version number. This same number
- * must appear in the Xft configure.ac file. Yes,
- * it'a a pain to synchronize version numbers like this.
- */
-
-#define XFT_MAJOR 2
-#define XFT_MINOR 1
-#define XFT_REVISION 13
-#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
-#define XftVersion XFT_VERSION
-
-#include <stdarg.h>
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include <fontconfig/fontconfig.h>
-#include <X11/extensions/Xrender.h>
-
-#include <X11/Xfuncproto.h>
-/* #include <X11/Xosdefs.h>*/
-#ifndef _X_SENTINEL
-# define _X_SENTINEL(x)
-#endif
-
-#ifndef _XFT_NO_COMPAT_
-#include <X11/Xft/XftCompat.h>
-#endif
-
-#define XFT_CORE "core"
-#define XFT_RENDER "render"
-#define XFT_XLFD "xlfd"
-#define XFT_MAX_GLYPH_MEMORY "maxglyphmemory"
-#define XFT_MAX_UNREF_FONTS "maxunreffonts"
-
-extern FT_Library _XftFTlibrary;
-
-typedef struct _XftFontInfo XftFontInfo;
-
-typedef struct _XftFont {
- int ascent;
- int descent;
- int height;
- int max_advance_width;
- FcCharSet *charset;
- FcPattern *pattern;
-} XftFont;
-
-typedef struct _XftDraw XftDraw;
-
-typedef struct _XftColor {
- unsigned long pixel;
- XRenderColor color;
-} XftColor;
-
-typedef struct _XftCharSpec {
- FcChar32 ucs4;
- short x;
- short y;
-} XftCharSpec;
-
-typedef struct _XftCharFontSpec {
- XftFont *font;
- FcChar32 ucs4;
- short x;
- short y;
-} XftCharFontSpec;
-
-typedef struct _XftGlyphSpec {
- FT_UInt glyph;
- short x;
- short y;
-} XftGlyphSpec;
-
-typedef struct _XftGlyphFontSpec {
- XftFont *font;
- FT_UInt glyph;
- short x;
- short y;
-} XftGlyphFontSpec;
-
-_XFUNCPROTOBEGIN
-
-
-/* xftcolor.c */
-Bool
-XftColorAllocName (Display *dpy,
- _Xconst Visual *visual,
- Colormap cmap,
- _Xconst char *name,
- XftColor *result);
-
-Bool
-XftColorAllocValue (Display *dpy,
- Visual *visual,
- Colormap cmap,
- _Xconst XRenderColor *color,
- XftColor *result);
-
-void
-XftColorFree (Display *dpy,
- Visual *visual,
- Colormap cmap,
- XftColor *color);
-
-/* xftdpy.c */
-Bool
-XftDefaultHasRender (Display *dpy);
-
-Bool
-XftDefaultSet (Display *dpy, FcPattern *defaults);
-
-void
-XftDefaultSubstitute (Display *dpy, int screen, FcPattern *pattern);
-
-/* xftdraw.c */
-
-XftDraw *
-XftDrawCreate (Display *dpy,
- Drawable drawable,
- Visual *visual,
- Colormap colormap);
-
-XftDraw *
-XftDrawCreateBitmap (Display *dpy,
- Pixmap bitmap);
-
-XftDraw *
-XftDrawCreateAlpha (Display *dpy,
- Pixmap pixmap,
- int depth);
-
-void
-XftDrawChange (XftDraw *draw,
- Drawable drawable);
-
-Display *
-XftDrawDisplay (XftDraw *draw);
-
-Drawable
-XftDrawDrawable (XftDraw *draw);
-
-Colormap
-XftDrawColormap (XftDraw *draw);
-
-Visual *
-XftDrawVisual (XftDraw *draw);
-
-void
-XftDrawDestroy (XftDraw *draw);
-
-Picture
-XftDrawPicture (XftDraw *draw);
-
-Picture
-XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color);
-
-void
-XftDrawGlyphs (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FT_UInt *glyphs,
- int nglyphs);
-
-void
-XftDrawString8 (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftDrawString16 (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FcChar16 *string,
- int len);
-
-void
-XftDrawString32 (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FcChar32 *string,
- int len);
-
-void
-XftDrawStringUtf8 (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftDrawStringUtf16 (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- int x,
- int y,
- _Xconst FcChar8 *string,
- FcEndian endian,
- int len);
-
-void
-XftDrawCharSpec (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- _Xconst XftCharSpec *chars,
- int len);
-
-void
-XftDrawCharFontSpec (XftDraw *draw,
- _Xconst XftColor *color,
- _Xconst XftCharFontSpec *chars,
- int len);
-
-void
-XftDrawGlyphSpec (XftDraw *draw,
- _Xconst XftColor *color,
- XftFont *pub,
- _Xconst XftGlyphSpec *glyphs,
- int len);
-
-void
-XftDrawGlyphFontSpec (XftDraw *draw,
- _Xconst XftColor *color,
- _Xconst XftGlyphFontSpec *glyphs,
- int len);
-
-void
-XftDrawRect (XftDraw *draw,
- _Xconst XftColor *color,
- int x,
- int y,
- unsigned int width,
- unsigned int height);
-
-
-Bool
-XftDrawSetClip (XftDraw *draw,
- Region r);
-
-
-Bool
-XftDrawSetClipRectangles (XftDraw *draw,
- int xOrigin,
- int yOrigin,
- _Xconst XRectangle *rects,
- int n);
-
-void
-XftDrawSetSubwindowMode (XftDraw *draw,
- int mode);
-
-/* xftextent.c */
-
-void
-XftGlyphExtents (Display *dpy,
- XftFont *pub,
- _Xconst FT_UInt *glyphs,
- int nglyphs,
- XGlyphInfo *extents);
-
-void
-XftTextExtents8 (Display *dpy,
- XftFont *pub,
- _Xconst FcChar8 *string,
- int len,
- XGlyphInfo *extents);
-
-void
-XftTextExtents16 (Display *dpy,
- XftFont *pub,
- _Xconst FcChar16 *string,
- int len,
- XGlyphInfo *extents);
-
-void
-XftTextExtents32 (Display *dpy,
- XftFont *pub,
- _Xconst FcChar32 *string,
- int len,
- XGlyphInfo *extents);
-
-void
-XftTextExtentsUtf8 (Display *dpy,
- XftFont *pub,
- _Xconst FcChar8 *string,
- int len,
- XGlyphInfo *extents);
-
-void
-XftTextExtentsUtf16 (Display *dpy,
- XftFont *pub,
- _Xconst FcChar8 *string,
- FcEndian endian,
- int len,
- XGlyphInfo *extents);
-
-/* xftfont.c */
-FcPattern *
-XftFontMatch (Display *dpy,
- int screen,
- _Xconst FcPattern *pattern,
- FcResult *result);
-
-XftFont *
-XftFontOpen (Display *dpy, int screen, ...) _X_SENTINEL(0);
-
-XftFont *
-XftFontOpenName (Display *dpy, int screen, _Xconst char *name);
-
-XftFont *
-XftFontOpenXlfd (Display *dpy, int screen, _Xconst char *xlfd);
-
-/* xftfreetype.c */
-
-FT_Face
-XftLockFace (XftFont *pub);
-
-void
-XftUnlockFace (XftFont *pub);
-
-XftFontInfo *
-XftFontInfoCreate (Display *dpy, _Xconst FcPattern *pattern);
-
-void
-XftFontInfoDestroy (Display *dpy, XftFontInfo *fi);
-
-FcChar32
-XftFontInfoHash (_Xconst XftFontInfo *fi);
-
-FcBool
-XftFontInfoEqual (_Xconst XftFontInfo *a, _Xconst XftFontInfo *b);
-
-XftFont *
-XftFontOpenInfo (Display *dpy,
- FcPattern *pattern,
- XftFontInfo *fi);
-
-XftFont *
-XftFontOpenPattern (Display *dpy, FcPattern *pattern);
-
-XftFont *
-XftFontCopy (Display *dpy, XftFont *pub);
-
-void
-XftFontClose (Display *dpy, XftFont *pub);
-
-FcBool
-XftInitFtLibrary(void);
-
-/* xftglyphs.c */
-void
-XftFontLoadGlyphs (Display *dpy,
- XftFont *pub,
- FcBool need_bitmaps,
- _Xconst FT_UInt *glyphs,
- int nglyph);
-
-void
-XftFontUnloadGlyphs (Display *dpy,
- XftFont *pub,
- _Xconst FT_UInt *glyphs,
- int nglyph);
-
-#define XFT_NMISSING 256
-
-FcBool
-XftFontCheckGlyph (Display *dpy,
- XftFont *pub,
- FcBool need_bitmaps,
- FT_UInt glyph,
- FT_UInt *missing,
- int *nmissing);
-
-FcBool
-XftCharExists (Display *dpy,
- XftFont *pub,
- FcChar32 ucs4);
-
-FT_UInt
-XftCharIndex (Display *dpy,
- XftFont *pub,
- FcChar32 ucs4);
-
-/* xftinit.c */
-FcBool
-XftInit (_Xconst char *config);
-
-int
-XftGetVersion (void);
-
-/* xftlist.c */
-
-FcFontSet *
-XftListFonts (Display *dpy,
- int screen,
- ...) _X_SENTINEL(0);
-
-/* xftname.c */
-FcPattern
-*XftNameParse (_Xconst char *name);
-
-/* xftrender.c */
-void
-XftGlyphRender (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FT_UInt *glyphs,
- int nglyphs);
-
-void
-XftGlyphSpecRender (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- _Xconst XftGlyphSpec *glyphs,
- int nglyphs);
-
-void
-XftCharSpecRender (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- _Xconst XftCharSpec *chars,
- int len);
-
-void
-XftGlyphFontSpecRender (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- int srcx,
- int srcy,
- _Xconst XftGlyphFontSpec *glyphs,
- int nglyphs);
-
-void
-XftCharFontSpecRender (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- int srcx,
- int srcy,
- _Xconst XftCharFontSpec *chars,
- int len);
-
-void
-XftTextRender8 (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRender16 (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar16 *string,
- int len);
-
-void
-XftTextRender16BE (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRender16LE (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRender32 (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar32 *string,
- int len);
-
-void
-XftTextRender32BE (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRender32LE (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRenderUtf8 (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- int len);
-
-void
-XftTextRenderUtf16 (Display *dpy,
- int op,
- Picture src,
- XftFont *pub,
- Picture dst,
- int srcx,
- int srcy,
- int x,
- int y,
- _Xconst FcChar8 *string,
- FcEndian endian,
- int len);
-
-/* xftxlfd.c */
-FcPattern *
-XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete);
-
-_XFUNCPROTOEND
-
-#endif /* _XFT_H_ */
diff --git a/include/X11/Xft/Xft.h.in b/include/X11/Xft/Xft.h.in
new file mode 100644
index 0000000..d66f2ec
--- /dev/null
+++ b/include/X11/Xft/Xft.h.in
@@ -0,0 +1,617 @@
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Keith Packard makes no
+ * 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,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _XFT_H_
+#define _XFT_H_
+
+/*
+ * Current Xft version number, set from version in the Xft configure.ac file.
+ */
+
+#undef XFT_MAJOR /* Will be substituted by configure */
+#undef XFT_MINOR /* Will be substituted by configure */
+#undef XFT_REVISION /* Will be substituted by configure */
+
+#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
+#define XftVersion XFT_VERSION
+
+#include <stdarg.h>
+#include <ft2build.h>
Reply to: