diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
| commit | cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (patch) | |
| tree | e22b443672f84f9305e682f2c6c0d0e896b967a6 /nx-X11/programs/Xserver/Xext/xf86bigfont.c | |
| parent | 9e2588e56f5b712c4501a19c1f723257c05aa6af (diff) | |
| parent | c4c5485474a03bcfd2632d12c2e6e88ba20be471 (diff) | |
| download | nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.gz nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.bz2 nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.zip | |
Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.x
Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xf86bigfont.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 4c8f02c2c..d8cae74ef 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -75,6 +75,10 @@ #define _XF86BIGFONT_SERVER_ #include <nx-X11/extensions/xf86bigfproto.h> +#ifdef HAS_XFONT2 +# include <X11/fonts/libxfont2.h> +#endif /* HAS_XFONT2 */ + static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ ); @@ -186,7 +190,11 @@ XFree86BigfontExtensionInit() + (unsigned int) (65536.0/(RAND_MAX+1.0) * rand()); /* fprintf(stderr, "signature = 0x%08X\n", signature); */ +#ifdef HAS_XFONT2 + FontShmdescIndex = xfont2_allocate_font_private_index(); +#else FontShmdescIndex = AllocateFontPrivateIndex(); +#endif /* HAS_XFONT2 */ #if !defined(CSRG_BASED) && !defined(__CYGWIN__) pagesize = SHMLBA; @@ -526,7 +534,11 @@ ProcXF86BigfontQueryFont( #ifdef HAS_SHM if (pDesc && !badSysCall) { *(CARD32 *)(pCI + nCharInfos) = signature; +#ifdef HAS_XFONT2 + if (!xfont2_font_set_private(pFont, FontShmdescIndex, pDesc)) { +#else if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) { +#endif /* HAS_XFONT2 */ shmdealloc(pDesc); return BadAlloc; } |