Xnest: drop xnestFont() 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:14:25 +02:00
parent 2db318a341
commit b5ec55f862
2 changed files with 1 additions and 3 deletions

View File

@ -148,7 +148,7 @@ xnestChangeGC(GCPtr pGC, unsigned long mask)
values.ts_y_origin = pGC->patOrg.y; values.ts_y_origin = pGC->patOrg.y;
if (mask & GCFont) if (mask & GCFont)
values.font = xnestFont(pGC->font); values.font = xnestFontPriv(pGC->font)->font_struct->fid;
if (mask & GCSubwindowMode) if (mask & GCSubwindowMode)
values.subwindow_mode = pGC->subWindowMode; values.subwindow_mode = pGC->subWindowMode;

View File

@ -26,8 +26,6 @@ extern int xnestFontPrivateIndex;
#define xnestFontPriv(pFont) \ #define xnestFontPriv(pFont) \
((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex)) ((xnestPrivFont *)FontGetPrivate(pFont, xnestFontPrivateIndex))
#define xnestFont(pFont) (xnestFontPriv(pFont)->font_struct->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);