diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-09 14:05:57 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 16:09:20 +0200 |
| commit | f4c80a78ce0e5648334fc43e5c93a068ed3ec5be (patch) | |
| tree | 109fac35d5025730fc3bbce7b135118b233878e5 /nx-X11/programs/Xserver/hw/nxagent/Font.c | |
| parent | f743f9f743362c891f049a514cdcf3d39546194b (diff) | |
| download | nx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.tar.gz nx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.tar.bz2 nx-libs-f4c80a78ce0e5648334fc43e5c93a068ed3ec5be.zip | |
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>
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index e1f12e733..f9c682765 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -41,6 +41,7 @@ is" without express or implied warranty. #include "dixstruct.h" #include <X11/fonts/font.h> #include <X11/fonts/fontstruct.h> +#include "dixfontstr.h" #include "misc.h" #include "miscstruct.h" #include "opaque.h" @@ -495,7 +496,11 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) const char *name; char *origName = (char*) pScreen; +#ifdef HAS_XFONT2 + xfont2_font_set_private(pFont, nxagentFontPrivateIndex, NULL); +#else FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL); +#endif /* HAS_XFONT2 */ if (requestingClient && XpClientIsPrintClient(requestingClient, NULL)) return True; @@ -540,7 +545,11 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) } priv = (void *)malloc(sizeof(nxagentPrivFont)); +#ifdef HAS_XFONT2 + xfont2_font_set_private(pFont, nxagentFontPrivateIndex, priv); +#else FontSetPrivate(pFont, nxagentFontPrivateIndex, priv); +#endif /* HAS_XFONT2 */ nxagentFontPriv(pFont) -> mirrorID = 0; @@ -688,7 +697,11 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) FreeResource(nxagentFontPriv(pFont) -> mirrorID, RT_NONE); free(nxagentFontPriv(pFont)); +#ifdef HAS_XFONT2 + xfont2_font_set_private(pFont, nxagentFontPrivateIndex, NULL); +#else FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL); +#endif /* HAS_XFONT2 */ } return True; |