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.171 by sf-exg, Thu Dec 30 17:28:29 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
… …
788 free (fname); 790 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 } 793 }
792 794
793 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
794 continue; 801 continue;
795 802 }
796 if (prop.height != rxvt_fontprop::unset
797 && p.height > prop.height) // weed out too large fonts
798 continue;
799 803
800 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
801 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
802 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
803 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
860 free (registry); 864 free (registry);
861 free (encoding); 865 free (encoding);
862 866
863 if (cs == CS_UNKNOWN) 867 if (cs == CS_UNKNOWN)
864 { 868 {
865 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
866 871
867 if (!charset) 872 if (!charset)
868 charset = name; 873 charset = name;
869 874
870 int count = 13; 875 int count = 13;
… …
873 break; 878 break;
874 879
875 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN) 881 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
878 } 885 }
879 886
880 if (cs == CS_UNKNOWN) 887 if (cs == CS_UNKNOWN)
881 { 888 {
882 clear (); 889 clear ();
… …
914 } 921 }
915#endif 922#endif
916 923
917 width = 1; 924 width = 1;
918 925
919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
920 { 927 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 929 continue;
923 930
924 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
1232 1239
1233 XftUnlockFace (f); 1240 XftUnlockFace (f);
1234 1241
1235 int glheight = height; 1242 int glheight = height;
1236 1243
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1238 { 1245 {
1239 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1240 1247
1241 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1242 && ch > 0x100 1249 && ch > 0x100
… …
1403 && (bg == Color_transparent || bg == Color_bg 1410 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1412 {
1406 int src_x = x, src_y = y; 1413 int src_x = x, src_y = y;
1407 1414
1408 if (term->bgPixmap.is_parentOrigin ()) 1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1409 { 1416 {
1410 src_x += term->window_vt_x; 1417 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1418 src_y += term->window_vt_y;
1412 } 1419 }
1413 1420
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1484 force_prop = false; 1491 force_prop = false;
1485 1492
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1494 (*i)->unref ();
1488 1495
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1497 delete *p;
1491 1498
1492 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1494 fonts.clear (); 1501 fonts.clear ();
1495 1502
1496 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1497} 1504}
1498 1505
1506void
1507rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1508{
1509 font->set_term (term);
1510
1511 font->cs = cs;
1512 font->loaded = false;
1513}
1514
1499rxvt_font * 1515rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1517{
1502 rxvt_font *f; 1518 rxvt_font *f;
1503 1519
… …
1519 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1520 } 1536 }
1521 else 1537 else
1522 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1523 1539
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1526 1541 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1542
1530 return f; 1543 return f;
1531} 1544}
1532 1545
1533///////////////////////////////////////////////////////////////////////////// 1546/////////////////////////////////////////////////////////////////////////////
1547
1548void
1549rxvt_fontset::push_font (rxvt_font *font)
1550{
1551 // the fontCount index is reserved for the overflow font, it is only
1552 // necessary when we get fontCount or more fonts, as they cannot be
1553 // represented in the rendition.
1554 if (fonts.size () == fontCount)
1555 {
1556 rxvt_font *f = new rxvt_font_overflow (this);
1557
1558 prepare_font (f, CS_UNICODE);
1559 fonts.push_back (f);
1560 }
1561
1562 fonts.push_back (font);
1563}
1534 1564
1535void 1565void
1536rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1537{ 1567{
1538 if (desc) 1568 if (desc)
… …
1579 if (end - desc < 511) 1609 if (end - desc < 511)
1580 { 1610 {
1581 memcpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1583 1613
1584 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1585 } 1615 }
1586 else 1616 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1588 1618
1589 desc = end + 1; 1619 desc = end + 1;
… …
1617{ 1647{
1618 clear (); 1648 clear ();
1619 1649
1620 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1621 1651
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1653 realize_font (0);
1624 1654
1625 add_fonts (desc); 1655 add_fonts (desc);
1626 1656
1627 return true; 1657 return true;
… …
1672 goto next_font; 1702 goto next_font;
1673 1703
1674 bool careful; 1704 bool careful;
1675 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1676 { 1706 {
1677 if (careful) 1707 i = (i << 1) | careful;
1678 i |= 128;
1679 1708
1680 goto found; 1709 goto found;
1681 } 1710 }
1682 1711
1683 next_font: 1712 next_font:
1684 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1685 { 1714 {
1686 if (fallback->name) 1715 if (fallback->name)
1687 { 1716 {
1688 // search through the fallback list 1717 // search through the fallback list
1689 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1690 fallback++; 1719 fallback++;
1691 } 1720 }
1692 else 1721 else
1693 { 1722 {
1694 // try to find a new font. 1723 // try to find a new font.
… …
1727 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1728 { 1757 {
1729 char fontname[4096]; 1758 char fontname[4096];
1730 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1731 1760
1732 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1733 } 1762 }
1734 1763
1735 free (font); 1764 free (font);
1736 } 1765 }
1737#endif 1766#endif
… …
1759 } 1788 }
1760 1789
1761 return i; 1790 return i;
1762} 1791}
1763 1792
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