diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index becc7b66e..44a0f068a 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -119,7 +119,7 @@ LintLibraryTarget(ext,$(SRCS)) NormalLintTarget($(SRCS)) #if BuildXF86BigfontExt -SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES)) +SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES) $(FONT_DEFINES)) #endif #if BuildXCSecurity SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) 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; } |