Mercurial > emacs
changeset 91027:04b81a720da9
(xftfont_draw): Adjusted for the change of struct
glyph_string.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 13 Sep 2007 11:04:11 +0000 |
| parents | 9bc2c20f3866 |
| children | d41ffb650865 |
| files | src/xftfont.c |
| diffstat | 1 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xftfont.c Thu Sep 13 11:03:28 2007 +0000 +++ b/src/xftfont.c Thu Sep 13 11:04:11 2007 +0000 @@ -512,12 +512,11 @@ FRAME_X_WINDOW (f), FRAME_X_VISUAL (f), FRAME_X_COLORMAP (f)); - if (s->clip_width) - { - r.x = s->clip_x, r.width = s->clip_width; - r.y = s->clip_y, r.height = s->clip_height; - XftDrawSetClipRectangles (xft_draw, 0, 0, &r, 1); - } + if (s->num_clips > 0) + XftDrawSetClipRectangles (xft_draw, 0, 0, s->clip, s->num_clips); + else + XftDrawSetClip (xft_draw, NULL); + if (with_background) { struct font *font = (struct font *) face->font_info; @@ -532,8 +531,6 @@ XftDrawGlyphs (xft_draw, &fg, xftfont_info->xftfont, x, y, code, len); - if (s->clip_width) - XftDrawSetClip (xft_draw, NULL); if (s->font_info != face->font_info) XftDrawDestroy (xft_draw); UNBLOCK_INPUT;