mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

(ftxfont_draw): Pay attention to s->padding_p.

Browse Source
This commit is contained in:
Kenichi Handa 2008-02-25 01:45:47 +00:00
parent 298fd5b188
commit b9c2785e9f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ftxfont.c
View File

@ -360,6 +360,7 @@ ftxfont_draw (s, from, to, x, y, with_background)
int len = to - from; int len = to - from;
int i; int i;
GC *gcs; GC *gcs;
int xadvance;
n[0] = n[1] = n[2] = n[3] = n[4] = n[5] = n[6] = 0; n[0] = n[1] = n[2] = n[3] = n[4] = n[5] = n[6] = 0;
@ -392,8 +393,11 @@ ftxfont_draw (s, from, to, x, y, with_background)
s->clip, s->num_clips, Unsorted); s->clip, s->num_clips, Unsorted);
for (i = 0; i < len; i++) 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) if (s->num_clips)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
XSetClipMask (FRAME_X_DISPLAY (f), gcs[i], None); XSetClipMask (FRAME_X_DISPLAY (f), gcs[i], None);
@ -403,8 +407,11 @@ ftxfont_draw (s, from, to, x, y, with_background)
/* We can't draw with antialiasing. /* We can't draw with antialiasing.
s->gc should already have a proper clipping setting. */ s->gc should already have a proper clipping setting. */
for (i = 0; i < len; i++) 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; UNBLOCK_INPUT;