From 7a216d7f121a3a5f8cfac9960509d99abcd88648 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 15 Oct 2004 12:17:48 +0000 Subject: [PATCH] Double-height and double-width line attributes (ESC#3, ESC#4, ESC#6) were not working correctly with double-width Unicode characters (CJK). git-svn-id: svn://svn.tartarus.org/sgt/putty@4636 cda61777-01e9-0310-a592-d414129be87e --- unix/pterm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unix/pterm.c b/unix/pterm.c index 9f767fd4..cc47d1d4 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -1973,7 +1973,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, y*inst->font_height+inst->cfg.window_border, x*inst->font_width+inst->cfg.window_border + 2*i+1, y*inst->font_height+inst->cfg.window_border, - len * inst->font_width - i, inst->font_height); + len * widefactor * inst->font_width - i, inst->font_height); } len *= 2; if ((lattr & LATTR_MODE) != LATTR_WIDE) { @@ -1987,9 +1987,9 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, x*inst->font_width+inst->cfg.window_border, y*inst->font_height+inst->cfg.window_border+dt*i+db, - x*widefactor*inst->font_width+inst->cfg.window_border, + x*inst->font_width+inst->cfg.window_border, y*inst->font_height+inst->cfg.window_border+dt*(i+1), - len * inst->font_width, inst->font_height-i-1); + len * widefactor * inst->font_width, inst->font_height-i-1); } } } -- 2.11.0