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

(!1654) Xnest: drop using XLoadQueryFont() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-20 15:16:18 +02:00
parent 2dd391f527
commit 3a3e41678c
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xnest/Font.c
View File

@ -89,9 +89,6 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
priv->chars_len = xcb_query_font_char_infos_length(priv->font_reply); priv->chars_len = xcb_query_font_char_infos_length(priv->font_reply);
priv->chars = xcb_query_font_char_infos(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; return TRUE;
} }
@ -100,8 +97,6 @@ xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
if (xnestFontPriv(pFont)) { if (xnestFontPriv(pFont)) {
xcb_close_font(xnestUpstreamInfo.conn, xnestFontPriv(pFont)->font_id); xcb_close_font(xnestUpstreamInfo.conn, xnestFontPriv(pFont)->font_id);
if (xnestFontPriv(pFont)->font_struct)
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);
} }

3
hw/xnest/xnest-xcb.h
View File

@ -7,8 +7,6 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include "Xnest.h"
struct xnest_upstream_info { struct xnest_upstream_info {
xcb_connection_t *conn; xcb_connection_t *conn;
uint32_t screenId; 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); uint32_t xnest_visual_to_upstream_cmap(uint32_t visual);
typedef struct { typedef struct {
XFontStruct *font_struct;
xcb_query_font_reply_t *font_reply; xcb_query_font_reply_t *font_reply;
xcb_font_t font_id; xcb_font_t font_id;
xcb_charinfo_t *chars; xcb_charinfo_t *chars;