From f4c80a78ce0e5648334fc43e5c93a068ed3ec5be Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 14:05:57 +0100 Subject: Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API alike. Fixes ArcticaProject/nx-libs#296. Inspired by the following X.org commit. Other than X.org, we will continue support for building nx-libs against libXfont1 for a while. commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Author: Keith Packard Date: Tue Sep 1 18:50:55 2015 -0700 dix: Switch to the libXfont2 API (v2) This new libXfont API eliminates exposing internal X server symbols to the font library, replacing those with a struct full of the entire API needed to use that library. v2: Use libXfont2 instead of libXfont_2 Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- nx-X11/programs/Xserver/miext/damage/damage.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'nx-X11/programs/Xserver/miext/damage/damage.c') diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index 348adcb65..9c9161d36 100644 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -34,6 +34,11 @@ #include #include "dixfontstr.h" #include +#ifdef HAS_XFONT2 +# include +#else +# include +#endif /* HAS_XFONT2 */ #include "mi.h" #include "regionstr.h" #include "globals.h" @@ -1297,7 +1302,11 @@ damageDamageChars (DrawablePtr pDrawable, ExtentInfoRec extents; BoxRec box; +#ifdef HAS_XFONT2 + xfont2_query_glyph_extents(font, charinfo, n, &extents); +#else QueryGlyphExtents(font, charinfo, n, &extents); +#endif /* HAS_XFONT2 */ if (imageblt) { if (extents.overallWidth > extents.overallRight) -- cgit v1.2.3