From 572820e134463899af617cd65dd2f06f09db7032 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 16 Sep 2011 19:18:53 +0000 Subject: [PATCH] Change the unifont API so that text is passed right down to the individual font implementation as wchar_t, rather than having to be converted by the client into the appropriate MBCS/SBCS. This also means I can remove 'real_charset' from the public-facing contents of the unifont structure. git-svn-id: svn://svn.tartarus.org/sgt/putty@9292 cda61777-01e9-0310-a592-d414129be87e --- unix/gtkfont.c | 108 ++++++++++++++++++++++++++++++++------------------------- unix/gtkfont.h | 10 ++---- unix/gtkwin.c | 28 ++++----------- 3 files changed, 68 insertions(+), 78 deletions(-) diff --git a/unix/gtkfont.c b/unix/gtkfont.c index 68d81e8f..c8583758 100644 --- a/unix/gtkfont.c +++ b/unix/gtkfont.c @@ -73,7 +73,7 @@ struct unifont_vtable { int shadowoffset, int shadowalways); void (*destroy)(unifont *font); void (*draw_text)(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, int wide, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth); void (*enum_fonts)(GtkWidget *widget, fontsel_add_entry callback, void *callback_ctx); @@ -92,7 +92,7 @@ struct unifont_vtable { */ static void x11font_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth); static unifont *x11font_create(GtkWidget *widget, const char *name, int wide, int bold, @@ -133,6 +133,14 @@ struct x11font { */ int variable; /* + * real_charset is the charset used when translating text into the + * font's internal encoding inside draw_text(). This need not be + * the same as the public_charset provided to the client; for + * example, public_charset might be CS_ISO8859_1 while + * real_charset is CS_ISO8859_1_X11. + */ + int real_charset; + /* * Data passed in to unifont_create(). */ int wide, bold, shadowoffset, shadowalways; @@ -298,7 +306,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name, xfont->u.descent = xfs->descent; xfont->u.height = xfont->u.ascent + xfont->u.descent; xfont->u.public_charset = pubcs; - xfont->u.real_charset = realcs; + xfont->real_charset = realcs; xfont->fonts[0] = xfs; xfont->allocated[0] = TRUE; xfont->sixteen_bit = sixteen_bit; @@ -428,7 +436,7 @@ static void x11font_really_draw_text(GdkDrawable *target, XFontStruct *xfs, } static void x11font_draw_text(GdkDrawable *target, GdkGC *gdkgc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth) { Display *disp = GDK_DISPLAY(); @@ -468,41 +476,33 @@ static void x11font_draw_text(GdkDrawable *target, GdkGC *gdkgc, unifont *font, if (xfont->sixteen_bit) { /* * This X font has 16-bit character indices, which means - * we expect our string to have been passed in UTF-8. + * we can directly use our Unicode input string. */ XChar2b *xcs; - wchar_t *wcs; - int nchars, maxchars, i; + int i; - /* - * Convert the input string to wide-character Unicode. - */ - maxchars = 0; - for (i = 0; i < len; i++) - if ((unsigned char)string[i] <= 0x7F || - (unsigned char)string[i] >= 0xC0) - maxchars++; - wcs = snewn(maxchars+1, wchar_t); - nchars = charset_to_unicode((char **)&string, &len, wcs, maxchars, - CS_UTF8, NULL, NULL, 0); - assert(nchars <= maxchars); - wcs[nchars] = L'\0'; - - xcs = snewn(nchars, XChar2b); - for (i = 0; i < nchars; i++) { - xcs[i].byte1 = wcs[i] >> 8; - xcs[i].byte2 = wcs[i]; + xcs = snewn(len, XChar2b); + for (i = 0; i < len; i++) { + xcs[i].byte1 = string[i] >> 8; + xcs[i].byte2 = string[i]; } x11font_really_draw_text_16(target, xfont->fonts[sfid], gc, x, y, - xcs, nchars, shadowoffset, + xcs, len, shadowoffset, xfont->variable, cellwidth * mult); sfree(xcs); - sfree(wcs); } else { + /* + * This X font has 8-bit indices, so we must convert to the + * appropriate character set. + */ + char *sbstring = snewn(len+1, char); + int sblen = wc_to_mb(xfont->real_charset, 0, string, len, + sbstring, len+1, ".", NULL, NULL); x11font_really_draw_text(target, xfont->fonts[sfid], gc, x, y, - string, len, shadowoffset, + sbstring, sblen, shadowoffset, xfont->variable, cellwidth * mult); + sfree(sbstring); } } @@ -744,7 +744,7 @@ static char *x11font_scale_fontname(GtkWidget *widget, const char *name, #endif static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth); static unifont *pangofont_create(GtkWidget *widget, const char *name, int wide, int bold, @@ -892,7 +892,6 @@ static unifont *pangofont_create(GtkWidget *widget, const char *name, pfont->u.height = pfont->u.ascent + pfont->u.descent; /* The Pango API is hardwired to UTF-8 */ pfont->u.public_charset = CS_UTF8; - pfont->u.real_charset = CS_UTF8; pfont->desc = desc; pfont->fset = fset; pfont->widget = widget; @@ -914,12 +913,14 @@ static void pangofont_destroy(unifont *font) } static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth) { struct pangofont *pfont = (struct pangofont *)font; PangoLayout *layout; PangoRectangle rect; + char *utfstring, *utfptr; + int utflen; int shadowbold = FALSE; if (wide) @@ -940,7 +941,16 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, } } - while (len > 0) { + /* + * Pango always expects UTF-8, so convert the input wide character + * string to UTF-8. + */ + utfstring = snewn(len*6+1, char); /* UTF-8 has max 6 bytes/char */ + utflen = wc_to_mb(CS_UTF8, 0, string, len, + utfstring, len*6+1, ".", NULL, NULL); + + utfptr = utfstring; + while (utflen > 0) { int clen, n; /* @@ -972,16 +982,16 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, * string. */ clen = 1; - while (clen < len && - (unsigned char)string[clen] >= 0x80 && - (unsigned char)string[clen] < 0xC0) + while (clen < utflen && + (unsigned char)utfptr[clen] >= 0x80 && + (unsigned char)utfptr[clen] < 0xC0) clen++; n = 1; /* * See if that character has the width we expect. */ - pango_layout_set_text(layout, string, clen); + pango_layout_set_text(layout, utfptr, clen); pango_layout_get_pixel_extents(layout, NULL, &rect); if (rect.width == cellwidth) { @@ -989,15 +999,15 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, * Try extracting more characters, for as long as they * stay well-behaved. */ - while (clen < len) { + while (clen < utflen) { int oldclen = clen; clen++; /* skip UTF-8 introducer byte */ - while (clen < len && - (unsigned char)string[clen] >= 0x80 && - (unsigned char)string[clen] < 0xC0) + while (clen < utflen && + (unsigned char)utfptr[clen] >= 0x80 && + (unsigned char)utfptr[clen] < 0xC0) clen++; n++; - pango_layout_set_text(layout, string, clen); + pango_layout_set_text(layout, utfptr, clen); pango_layout_get_pixel_extents(layout, NULL, &rect); if (rect.width != n * cellwidth) { clen = oldclen; @@ -1007,7 +1017,7 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, } } - pango_layout_set_text(layout, string, clen); + pango_layout_set_text(layout, utfptr, clen); pango_layout_get_pixel_extents(layout, NULL, &rect); gdk_draw_layout(target, gc, x + (n*cellwidth - rect.width)/2, y + (pfont->u.height - rect.height)/2, layout); @@ -1015,11 +1025,13 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, gdk_draw_layout(target, gc, x + (n*cellwidth - rect.width)/2 + pfont->shadowoffset, y + (pfont->u.height - rect.height)/2, layout); - len -= clen; - string += clen; + utflen -= clen; + utfptr += clen; x += n * cellwidth; } + sfree(utfstring); + g_object_unref(layout); } @@ -1358,7 +1370,7 @@ void unifont_destroy(unifont *font) } void unifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth) { font->vt->draw_text(target, gc, font, x, y, string, len, @@ -1741,11 +1753,11 @@ static void unifontsel_draw_preview_text(unifontsel_internal *fs) */ info->fontclass->draw_text(fs->preview_pixmap, gc, font, 0, font->ascent, - "bankrupt jilted showmen quiz convex fogey", + L"bankrupt jilted showmen quiz convex fogey", 41, FALSE, FALSE, font->width); info->fontclass->draw_text(fs->preview_pixmap, gc, font, 0, font->ascent + font->height, - "BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY", + L"BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY", 41, FALSE, FALSE, font->width); /* * The ordering of punctuation here is also selected @@ -1761,7 +1773,7 @@ static void unifontsel_draw_preview_text(unifontsel_internal *fs) */ info->fontclass->draw_text(fs->preview_pixmap, gc, font, 0, font->ascent + font->height * 2, - "0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$", + L"0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$", 42, FALSE, FALSE, font->width); } gdk_gc_unref(gc); diff --git a/unix/gtkfont.h b/unix/gtkfont.h index f414594e..72f1f6bf 100644 --- a/unix/gtkfont.h +++ b/unix/gtkfont.h @@ -21,14 +21,8 @@ typedef struct unifont { /* * public_charset is the charset used when the user asks for * `Use font encoding'. - * - * real_charset is the charset used when translating text into - * a form suitable for sending to unifont_draw_text(). - * - * They can differ. For example, public_charset might be - * CS_ISO8859_1 while real_charset is CS_ISO8859_1_X11. */ - int public_charset, real_charset; + int public_charset; /* * Font dimensions needed by clients. @@ -41,7 +35,7 @@ unifont *unifont_create(GtkWidget *widget, const char *name, int shadowoffset, int shadowalways); void unifont_destroy(unifont *font); void unifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font, - int x, int y, const char *string, int len, + int x, int y, const wchar_t *string, int len, int wide, int bold, int cellwidth); /* diff --git a/unix/gtkwin.c b/unix/gtkwin.c index 303052a0..1214bf03 100644 --- a/unix/gtkwin.c +++ b/unix/gtkwin.c @@ -2138,28 +2138,12 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, rlen*widefactor*inst->font_width, inst->font_height); gdk_gc_set_foreground(gc, &inst->cols[nfg]); - { - gchar *gcs; - - /* - * FIXME: this length is hardwired on the assumption that - * conversions from wide to multibyte characters will - * never generate more than 10 bytes for a single wide - * character. - */ - gcs = snewn(len*10+1, gchar); - - for (combining = 0; combining < ncombining; combining++) { - int mblen = wc_to_mb(inst->fonts[fontid]->real_charset, 0, - text + combining, len, gcs, len*10+1, ".", - NULL, NULL); - unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid], - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border+inst->fonts[0]->ascent, - gcs, mblen, widefactor > 1, bold, inst->font_width); - } - - sfree(gcs); + for (combining = 0; combining < ncombining; combining++) { + unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid], + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border+inst->fonts[0]->ascent, + text + combining, len, widefactor > 1, + bold, inst->font_width); } if (attr & ATTR_UNDER) { -- 2.11.0