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.161 by root, Wed Mar 31 22:22:32 2010 UTC vs.
Revision 1.170 by sf-exg, Thu Dec 30 01:13:24 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);
… …
914 } 918 }
915#endif 919#endif
916 920
917 width = 1; 921 width = 1;
918 922
919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
920 { 924 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 925 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 926 continue;
923 927
924 // ignore characters we wouldn't use anyways 928 // ignore characters we wouldn't use anyways
… …
1232 1236
1233 XftUnlockFace (f); 1237 XftUnlockFace (f);
1234 1238
1235 int glheight = height; 1239 int glheight = height;
1236 1240
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1238 { 1242 {
1239 FcChar16 ch = *t; 1243 FcChar16 ch = *t;
1240 1244
1241 if (cs != CS_UNICODE 1245 if (cs != CS_UNICODE
1242 && ch > 0x100 1246 && ch > 0x100
… …
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;
… …
1494 fonts.clear (); 1498 fonts.clear ();
1495 1499
1496 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1497} 1501}
1498 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1499rxvt_font * 1512rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1514{
1502 rxvt_font *f; 1515 rxvt_font *f;
1503 1516
… …
1519 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1520 } 1533 }
1521 else 1534 else
1522 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1523 1536
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1526 1538 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1539
1530 return f; 1540 return f;
1531} 1541}
1532 1542
1533///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1534 1561
1535void 1562void
1536rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1537{ 1564{
1538 if (desc) 1565 if (desc)
… …
1579 if (end - desc < 511) 1606 if (end - desc < 511)
1580 { 1607 {
1581 memcpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1583 1610
1584 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1585 } 1612 }
1586 else 1613 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1588 1615
1589 desc = end + 1; 1616 desc = end + 1;
… …
1617{ 1644{
1618 clear (); 1645 clear ();
1619 1646
1620 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1621 1648
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1650 realize_font (0);
1624 1651
1625 add_fonts (desc); 1652 add_fonts (desc);
1626 1653
1627 return true; 1654 return true;
… …
1683 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1684 { 1711 {
1685 if (fallback->name) 1712 if (fallback->name)
1686 { 1713 {
1687 // search through the fallback list 1714 // search through the fallback list
1688 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1689 fallback++; 1716 fallback++;
1690 } 1717 }
1691 else 1718 else
1692 { 1719 {
1693 // try to find a new font. 1720 // try to find a new font.
… …
1726 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1727 { 1754 {
1728 char fontname[4096]; 1755 char fontname[4096];
1729 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1730 1757
1731 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1732 } 1759 }
1733 1760
1734 free (font); 1761 free (font);
1735 } 1762 }
1736#endif 1763#endif
… …
1758 } 1785 }
1759 1786
1760 return i; 1787 return i;
1761} 1788}
1762 1789
1763int
1764rxvt_fontset::find_font (unicode_t unicode)
1765{
1766 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
1767}
1768

Diff Legend

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