1567 |
else |
else |
1568 |
x = s->x; |
x = s->x; |
1569 |
|
|
1570 |
if (s->for_overlaps_p || (s->background_filled_p && s->hl != DRAW_CURSOR)) |
if (s->for_overlaps || (s->background_filled_p && s->hl != DRAW_CURSOR)) |
1571 |
SetBkMode (s->hdc, TRANSPARENT); |
SetBkMode (s->hdc, TRANSPARENT); |
1572 |
else |
else |
1573 |
SetBkMode (s->hdc, OPAQUE); |
SetBkMode (s->hdc, OPAQUE); |
2448 |
/* If S draws into the background of its successor, draw the |
/* If S draws into the background of its successor, draw the |
2449 |
background of the successor first so that S can draw into it. |
background of the successor first so that S can draw into it. |
2450 |
This makes S->next use XDrawString instead of XDrawImageString. */ |
This makes S->next use XDrawString instead of XDrawImageString. */ |
2451 |
if (s->next && s->right_overhang && !s->for_overlaps_p) |
if (s->next && s->right_overhang && !s->for_overlaps) |
2452 |
{ |
{ |
2453 |
xassert (s->next->img == NULL); |
xassert (s->next->img == NULL); |
2454 |
x_set_glyph_string_gc (s->next); |
x_set_glyph_string_gc (s->next); |
2461 |
|
|
2462 |
/* Draw relief (if any) in advance for char/composition so that the |
/* Draw relief (if any) in advance for char/composition so that the |
2463 |
glyph string can be drawn over it. */ |
glyph string can be drawn over it. */ |
2464 |
if (!s->for_overlaps_p |
if (!s->for_overlaps |
2465 |
&& s->face->box != FACE_NO_BOX |
&& s->face->box != FACE_NO_BOX |
2466 |
&& (s->first_glyph->type == CHAR_GLYPH |
&& (s->first_glyph->type == CHAR_GLYPH |
2467 |
|| s->first_glyph->type == COMPOSITE_GLYPH)) |
|| s->first_glyph->type == COMPOSITE_GLYPH)) |
2487 |
break; |
break; |
2488 |
|
|
2489 |
case CHAR_GLYPH: |
case CHAR_GLYPH: |
2490 |
if (s->for_overlaps_p) |
if (s->for_overlaps) |
2491 |
s->background_filled_p = 1; |
s->background_filled_p = 1; |
2492 |
else |
else |
2493 |
x_draw_glyph_string_background (s, 0); |
x_draw_glyph_string_background (s, 0); |
2495 |
break; |
break; |
2496 |
|
|
2497 |
case COMPOSITE_GLYPH: |
case COMPOSITE_GLYPH: |
2498 |
if (s->for_overlaps_p || s->gidx > 0) |
if (s->for_overlaps || s->gidx > 0) |
2499 |
s->background_filled_p = 1; |
s->background_filled_p = 1; |
2500 |
else |
else |
2501 |
x_draw_glyph_string_background (s, 1); |
x_draw_glyph_string_background (s, 1); |
2506 |
abort (); |
abort (); |
2507 |
} |
} |
2508 |
|
|
2509 |
if (!s->for_overlaps_p) |
if (!s->for_overlaps) |
2510 |
{ |
{ |
2511 |
/* Draw underline. */ |
/* Draw underline. */ |
2512 |
if (s->face->underline_p |
if (s->face->underline_p |