| … | |
… | |
| 25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
| 26 | |
26 | |
| 27 | #include <cstdlib> |
27 | #include <cstdlib> |
| 28 | |
28 | |
| 29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
|
|
30 | |
|
|
31 | #if XFT |
|
|
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
| 30 | |
34 | |
| 31 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
| 32 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
| 33 | |
37 | |
| 34 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
| … | |
… | |
| 448 | |
452 | |
| 449 | text_t chrs[2]; |
453 | text_t chrs[2]; |
| 450 | chrs [1] = NOCHAR; |
454 | chrs [1] = NOCHAR; |
| 451 | |
455 | |
| 452 | *chrs = cc->c1; |
456 | *chrs = cc->c1; |
| 453 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
457 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
| 454 | f1->draw (d, x, y, chrs, width, fg, bg); |
458 | f1->draw (d, x, y, chrs, width, fg, bg); |
| 455 | |
459 | |
| 456 | if (cc->c2 != NOCHAR) |
460 | if (cc->c2 != NOCHAR) |
| 457 | { |
461 | { |
| 458 | bool careful; |
462 | bool careful; |
| 459 | |
463 | |
| 460 | // prefer font of first character, for no good reasons |
464 | // prefer font of first character, for no good reasons |
| 461 | *chrs = cc->c2; |
465 | *chrs = cc->c2; |
| 462 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
466 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
| 463 | ? f1 |
467 | ? f1 |
| 464 | : (*fs)[fs->find_font (cc->c2)]; |
468 | : (*fs)[fs->find_font_idx (cc->c2)]; |
| 465 | |
469 | |
| 466 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
470 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
| 467 | } |
471 | } |
| 468 | } |
472 | } |
| 469 | #endif |
473 | #endif |
| … | |
… | |
| 1403 | && (bg == Color_transparent || bg == Color_bg |
1407 | && (bg == Color_transparent || bg == Color_bg |
| 1404 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1408 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
| 1405 | { |
1409 | { |
| 1406 | int src_x = x, src_y = y; |
1410 | int src_x = x, src_y = y; |
| 1407 | |
1411 | |
| 1408 | if (term->bgPixmap.is_parentOrigin ()) |
1412 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
| 1409 | { |
1413 | { |
| 1410 | src_x += term->window_vt_x; |
1414 | src_x += term->window_vt_x; |
| 1411 | src_y += term->window_vt_y; |
1415 | src_y += term->window_vt_y; |
| 1412 | } |
1416 | } |
| 1413 | |
1417 | |
| … | |
… | |
| 1482 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1486 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
| 1483 | = rxvt_fontprop::unset; |
1487 | = rxvt_fontprop::unset; |
| 1484 | force_prop = false; |
1488 | force_prop = false; |
| 1485 | |
1489 | |
| 1486 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1490 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
| 1487 | FONT_UNREF (*i); |
1491 | (*i)->unref (); |
| 1488 | |
1492 | |
| 1489 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1493 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
| 1490 | delete *p; |
1494 | delete *p; |
| 1491 | |
1495 | |
| 1492 | free (fontdesc); fontdesc = 0; |
1496 | free (fontdesc); fontdesc = 0; |
