Mercurial > emacs
changeset 92186:919240e47747
(ftxfont_draw): Pay attention to s->padding_p.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 25 Feb 2008 01:45:47 +0000 |
| parents | 1e28008a13e5 |
| children | b7277e09e943 |
| files | src/ftxfont.c |
| diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ftxfont.c Mon Feb 25 01:44:26 2008 +0000 +++ b/src/ftxfont.c Mon Feb 25 01:45:47 2008 +0000 @@ -360,6 +360,7 @@ int len = to - from; int i; GC *gcs; + int xadvance; n[0] = n[1] = n[2] = n[3] = n[4] = n[5] = n[6] = 0; @@ -392,8 +393,11 @@ s->clip, s->num_clips, Unsorted); for (i = 0; i < len; i++) - x += ftxfont_draw_bitmap (f, s->gc, gcs, font, code[i], x, y, - p, 0x100, n, i + 1 == len); + { + xadvance = ftxfont_draw_bitmap (f, s->gc, gcs, font, code[i], x, y, + p, 0x100, n, i + 1 == len); + x += (s->padding_p ? 1 : xadvance); + } if (s->num_clips) for (i = 0; i < 6; i++) XSetClipMask (FRAME_X_DISPLAY (f), gcs[i], None); @@ -403,8 +407,11 @@ /* We can't draw with antialiasing. s->gc should already have a proper clipping setting. */ for (i = 0; i < len; i++) - x += ftxfont_draw_bitmap (f, s->gc, NULL, font, code[i], x, y, - p, 0x700, n, i + 1 == len); + { + xadvance = ftxfont_draw_bitmap (f, s->gc, NULL, font, code[i], x, y, + p, 0x700, n, i + 1 == len); + x += (s->padding_p ? 1 : xadvance); + } } UNBLOCK_INPUT;