diff options
| author | YAMAMOTO Mitsuharu <[email protected]> | 2005-10-07 07:40:35 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <[email protected]> | 2005-10-07 07:40:35 +0000 |
| commit | c2ded1b7d5b6ced034c2291d5078416fbc58fafc (patch) | |
| tree | 63aa71560f94069f1d2d75bab5dfe0529b42ad8c /src/macterm.c | |
| parent | a66678fd3c23322bdebbe285086e9a6d9db1593d (diff) | |
Rename member for_overlaps_p in struct glyph_string to for_overlaps.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/macterm.c b/src/macterm.c index ff4dde4c74..94a2c4d543 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -2320,7 +2320,7 @@ x_draw_glyph_string_foreground (s) XDrawImageString is usually faster than XDrawString.) Always use XDrawImageString when drawing the cursor so that there is no chance that characters under a box cursor are invisible. */ - if (s->for_overlaps_p + if (s->for_overlaps || (s->background_filled_p && s->hl != DRAW_CURSOR)) #endif { @@ -3271,7 +3271,7 @@ x_draw_glyph_string (s) draw a cursor, draw the background of the successor first so that S can draw into it. This makes S->next use XDrawString instead of XDrawImageString. */ - if (s->next && s->right_overhang && !s->for_overlaps_p + if (s->next && s->right_overhang && !s->for_overlaps && s->next->hl != DRAW_CURSOR) { xassert (s->next->img == NULL); @@ -3285,7 +3285,7 @@ x_draw_glyph_string (s) /* Draw relief (if any) in advance for char/composition so that the glyph string can be drawn over it. */ - if (!s->for_overlaps_p + if (!s->for_overlaps && s->face->box != FACE_NO_BOX && (s->first_glyph->type == CHAR_GLYPH || s->first_glyph->type == COMPOSITE_GLYPH)) @@ -3311,7 +3311,7 @@ x_draw_glyph_string (s) break; case CHAR_GLYPH: - if (s->for_overlaps_p) + if (s->for_overlaps) s->background_filled_p = 1; else x_draw_glyph_string_background (s, 0); @@ -3319,7 +3319,7 @@ x_draw_glyph_string (s) break; case COMPOSITE_GLYPH: - if (s->for_overlaps_p || s->gidx > 0) + if (s->for_overlaps || s->gidx > 0) s->background_filled_p = 1; else x_draw_glyph_string_background (s, 1); @@ -3330,7 +3330,7 @@ x_draw_glyph_string (s) abort (); } - if (!s->for_overlaps_p) + if (!s->for_overlaps) { /* Draw underline. */ if (s->face->underline_p) |