From f4c80a78ce0e5648334fc43e5c93a068ed3ec5be Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
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 <keithp@keithp.com>
 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 <keithp@keithp.com>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 nx-X11/programs/Xserver/include/dixfont.h    | 36 +++++++++++++++++++++-------
 nx-X11/programs/Xserver/include/dixfontstr.h |  3 +++
 2 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'nx-X11/programs/Xserver/include')

diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h
index 004acefbf..21d917fe5 100644
--- a/nx-X11/programs/Xserver/include/dixfont.h
+++ b/nx-X11/programs/Xserver/include/dixfont.h
@@ -29,11 +29,21 @@ SOFTWARE.
 #include "closure.h"
 #include <X11/fonts/fontstruct.h>
 
+#ifdef HAS_XFONT2
+# include <X11/fonts/libxfont2.h>
+#else
+# include <X11/fonts/fontutil.h>
+#endif /* HAS XFONT2 */
+
 #define NullDIXFontProp ((DIXFontPropPtr)0)
 
 typedef struct _DIXFontProp *DIXFontPropPtr;
 
+#ifdef HAS_XFONT2
+xfont2_fpe_funcs_rec const **fpe_functions;
+#else
 extern FPEFunctions *fpe_functions;
+#endif /* HAS_XFONT2 */
 
 extern int FontToXError(int /*err*/);
 
@@ -124,14 +134,25 @@ extern void InitFonts(void);
 
 extern void FreeFonts(void);
 
+#ifdef HAS_XFONT2
+extern void GetGlyphs(FontPtr /*font */ ,
+		      unsigned long /*count */ ,
+		      unsigned char * /*chars */ ,
+		      FontEncoding /*fontEncoding */ ,
+		      unsigned long * /*glyphcount */ ,
+		      CharInfoPtr * /*glyphs */ );
+#else
 extern FontPtr find_old_font(XID /*id*/);
 
-extern void GetGlyphs(FontPtr     /*font*/,
-		      unsigned long /*count*/,
-		      unsigned char * /*chars*/,
-		      FontEncoding /*fontEncoding*/,
-		      unsigned long * /*glyphcount*/,
-		      CharInfoPtr * /*glyphs*/);
+#define GetGlyphs dixGetGlyphs
+extern void dixGetGlyphs(FontPtr     /*font*/,
+			 unsigned long /*count*/,
+			 unsigned char * /*chars*/,
+			 FontEncoding /*fontEncoding*/,
+			 unsigned long * /*glyphcount*/,
+			 CharInfoPtr * /*glyphs*/);
+
+extern void register_fpe_functions(void);
 
 extern void QueryGlyphExtents(FontPtr     /*pFont*/,
 			      CharInfoPtr * /*charinfo*/,
@@ -142,6 +163,7 @@ extern Bool QueryTextExtents(FontPtr     /*pFont*/,
 			     unsigned long /*count*/,
 			     unsigned char * /*chars*/,
 			     ExtentInfoPtr /*info*/);
+#endif /* HAS_XFONT2 */
 
 extern Bool ParseGlyphCachingMode(char * /*str*/);
 
@@ -149,6 +171,4 @@ extern void InitGlyphCaching(void);
 
 extern void SetGlyphCachingMode(int /*newmode*/);
 
-extern void register_fpe_functions(void);
-
 #endif				/* DIXFONT_H */
diff --git a/nx-X11/programs/Xserver/include/dixfontstr.h b/nx-X11/programs/Xserver/include/dixfontstr.h
index a2cb3639c..3e76f9e6a 100644
--- a/nx-X11/programs/Xserver/include/dixfontstr.h
+++ b/nx-X11/programs/Xserver/include/dixfontstr.h
@@ -27,6 +27,9 @@ SOFTWARE.
 #include "servermd.h"
 #include "dixfont.h"
 #include <X11/fonts/fontstruct.h>
+#ifdef HAS_XFONT2
+# include <X11/fonts/libxfont2.h>
+#endif /* HAS_XFONT2 */
 #include "closure.h"
 #include <nx-X11/Xproto.h> /* for xQueryFontReply */
 
-- 
cgit v1.2.3