| … | |
… | |
| 448 | |
448 | |
| 449 | text_t chrs[2]; |
449 | text_t chrs[2]; |
| 450 | chrs [1] = NOCHAR; |
450 | chrs [1] = NOCHAR; |
| 451 | |
451 | |
| 452 | *chrs = cc->c1; |
452 | *chrs = cc->c1; |
| 453 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
453 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
| 454 | f1->draw (d, x, y, chrs, width, fg, bg); |
454 | f1->draw (d, x, y, chrs, width, fg, bg); |
| 455 | |
455 | |
| 456 | if (cc->c2 != NOCHAR) |
456 | if (cc->c2 != NOCHAR) |
| 457 | { |
457 | { |
| 458 | bool careful; |
458 | bool careful; |
| 459 | |
459 | |
| 460 | // prefer font of first character, for no good reasons |
460 | // prefer font of first character, for no good reasons |
| 461 | *chrs = cc->c2; |
461 | *chrs = cc->c2; |
| 462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
| 463 | ? f1 |
463 | ? f1 |
| 464 | : (*fs)[fs->find_font (cc->c2)]; |
464 | : (*fs)[fs->find_font_idx (cc->c2)]; |
| 465 | |
465 | |
| 466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
| 467 | } |
467 | } |
| 468 | } |
468 | } |
| 469 | #endif |
469 | #endif |
| … | |
… | |
| 1403 | && (bg == Color_transparent || bg == Color_bg |
1403 | && (bg == Color_transparent || bg == Color_bg |
| 1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
| 1405 | { |
1405 | { |
| 1406 | int src_x = x, src_y = y; |
1406 | int src_x = x, src_y = y; |
| 1407 | |
1407 | |
| 1408 | if (term->bgPixmap.is_parentOrigin ()) |
1408 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
| 1409 | { |
1409 | { |
| 1410 | src_x += term->window_vt_x; |
1410 | src_x += term->window_vt_x; |
| 1411 | src_y += term->window_vt_y; |
1411 | src_y += term->window_vt_y; |
| 1412 | } |
1412 | } |
| 1413 | |
1413 | |
| … | |
… | |
| 1482 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1482 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
| 1483 | = rxvt_fontprop::unset; |
1483 | = rxvt_fontprop::unset; |
| 1484 | force_prop = false; |
1484 | force_prop = false; |
| 1485 | |
1485 | |
| 1486 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1486 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
| 1487 | FONT_UNREF (*i); |
1487 | (*i)->unref (); |
| 1488 | |
1488 | |
| 1489 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1489 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
| 1490 | delete *p; |
1490 | delete *p; |
| 1491 | |
1491 | |
| 1492 | free (fontdesc); fontdesc = 0; |
1492 | free (fontdesc); fontdesc = 0; |
| … | |
… | |
| 1539 | ///////////////////////////////////////////////////////////////////////////// |
1539 | ///////////////////////////////////////////////////////////////////////////// |
| 1540 | |
1540 | |
| 1541 | void |
1541 | void |
| 1542 | rxvt_fontset::push_font (rxvt_font *font) |
1542 | rxvt_fontset::push_font (rxvt_font *font) |
| 1543 | { |
1543 | { |
|
|
1544 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1545 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1546 | // represented in the rendition. |
| 1544 | if (fonts.size () == fontCount) |
1547 | if (fonts.size () == fontCount) |
| 1545 | { |
1548 | { |
| 1546 | rxvt_font *f = new rxvt_font_overflow (this); |
1549 | rxvt_font *f = new rxvt_font_overflow (this); |
| 1547 | |
1550 | |
| 1548 | prepare_font (f, CS_UNICODE); |
1551 | prepare_font (f, CS_UNICODE); |
