nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-15 10:08:06 -05:00
Code Issues Projects Releases Wiki Activity

Suppress Pango's bidi, by displaying RTL characters one at a time. I

Browse Source 
hadn't previously noticed, but Pango was helpfully re-reversing text
that PuTTY's own bidi module had already reversed, leading to Arabic
text being wrongly displayed and also total chaos when you move the
cursor over it or try to cut and paste it.

[originally from svn r9294]
This commit is contained in:
Simon Tatham 2011-09-16 19:18:58 +00:00
parent 92688ff47b
commit 218f3ffded
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
unix/gtkfont.c
View File

@ -1114,34 +1114,42 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
clen++;
n = 1;
/*
* See if that character has the width we expect.
*/
pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
/*
* If it's a right-to-left character, we must display it on
* its own, to stop Pango helpfully re-reversing our already
* reversed text.
*/
if (!is_rtl(string[0])) {
if (rect.width == cellwidth) {
/*
* Try extracting more characters, for as long as they
* stay well-behaved.
*/
while (clen < utflen) {
int oldclen = clen;
clen++; /* skip UTF-8 introducer byte */
while (clen < utflen &&
(unsigned char)utfptr[clen] >= 0x80 &&
(unsigned char)utfptr[clen] < 0xC0)
clen++;
n++;
pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
if (rect.width != n * cellwidth) {
clen = oldclen;
n--;
break;
}
}
}
/*
* See if that character has the width we expect.
*/
pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
if (rect.width == cellwidth) {
/*
* Try extracting more characters, for as long as they
* stay well-behaved.
*/
while (clen < utflen) {
int oldclen = clen;
clen++; /* skip UTF-8 introducer byte */
while (clen < utflen &&
(unsigned char)utfptr[clen] >= 0x80 &&
(unsigned char)utfptr[clen] < 0xC0)
clen++;
n++;
pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
if (rect.width != n * cellwidth) {
clen = oldclen;
n--;
break;
}
}
}
}
pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
@ -1153,6 +1161,7 @@ static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
utflen -= clen;
utfptr += clen;
string += n;
x += n * cellwidth;
}