From b92a738cd9824810573de0ba65bcb4c6bc9f98f2 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 2 Aug 2024 15:38:57 +0200 Subject: [PATCH] (!1654) Xnest: replace XDrawImageString() by xcb_image_text_8() Replace XDrawImageString() by xcb_image_text_8(), as well as their 16-bit counterparts. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/GCOps.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index f2ef1d583..43a422e76 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -376,16 +376,26 @@ void xnestImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *string) { - XDrawImageString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), - x, y, string, count); + xcb_image_text_8(xnestUpstreamInfo.conn, + count, + xnestDrawable(pDrawable), + xnest_upstream_gc(pGC), + x, + y, + string); } void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *string) { - XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC), - x, y, (XChar2b *) string, count); + xcb_image_text_16(xnestUpstreamInfo.conn, + count, + xnestDrawable(pDrawable), + xnest_upstream_gc(pGC), + x, + y, + (xcb_char2b_t*)string); } void