changeset 95364:03298b3ef01c

(x_draw_glyph_string): Use clipmask if specified.
author Jason Rumney <jasonr@gnu.org>
date Wed, 28 May 2008 16:12:36 +0000
parents 3c5bdcf6184e
children 40ae7108af0a
files src/w32term.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32term.c	Wed May 28 14:16:09 2008 +0000
+++ b/src/w32term.c	Wed May 28 16:12:36 2008 +0000
@@ -2830,8 +2830,10 @@
       x_set_glyph_string_clipping (s);
       relief_drawn_p = 1;
     }
-  else if ((s->prev && s->prev->hl != s->hl && s->left_overhang)
-	   || (s->next && s->next->hl != s->hl && s->right_overhang))
+  else if (!s->clip_head /* draw_glyphs didn't specify a clip mask.  */
+           && !s->clip_tail
+           && ((s->prev && s->prev->hl != s->hl && s->left_overhang)
+               || (s->next && s->next->hl != s->hl && s->right_overhang)))
     /* We must clip just this glyph.  left_overhang part has already
        drawn when s->prev was drawn, and right_overhang part will be
        drawn later when s->next is drawn. */