diff options
Diffstat (limited to 'xc/lib/X11/Font.c')
| -rw-r--r-- | xc/lib/X11/Font.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/xc/lib/X11/Font.c b/xc/lib/X11/Font.c index 0bb5834ff..471cc4cbf 100644 --- a/xc/lib/X11/Font.c +++ b/xc/lib/X11/Font.c @@ -28,12 +28,12 @@ sale, use or other dealings in this Software without prior written authorization from the X Consortium and the XFree86 Project. */ -/* $XFree86: xc/lib/X11/Font.c,v 1.6 2000/02/29 03:09:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Font.c,v 1.9 2000/06/13 23:15:47 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" -#ifndef MUSTCOPY +#if defined(XF86BIGFONT) && !defined(MUSTCOPY) #define USE_XF86BIGFONT #endif #ifdef USE_XF86BIGFONT @@ -83,7 +83,7 @@ static XFontStruct *_XF86BigfontQueryFont( #endif ); -static void _XF86BigfontFreeFontMetrics( +void _XF86BigfontFreeFontMetrics( #if NeedFunctionPrototypes XFontStruct* /* fs */ #endif @@ -387,18 +387,26 @@ _XF86BigfontCodes (dpy) pData->free_private = _XF86BigfontFreeCodes; XAddToExtensionList(XEHeadOfExtensionList(dpy_union), pData); if (pCodes) { + int result; /* See if the server supports the XF86BigfontQueryFont request. */ xXF86BigfontQueryVersionReply reply; register xXF86BigfontQueryVersionReq *req; + LockDisplay(dpy); + GetReq(XF86BigfontQueryVersion, req); req->reqType = pCodes->codes->major_opcode; req->xf86bigfontReqType = X_XF86BigfontQueryVersion; - if (!(_XReply (dpy, (xReply *) &reply, + result = _XReply (dpy, (xReply *) &reply, (SIZEOF(xXF86BigfontQueryVersionReply) - SIZEOF(xReply)) >> 2, - xFalse))) + xFalse); + + UnlockDisplay(dpy); + SyncHandle(); + + if(!result) goto ignore_extension; /* No need to provide backward compatibility with version 1.0. It @@ -649,7 +657,7 @@ _XF86BigfontQueryFont (dpy, extcodes, fid, seq) return fs; } -static void +void _XF86BigfontFreeFontMetrics (fs) XFontStruct *fs; { |