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.152 by root, Sat Apr 4 21:27:53 2009 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
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
538
487///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
488 540
489struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
490 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
491 543
… …
499 551
500 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 553 const text_t *text, int len,
502 int fg, int bg); 554 int fg, int bg);
503 555
504 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 557 XFontStruct *f;
506 bool enc2b, encm; 558 bool enc2b, encm;
507 559
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
864 } 916 }
865#endif 917#endif
866 918
867 width = 1; 919 width = 1;
868 920
869 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; )
870 { 922 {
871 if (FROM_UNICODE (cs, *t) == NOCHAR) 923 if (FROM_UNICODE (cs, *t) == NOCHAR)
872 continue; 924 continue;
873 925
874 // ignore characters we wouldn't use anyways 926 // ignore characters we wouldn't use anyways
… …
915 uint32_t ch = FROM_UNICODE (cs, unicode); 967 uint32_t ch = FROM_UNICODE (cs, unicode);
916 968
917 if (ch == NOCHAR) 969 if (ch == NOCHAR)
918 return false; 970 return false;
919 971
920 /* check wether the character exists in _this_ font. horrible. */ 972 /* check whether the character exists in _this_ font. horrible. */
921 XCharStruct *xcs; 973 XCharStruct *xcs;
922 974
923 if (encm) 975 if (encm)
924 { 976 {
925 unsigned char byte1 = ch >> 8; 977 unsigned char byte1 = ch >> 8;
… …
955 return false; 1007 return false;
956 1008
957 if (!prop || prop->width == rxvt_fontprop::unset) 1009 if (!prop || prop->width == rxvt_fontprop::unset)
958 return true; 1010 return true;
959 1011
960 // check wether character overlaps previous/next character 1012 // check whether character overlaps previous/next character
961 int w = xcs->rbearing - xcs->lbearing; 1013 int w = xcs->rbearing - xcs->lbearing;
962 int wcw = max (WCWIDTH (unicode), 1); 1014 int wcw = max (WCWIDTH (unicode), 1);
963 1015
964 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1016 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
965 1017
… …
1182 1234
1183 XftUnlockFace (f); 1235 XftUnlockFace (f);
1184 1236
1185 int glheight = height; 1237 int glheight = height;
1186 1238
1187 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; )
1188 { 1240 {
1189 FcChar16 ch = *t; 1241 FcChar16 ch = *t;
1190 1242
1191 if (cs != CS_UNICODE 1243 if (cs != CS_UNICODE
1192 && ch > 0x100 1244 && ch > 0x100
… …
1293rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1345rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1294 const text_t *text, int len, 1346 const text_t *text, int len,
1295 int fg, int bg) 1347 int fg, int bg)
1296{ 1348{
1297 XGlyphInfo extents; 1349 XGlyphInfo extents;
1298 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1350 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1299 XftGlyphSpec *ep = enc; 1351 XftGlyphSpec *ep = enc;
1300 1352
1301 dTermDisplay; 1353 dTermDisplay;
1302 dTermGC; 1354 dTermGC;
1303 1355
… …
1353 && (bg == Color_transparent || bg == Color_bg 1405 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1406 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1407 {
1356 int src_x = x, src_y = y; 1408 int src_x = x, src_y = y;
1357 1409
1358 if (term->bgPixmap.is_parentOrigin ()) 1410 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1359 { 1411 {
1360 src_x += term->window_vt_x; 1412 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y; 1413 src_y += term->window_vt_y;
1362 } 1414 }
1363 1415
… …
1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1484 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1433 = rxvt_fontprop::unset; 1485 = rxvt_fontprop::unset;
1434 force_prop = false; 1486 force_prop = false;
1435 1487
1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1488 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1437 FONT_UNREF (*i); 1489 (*i)->unref ();
1438 1490
1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1491 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1440 delete *p; 1492 delete *p;
1441 1493
1442 free (fontdesc); fontdesc = 0; 1494 free (fontdesc); fontdesc = 0;
… …
1444 fonts.clear (); 1496 fonts.clear ();
1445 1497
1446 fallback = fallback_fonts; 1498 fallback = fallback_fonts;
1447} 1499}
1448 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
1449rxvt_font * 1510rxvt_font *
1450rxvt_fontset::new_font (const char *name, codeset cs) 1511rxvt_fontset::new_font (const char *name, codeset cs)
1451{ 1512{
1452 rxvt_font *f; 1513 rxvt_font *f;
1453 1514
… …
1469 f = new rxvt_font_x11; 1530 f = new rxvt_font_x11;
1470 } 1531 }
1471 else 1532 else
1472 f = new rxvt_font_x11; 1533 f = new rxvt_font_x11;
1473 1534
1474 f->set_term (term);
1475 f->set_name (strdup (name)); 1535 f->set_name (strdup (name));
1476 1536 prepare_font (f, cs);
1477 f->cs = cs;
1478 f->loaded = false;
1479 1537
1480 return f; 1538 return f;
1481} 1539}
1482 1540
1483///////////////////////////////////////////////////////////////////////////// 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}
1484 1559
1485void 1560void
1486rxvt_fontset::add_fonts (const char *desc) 1561rxvt_fontset::add_fonts (const char *desc)
1487{ 1562{
1488 if (desc) 1563 if (desc)
… …
1529 if (end - desc < 511) 1604 if (end - desc < 511)
1530 { 1605 {
1531 memcpy (buf, desc, end - desc); 1606 memcpy (buf, desc, end - desc);
1532 buf[end - desc] = 0; 1607 buf[end - desc] = 0;
1533 1608
1534 fonts.push_back (new_font (buf, cs)); 1609 push_font (new_font (buf, cs));
1535 } 1610 }
1536 else 1611 else
1537 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1612 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1538 1613
1539 desc = end + 1; 1614 desc = end + 1;
… …
1567{ 1642{
1568 clear (); 1643 clear ();
1569 1644
1570 fontdesc = strdup (desc); 1645 fontdesc = strdup (desc);
1571 1646
1572 fonts.push_back (new_font (0, CS_UNICODE)); 1647 push_font (new_font (0, CS_UNICODE));
1573 realize_font (0); 1648 realize_font (0);
1574 1649
1575 add_fonts (desc); 1650 add_fonts (desc);
1576 1651
1577 return true; 1652 return true;
… …
1586 1661
1587 return -1; 1662 return -1;
1588} 1663}
1589 1664
1590int 1665int
1591rxvt_fontset::find_font (unicode_t unicode) 1666rxvt_fontset::find_font_idx (unicode_t unicode)
1592{ 1667{
1593 if (unicode >= 1<<20) 1668 if (unicode >= 1<<20)
1594 return 0; 1669 return 0;
1595 1670
1596 unicode_t hi = unicode >> 8; 1671 unicode_t hi = unicode >> 8;
… …
1622 goto next_font; 1697 goto next_font;
1623 1698
1624 bool careful; 1699 bool careful;
1625 if (f->has_char (unicode, &prop, careful)) 1700 if (f->has_char (unicode, &prop, careful))
1626 { 1701 {
1627 if (careful) 1702 i = (i << 1) | careful;
1628 i |= 128;
1629 1703
1630 goto found; 1704 goto found;
1631 } 1705 }
1632 1706
1633 next_font: 1707 next_font:
1634 if (i == fonts.size () - 1) 1708 if (i == fonts.size () - 1)
1635 { 1709 {
1636 if (fallback->name) 1710 if (fallback->name)
1637 { 1711 {
1638 // search through the fallback list 1712 // search through the fallback list
1639 fonts.push_back (new_font (fallback->name, fallback->cs)); 1713 push_font (new_font (fallback->name, fallback->cs));
1640 fallback++; 1714 fallback++;
1641 } 1715 }
1642 else 1716 else
1643 { 1717 {
1644 // try to find a new font. 1718 // try to find a new font.
… …
1675 FcPatternDestroy (match); 1749 FcPatternDestroy (match);
1676 1750
1677 if (find_font (font) < 0) 1751 if (find_font (font) < 0)
1678 { 1752 {
1679 char fontname[4096]; 1753 char fontname[4096];
1680 sprintf (fontname, "xft:%-.4090s", font); 1754 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1681 1755
1682 fonts.push_back (new_font (fontname, CS_UNICODE)); 1756 push_font (new_font (fontname, CS_UNICODE));
1683 } 1757 }
1684 1758
1685 free (font); 1759 free (font);
1686 } 1760 }
1687#endif 1761#endif
… …
1709 } 1783 }
1710 1784
1711 return i; 1785 return i;
1712} 1786}
1713 1787
1714
1715

Diff Legend

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