From d7b40bfbde99825269c97a12af4897d9b5ef9be2 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:48:39 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- include/X11/Xft/Xft.h | 5 +++-- include/X11/Xft/XftCompat.h | 5 +---- src/xftcore.c | 6 ++---- src/xftdraw.c | 6 +++--- src/xftfreetype.c | 6 +++--- src/xftglyphs.c | 5 +++-- src/xftlist.c | 2 +- src/xftxlfd.c | 8 +++----- xft-config.in | 3 ++- xft.pc.in | 3 ++- 10 files changed, 23 insertions(+), 26 deletions(-) diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h index edba002..db3cd24 100644 --- a/include/X11/Xft/Xft.h +++ b/include/X11/Xft/Xft.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/Xft.h,v 1.32 2003/02/25 21:57:53 dawes Exp $ + * $XFree86: xc/lib/Xft/Xft.h,v 1.33 2003/11/20 22:36:33 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -32,7 +32,8 @@ #define XftVersion XFT_VERSION #include -#include +#include +#include FT_FREETYPE_H #include #include diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h index 9ddfc59..470b750 100644 --- a/include/X11/Xft/XftCompat.h +++ b/include/X11/Xft/XftCompat.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/XftCompat.h,v 1.5 2002/10/02 07:02:32 keithp Exp $ + * $XFree86: xc/lib/Xft/XftCompat.h,v 1.6 2003/08/06 14:03:59 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -111,9 +111,6 @@ typedef FcObjectSet XftObjectSet; #define XftObjectSetDestroy FcObjectSetDestroy #define XftObjectSetVaBuild FcObjectSetVaBuild #define XftObjectSetBuild FcObjectSetBuild - -#define XftListFontsPatternObjects FcListFontsPatternObjects - #define XftFontSetMatch FcFontSetMatch #define XftFontSetDestroy FcFontSetDestroy diff --git a/src/xftcore.c b/src/xftcore.c index 5c0009d..25e78b7 100644 --- a/src/xftcore.c +++ b/src/xftcore.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftcore.c,v 1.13 2003/02/15 22:30:51 dawes Exp $ + * $XFree86: xc/lib/Xft/xftcore.c,v 1.14 2003/05/27 22:26:40 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -918,10 +918,8 @@ _XftGlyphDefault (Display *dpy, XftFont *public) XftFontInt *font = (XftFontInt *) public; FT_UInt missing[XFT_NMISSING]; int nmissing; - FcBool glyphs_loaded = FcFalse; - if (XftFontCheckGlyph (dpy, public, FcTrue, 0, missing, &nmissing)) - glyphs_loaded = FcTrue; + XftFontCheckGlyph (dpy, public, FcTrue, 0, missing, &nmissing); if (nmissing) XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing); return font->glyphs[0]; diff --git a/src/xftdraw.c b/src/xftdraw.c index d70266c..e25bf5b 100644 --- a/src/xftdraw.c +++ b/src/xftdraw.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftdraw.c,v 1.25 2002/10/11 17:53:02 keithp Exp $ + * $XFree86: xc/lib/Xft/xftdraw.c,v 1.26 2003/04/03 22:25:50 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw *draw, { XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color), src, draw->render.pict, - 0, 0, glyphs, i - start); + 0, 0, glyphs + start , i - start); } } else @@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw *draw, while (i < len && !((XftFontInt *) glyphs[i].font)->format) i++; if (_XftDrawCorePrepare (draw, color)) - XftGlyphFontSpecCore (draw, color, glyphs, len); + XftGlyphFontSpecCore (draw, color, glyphs + start, i - start); } } } diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 1d3a473..6fce545 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.29 2002/10/11 17:53:02 keithp Exp $ + * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.30 2003/03/26 20:43:51 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -51,7 +51,7 @@ _XftGetFile (const FcChar8 *file, int id) for (f = _XftFtFiles; f; f = f->next) { - if (!strcmp (f->file, (void *) file) && f->id == id) + if (!strcmp (f->file, (char *) file) && f->id == id) { ++f->ref; if (XftDebug () & XFT_DBG_REF) @@ -74,7 +74,7 @@ _XftGetFile (const FcChar8 *file, int id) f->ref = 1; f->file = (char *) (f+1); - strcpy (f->file, (void *) file); + strcpy (f->file, (char *) file); f->id = id; f->lock = 0; diff --git a/src/xftglyphs.c b/src/xftglyphs.c index 85521f0..900f1f5 100644 --- a/src/xftglyphs.c +++ b/src/xftglyphs.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.23 2002/10/11 17:53:02 keithp Exp $ + * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.24 2003/11/20 22:36:33 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -26,7 +26,8 @@ #include #include #include "xftint.h" -#include +#include +#include FT_OUTLINE_H #include static const int filters[3][3] = { diff --git a/src/xftlist.c b/src/xftlist.c index 3ec9380..e96f553 100644 --- a/src/xftlist.c +++ b/src/xftlist.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftlist.c,v 1.3 2002/02/15 07:36:11 keithp Exp $ + * $XFree86: xc/lib/Xft/xftlist.c,v 1.4 2003/08/06 14:03:59 eich Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftxlfd.c b/src/xftxlfd.c index 87e500e..dd15630 100644 --- a/src/xftxlfd.c +++ b/src/xftxlfd.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftxlfd.c,v 1.9 2002/08/31 18:08:10 keithp Exp $ + * $XFree86: xc/lib/Xft/xftxlfd.c,v 1.10 2003/05/27 22:26:41 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -94,8 +94,6 @@ XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete) const char *family; const char *weight_name; const char *slant; - const char *registry; - const char *encoding; char *save; int pixel; int point; @@ -118,9 +116,9 @@ XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete) if (!(xlfd = XftGetInt (++xlfd, &resy))) return 0; if (!(xlfd = strchr (/* spacing = */ ++xlfd, '-'))) return 0; if (!(xlfd = strchr (/* average_width = */ ++xlfd, '-'))) return 0; - if (!(xlfd = strchr (registry = ++xlfd, '-'))) return 0; + if (!(xlfd = strchr (/* registry = */ ++xlfd, '-'))) return 0; /* make sure no fields follow this one */ - if ((xlfd = strchr (encoding = ++xlfd, '-'))) return 0; + if ((xlfd = strchr (/* encoding = */ ++xlfd, '-'))) return 0; if (!pixel) return 0; diff --git a/xft-config.in b/xft-config.in index 6d40b04..755ad83 100644 --- a/xft-config.in +++ b/xft-config.in @@ -3,6 +3,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" +hardcode_libdir_flag_spec=@hardcode_libdir_flag_spec@ includedir="@includedir@" version="@PACKAGE_VERSION@" freetypelibs="@FREETYPE_LIBS@" @@ -91,7 +92,7 @@ fi if test "$echo_libs" = "yes" ; then libs="-lXft ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}" if test "${libdir}" != "/usr/lib" ; then - echo -L${libdir} $libs + echo ${hardcode_libdir_flag_spec} -L${libdir} $libs else echo $libs fi diff --git a/xft.pc.in b/xft.pc.in index c9c074c..1ec7df8 100644 --- a/xft.pc.in +++ b/xft.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ +hardcode_libdir_flag_spec=@hardcode_libdir_flag_spec@ includedir=@includedir@ freetypelibs=@FREETYPE_LIBS@ freetypecflags=@FREETYPE_CFLAGS@ @@ -11,5 +12,5 @@ Name: Xft Description: X FreeType library Version: @PACKAGE_VERSION@ Requires: fontconfig -Libs: -L${libdir} -lXft ${freetypelibs} ${xrenderlibs} +Libs: ${hardcode_libdir_flag_spec} -L${libdir} -lXft ${freetypelibs} ${xrenderlibs} Cflags: -I${includedir} ${freetypecflags} ${xrendercflags} -- cgit v1.2.1