comparison src/macterm.c @ 78681:1c0e611785d0

(x_draw_composite_glyph_string_foreground): Draw rectangle for nonexistent or zero-width glyph in composition glyph.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Mon, 27 Aug 2007 08:33:37 +0000
parents 1677cf1c2509
children 6d6dc60c958b
comparison
equal deleted inserted replaced
78680:e838385a9cef 78681:1c0e611785d0
2971 s->width - 1, s->height - 1); 2971 s->width - 1, s->height - 1);
2972 } 2972 }
2973 else 2973 else
2974 { 2974 {
2975 for (i = 0; i < s->nchars; i++, ++s->gidx) 2975 for (i = 0; i < s->nchars; i++, ++s->gidx)
2976 mac_draw_image_string_16 (s->f, s->gc, 2976 if (mac_per_char_metric (GC_FONT (s->gc), s->char2b + i, 0) == NULL)
2977 x + s->cmp->offsets[s->gidx * 2], 2977 /* This is a nonexistent or zero-width glyph such as a
2978 s->ybase - s->cmp->offsets[s->gidx * 2 + 1], 2978 combining diacritic. Draw a rectangle. */
2979 s->char2b + i, 1, 0, s->face->overstrike); 2979 mac_draw_rectangle (s->f, s->gc,
2980 x + s->cmp->offsets[s->gidx * 2], s->y,
2981 FONT_WIDTH (GC_FONT (s->gc)) - 1, s->height - 1);
2982 else
2983 mac_draw_image_string_16 (s->f, s->gc,
2984 x + s->cmp->offsets[s->gidx * 2],
2985 s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
2986 s->char2b + i, 1, 0, s->face->overstrike);
2980 } 2987 }
2981 } 2988 }
2982 2989
2983 2990
2984 #ifdef USE_X_TOOLKIT 2991 #ifdef USE_X_TOOLKIT