ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.160 by sf-exg, Wed Mar 31 21:52:05 2010 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

… …
26 26
27#include <cstdlib> 27#include <cstdlib>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
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) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 )) 42 ))
39 43
40const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
41 codeset cs; 45 codeset cs;
42 const char *name; 46 const char *name;
43} fallback_fonts[] = { 47} fallback_fonts[] = {
44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
158}; 162};
159 163
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
164 166
165///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
166 168
… …
448 450
449 text_t chrs[2]; 451 text_t chrs[2];
450 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
451 453
452 *chrs = cc->c1; 454 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
455 457
456 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
457 { 459 {
458 bool careful; 460 bool careful;
459 461
460 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 463 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 465 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
465 467
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 469 }
468 } 470 }
469#endif 471#endif
… …
482 484
483 x += fwidth; 485 x += fwidth;
484 } 486 }
485} 487}
486 488
487struct rxvt_font_meta : rxvt_font { 489struct rxvt_font_overflow : rxvt_font {
488 struct rxvt_fontset *fs; 490 struct rxvt_fontset *fs;
489 491
490 rxvt_font_meta (rxvt_fontset *fs) 492 rxvt_font_overflow (rxvt_fontset *fs)
491 : rxvt_font () 493 : rxvt_font ()
492 { 494 {
493 this->fs = fs; 495 this->fs = fs;
494 } 496 }
495 497
… …
508 bool load (const rxvt_fontprop &prop, bool force_prop) 510 bool load (const rxvt_fontprop &prop, bool force_prop)
509 { 511 {
510 width = 1; height = 1; 512 width = 1; height = 1;
511 ascent = 1; descent = 0; 513 ascent = 1; descent = 0;
512 514
513 set_name (strdup ("built-in meta font")); 515 set_name (strdup ("built-in rendition overflow font"));
514 516
515 return true; 517 return true;
516 } 518 }
517 519
518 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
… …
914 } 916 }
915#endif 917#endif
916 918
917 width = 1; 919 width = 1;
918 920
919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 921 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
920 { 922 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 923 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 924 continue;
923 925
924 // ignore characters we wouldn't use anyways 926 // ignore characters we wouldn't use anyways
… …
1232 1234
1233 XftUnlockFace (f); 1235 XftUnlockFace (f);
1234 1236
1235 int glheight = height; 1237 int glheight = height;
1236 1238
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1239 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1238 { 1240 {
1239 FcChar16 ch = *t; 1241 FcChar16 ch = *t;
1240 1242
1241 if (cs != CS_UNICODE 1243 if (cs != CS_UNICODE
1242 && ch > 0x100 1244 && ch > 0x100
… …
1403 && (bg == Color_transparent || bg == Color_bg 1405 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1406 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1407 {
1406 int src_x = x, src_y = y; 1408 int src_x = x, src_y = y;
1407 1409
1408 if (term->bgPixmap.is_parentOrigin ()) 1410 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1409 { 1411 {
1410 src_x += term->window_vt_x; 1412 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1413 src_y += term->window_vt_y;
1412 } 1414 }
1413 1415
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1484 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1485 = rxvt_fontprop::unset;
1484 force_prop = false; 1486 force_prop = false;
1485 1487
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1488 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1489 (*i)->unref ();
1488 1490
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1491 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1492 delete *p;
1491 1493
1492 free (fontdesc); fontdesc = 0; 1494 free (fontdesc); fontdesc = 0;
… …
1494 fonts.clear (); 1496 fonts.clear ();
1495 1497
1496 fallback = fallback_fonts; 1498 fallback = fallback_fonts;
1497} 1499}
1498 1500
1501void
1502rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1503{
1504 font->set_term (term);
1505
1506 font->cs = cs;
1507 font->loaded = false;
1508}
1509
1499rxvt_font * 1510rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1511rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1512{
1502 rxvt_font *f; 1513 rxvt_font *f;
1503 1514
… …
1519 f = new rxvt_font_x11; 1530 f = new rxvt_font_x11;
1520 } 1531 }
1521 else 1532 else
1522 f = new rxvt_font_x11; 1533 f = new rxvt_font_x11;
1523 1534
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1535 f->set_name (strdup (name));
1526 1536 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1537
1530 return f; 1538 return f;
1531} 1539}
1532 1540
1533///////////////////////////////////////////////////////////////////////////// 1541/////////////////////////////////////////////////////////////////////////////
1542
1543void
1544rxvt_fontset::push_font (rxvt_font *font)
1545{
1546 // the fontCount index is reserved for the overflow font, it is only
1547 // necessary when we get fontCount or more fonts, as they cannot be
1548 // represented in the rendition.
1549 if (fonts.size () == fontCount)
1550 {
1551 rxvt_font *f = new rxvt_font_overflow (this);
1552
1553 prepare_font (f, CS_UNICODE);
1554 fonts.push_back (f);
1555 }
1556
1557 fonts.push_back (font);
1558}
1534 1559
1535void 1560void
1536rxvt_fontset::add_fonts (const char *desc) 1561rxvt_fontset::add_fonts (const char *desc)
1537{ 1562{
1538 if (desc) 1563 if (desc)
… …
1579 if (end - desc < 511) 1604 if (end - desc < 511)
1580 { 1605 {
1581 memcpy (buf, desc, end - desc); 1606 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1607 buf[end - desc] = 0;
1583 1608
1584 fonts.push_back (new_font (buf, cs)); 1609 push_font (new_font (buf, cs));
1585 } 1610 }
1586 else 1611 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1612 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1588 1613
1589 desc = end + 1; 1614 desc = end + 1;
… …
1617{ 1642{
1618 clear (); 1643 clear ();
1619 1644
1620 fontdesc = strdup (desc); 1645 fontdesc = strdup (desc);
1621 1646
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1647 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1648 realize_font (0);
1624 1649
1625 add_fonts (desc); 1650 add_fonts (desc);
1626 1651
1627 return true; 1652 return true;
… …
1672 goto next_font; 1697 goto next_font;
1673 1698
1674 bool careful; 1699 bool careful;
1675 if (f->has_char (unicode, &prop, careful)) 1700 if (f->has_char (unicode, &prop, careful))
1676 { 1701 {
1677 if (careful) 1702 i = (i << 1) | careful;
1678 i |= 128;
1679 1703
1680 goto found; 1704 goto found;
1681 } 1705 }
1682 1706
1683 next_font: 1707 next_font:
1684 if (i == fonts.size () - 1) 1708 if (i == fonts.size () - 1)
1685 { 1709 {
1686 if (fallback->name) 1710 if (fallback->name)
1687 { 1711 {
1688 // search through the fallback list 1712 // search through the fallback list
1689 fonts.push_back (new_font (fallback->name, fallback->cs)); 1713 push_font (new_font (fallback->name, fallback->cs));
1690 fallback++; 1714 fallback++;
1691 } 1715 }
1692 else 1716 else
1693 { 1717 {
1694 // try to find a new font. 1718 // try to find a new font.
… …
1727 if (find_font (font) < 0) 1751 if (find_font (font) < 0)
1728 { 1752 {
1729 char fontname[4096]; 1753 char fontname[4096];
1730 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1754 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1731 1755
1732 fonts.push_back (new_font (fontname, CS_UNICODE)); 1756 push_font (new_font (fontname, CS_UNICODE));
1733 } 1757 }
1734 1758
1735 free (font); 1759 free (font);
1736 } 1760 }
1737#endif 1761#endif
… …
1759 } 1783 }
1760 1784
1761 return i; 1785 return i;
1762} 1786}
1763 1787
1764int
1765rxvt_fontset::find_font (unicode_t unicode)
1766{
1767 int id = find_font_idx (unicode);
1768
1769 return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
1770}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines