From aa153a7fb1e0ef328e156d057c5a3287e14b0d37 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 3 Jan 2003 17:52:51 +0000 Subject: [PATCH] Work around a weird bug in gdk_draw_text_wc(). git-svn-id: svn://svn.tartarus.org/sgt/putty@2437 cda61777-01e9-0310-a592-d414129be87e --- unix/pterm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/unix/pterm.c b/unix/pterm.c index dcae55c5..b7e2b934 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -1590,7 +1590,22 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len, * nothing at all; such is life. */ } else if (inst->fontinfo[fontid].is_wide) { - gwcs = smalloc(sizeof(GdkWChar) * (len+1)); + /* + * At least one version of gdk_draw_text_wc() has a + * weird bug whereby it reads `len' elements of the + * input string, but only draws `len/2'. Hence I'm + * going to make its input array twice as long as it + * theoretically needs to be, and pass in twice the + * actual number of characters. If a fixed gdk actually + * takes the doubled length seriously, then (a) the + * array will stand scrutiny up to the full length, (b) + * the spare elements of the array are full of zeroes + * which will probably be an empty glyph in the font, + * and (c) the clip rectangle should prevent it causing + * trouble anyway. + */ + gwcs = smalloc(sizeof(GdkWChar) * (len*2+1)); + memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1)); /* * FIXME: when we have a wide-char equivalent of * from_unicode, use it instead of this. -- 2.11.0