frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xnest: drop xnestFontStruct() macro 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-20 09:08:23 +02:00
parent 17b27b2ec3
commit 2db318a341
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xnest/Font.c
View File

@ -70,9 +70,7 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
priv = (void *) malloc(sizeof(xnestPrivFont)); priv = (void *) malloc(sizeof(xnestPrivFont));
xfont2_font_set_private(pFont, xnestFontPrivateIndex, priv); xfont2_font_set_private(pFont, xnestFontPrivateIndex, priv);
xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name); if (!(xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name)))
if (!xnestFontStruct(pFont))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -82,8 +80,8 @@ Bool
xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
if (xnestFontPriv(pFont)) { if (xnestFontPriv(pFont)) {
if (xnestFontStruct(pFont)) if (xnestFontPriv(pFont)->font_struct)
XFreeFont(xnestDisplay, xnestFontStruct(pFont)); XFreeFont(xnestDisplay, xnestFontPriv(pFont)->font_struct);
free(xnestFontPriv(pFont)); free(xnestFontPriv(pFont));
xfont2_font_set_private(pFont, xnestFontPrivateIndex, NULL); xfont2_font_set_private(pFont, xnestFontPrivateIndex, NULL);
} }

4
hw/xnest/GCOps.c
View File

@ -348,7 +348,7 @@ xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
free(buffer); free(buffer);
width = XTextWidth(xnestFontStruct(pGC->font), string, count); width = XTextWidth(xnestFontPriv(pGC->font)->font_struct, string, count);
return width + x; return width + x;
} }
@ -378,7 +378,7 @@ xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
free(buffer); free(buffer);
width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *) string, count); width = XTextWidth16(xnestFontPriv(pGC->font)->font_struct, (XChar2b *) string, count);
return width + x; return width + x;
} }

4
hw/xnest/XNFont.h
View File

@ -26,9 +26,7 @@ extern int xnestFontPrivateIndex;
#define xnestFontPriv(pFont) \ #define xnestFontPriv(pFont) \
((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex)) ((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex))
#define xnestFontStruct(pFont) (xnestFontPriv(pFont)->font_struct) #define xnestFont(pFont) (xnestFontPriv(pFont)->font_struct->fid)
#define xnestFont(pFont) (xnestFontStruct(pFont)->fid)
Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont); Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont);
Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont); Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);