From 2db318a34155e09ed6fda8ea56e9135b4ddadea6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 20 Aug 2024 09:08:23 +0200 Subject: [PATCH] Xnest: drop xnestFontStruct() macro Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/Font.c | 8 +++----- hw/xnest/GCOps.c | 4 ++-- hw/xnest/XNFont.h | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index 511ab687b..b601f7a49 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -70,9 +70,7 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont) priv = (void *) malloc(sizeof(xnestPrivFont)); xfont2_font_set_private(pFont, xnestFontPrivateIndex, priv); - xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name); - - if (!xnestFontStruct(pFont)) + if (!(xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name))) return FALSE; return TRUE; @@ -82,8 +80,8 @@ Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) { if (xnestFontPriv(pFont)) { - if (xnestFontStruct(pFont)) - XFreeFont(xnestDisplay, xnestFontStruct(pFont)); + if (xnestFontPriv(pFont)->font_struct) + XFreeFont(xnestDisplay, xnestFontPriv(pFont)->font_struct); free(xnestFontPriv(pFont)); xfont2_font_set_private(pFont, xnestFontPrivateIndex, NULL); } diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 8c0dcf5c5..8f9a8a6be 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -348,7 +348,7 @@ xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, free(buffer); - width = XTextWidth(xnestFontStruct(pGC->font), string, count); + width = XTextWidth(xnestFontPriv(pGC->font)->font_struct, string, count); return width + x; } @@ -378,7 +378,7 @@ xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, free(buffer); - width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *) string, count); + width = XTextWidth16(xnestFontPriv(pGC->font)->font_struct, (XChar2b *) string, count); return width + x; } diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 1c10da1ea..4806c61e5 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -26,9 +26,7 @@ extern int xnestFontPrivateIndex; #define xnestFontPriv(pFont) \ ((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex)) -#define xnestFontStruct(pFont) (xnestFontPriv(pFont)->font_struct) - -#define xnestFont(pFont) (xnestFontStruct(pFont)->fid) +#define xnestFont(pFont) (xnestFontPriv(pFont)->font_struct->fid) Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont); Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);