| … | |
… | |
| 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->get (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->get (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 |
| … | |
… | |
| 1293 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1293 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
| 1294 | const text_t *text, int len, |
1294 | const text_t *text, int len, |
| 1295 | int fg, int bg) |
1295 | int fg, int bg) |
| 1296 | { |
1296 | { |
| 1297 | XGlyphInfo extents; |
1297 | XGlyphInfo extents; |
| 1298 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1298 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
| 1299 | XftGlyphSpec *ep = enc; |
1299 | XftGlyphSpec *ep = enc; |
| 1300 | |
1300 | |
| 1301 | dTermDisplay; |
1301 | dTermDisplay; |
| 1302 | dTermGC; |
1302 | dTermGC; |
| 1303 | |
1303 | |
| … | |
… | |
| 1586 | |
1586 | |
| 1587 | return -1; |
1587 | return -1; |
| 1588 | } |
1588 | } |
| 1589 | |
1589 | |
| 1590 | int |
1590 | int |
| 1591 | rxvt_fontset::find_font (unicode_t unicode) |
1591 | rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful) |
| 1592 | { |
1592 | { |
| 1593 | if (unicode >= 1<<20) |
1593 | if (unicode >= 1<<20) |
| 1594 | return 0; |
1594 | return 0; |
| 1595 | |
1595 | |
| 1596 | unicode_t hi = unicode >> 8; |
1596 | unicode_t hi = unicode >> 8; |
| 1597 | |
1597 | |
| 1598 | if (hi < fmap.size () |
1598 | if (hi < fmap.size () && fmap[hi]) |
| 1599 | && fmap[hi] |
1599 | { |
| 1600 | && (*fmap[hi])[unicode & 0xff] != 0xff) |
1600 | unsigned char m = (*fmap[hi])[unicode & 0xff]; |
| 1601 | return (*fmap[hi])[unicode & 0xff]; |
1601 | |
|
|
1602 | if (m != 0xff) |
|
|
1603 | { |
|
|
1604 | careful = m & 128; |
|
|
1605 | return m & 127; |
|
|
1606 | } |
|
|
1607 | } |
| 1602 | |
1608 | |
| 1603 | unsigned int i; |
1609 | unsigned int i; |
| 1604 | |
1610 | |
| 1605 | for (i = 0; i < fonts.size (); i++) |
1611 | for (i = 0; i < fonts.size (); i++) |
| 1606 | { |
1612 | { |
| … | |
… | |
| 1619 | } |
1625 | } |
| 1620 | |
1626 | |
| 1621 | if (f->cs == CS_UNKNOWN) |
1627 | if (f->cs == CS_UNKNOWN) |
| 1622 | goto next_font; |
1628 | goto next_font; |
| 1623 | |
1629 | |
| 1624 | bool careful; |
|
|
| 1625 | if (f->has_char (unicode, &prop, careful)) |
1630 | if (f->has_char (unicode, &prop, careful)) |
| 1626 | { |
|
|
| 1627 | if (careful) |
|
|
| 1628 | i |= 128; |
|
|
| 1629 | |
|
|
| 1630 | goto found; |
1631 | goto found; |
| 1631 | } |
|
|
| 1632 | |
1632 | |
| 1633 | next_font: |
1633 | next_font: |
| 1634 | if (i == fonts.size () - 1) |
1634 | if (i == fonts.size () - 1) |
| 1635 | { |
1635 | { |
| 1636 | if (fallback->name) |
1636 | if (fallback->name) |
| … | |
… | |
| 1675 | FcPatternDestroy (match); |
1675 | FcPatternDestroy (match); |
| 1676 | |
1676 | |
| 1677 | if (find_font (font) < 0) |
1677 | if (find_font (font) < 0) |
| 1678 | { |
1678 | { |
| 1679 | char fontname[4096]; |
1679 | char fontname[4096]; |
| 1680 | sprintf (fontname, "xft:%-.4090s", font); |
1680 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
| 1681 | |
1681 | |
| 1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1682 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
| 1683 | } |
1683 | } |
| 1684 | |
1684 | |
| 1685 | free (font); |
1685 | free (font); |
| … | |
… | |
| 1689 | } |
1689 | } |
| 1690 | } |
1690 | } |
| 1691 | |
1691 | |
| 1692 | /* we must return SOME font */ |
1692 | /* we must return SOME font */ |
| 1693 | i = 0; |
1693 | i = 0; |
|
|
1694 | careful = false; |
| 1694 | |
1695 | |
| 1695 | found: |
1696 | found: |
| 1696 | // found a font, cache it |
1697 | // found a font, cache it |
| 1697 | if (i < 255) |
1698 | if (i < 255) |
| 1698 | { |
1699 | { |
| … | |
… | |
| 1703 | { |
1704 | { |
| 1704 | fmap[hi] = (pagemap *)new pagemap; |
1705 | fmap[hi] = (pagemap *)new pagemap; |
| 1705 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
1706 | memset (fmap[hi], 0xff, sizeof (pagemap)); |
| 1706 | } |
1707 | } |
| 1707 | |
1708 | |
| 1708 | (*fmap[hi])[unicode & 0xff] = i; |
1709 | (*fmap[hi])[unicode & 0xff] = i | (careful ? 128 : 0); |
| 1709 | } |
1710 | } |
| 1710 | |
1711 | |
| 1711 | return i; |
1712 | return i; |
| 1712 | } |
1713 | } |
| 1713 | |
1714 | |
|
|
1715 | int |
|
|
1716 | rxvt_fontset::find_font (unicode_t unicode) |
|
|
1717 | { |
|
|
1718 | bool careful; |
|
|
1719 | int id = find_font_idx (unicode, careful); |
| 1714 | |
1720 | |
|
|
1721 | return min<int> (fontCount, id) | (careful ? Careful : 0); |
|
|
1722 | } |
| 1715 | |
1723 | |
