From 5f5e6f110acb8654378f195a0828a0a5e9423ef8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 20 Aug 2024 15:16:18 +0200 Subject: [PATCH] Xnest: drop using XLoadQueryFont() Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/Font.c | 5 ----- hw/xnest/xnest-xcb.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index b320d7534..426d8a43e 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -89,9 +89,6 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont) priv->chars_len = xcb_query_font_char_infos_length(priv->font_reply); priv->chars = xcb_query_font_char_infos(priv->font_reply); - if (!(xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name))) - return FALSE; - return TRUE; } @@ -100,8 +97,6 @@ xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) { if (xnestFontPriv(pFont)) { xcb_close_font(xnestUpstreamInfo.conn, xnestFontPriv(pFont)->font_id); - 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/xnest-xcb.h b/hw/xnest/xnest-xcb.h index efd68593d..b3df9b2ef 100644 --- a/hw/xnest/xnest-xcb.h +++ b/hw/xnest/xnest-xcb.h @@ -7,8 +7,6 @@ #include -#include "Xnest.h" - struct xnest_upstream_info { xcb_connection_t *conn; uint32_t screenId; @@ -65,7 +63,6 @@ uint32_t xnest_upstream_visual_to_cmap(uint32_t visual); uint32_t xnest_visual_to_upstream_cmap(uint32_t visual); typedef struct { - XFontStruct *font_struct; xcb_query_font_reply_t *font_reply; xcb_font_t font_id; xcb_charinfo_t *chars;