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.175 by sf-exg, Thu Jan 27 17:37:19 2011 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
… …
239 { 241 {
240#if XFT 242#if XFT
241 Picture dst; 243 Picture dst;
242 244
243# ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap 246 if (term->bg_pixmap
245 && !term->pix_colors[color].is_opaque () 247 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d)))) 248 && ((dst = XftDrawPicture (d))))
247 { 249 {
248 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
249 251
… …
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
… …
716 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
717 719
718 if (!f) 720 if (!f)
719 return false; 721 return false;
720 722
721 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
722 724
723 if (new_name) 725 if (new_name)
724 set_name (new_name); 726 set_name (new_name);
725 else 727 else
726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
727 729
728 XFreeFont (disp, f); 730 XFreeFont (disp, f);
729 f = 0; 731 f = 0;
730 } 732 }
731 733
… …
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
… …
1211 int ftheight = 0; 1218 int ftheight = 0;
1212 bool success = true; 1219 bool success = true;
1213 1220
1214 for (;;) 1221 for (;;)
1215 { 1222 {
1223 p = FcPatternDuplicate (match);
1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1224 f = XftFontOpenPattern (disp, p);
1217 1225
1218 if (!f) 1226 if (!f)
1219 { 1227 {
1228 FcPatternDestroy (p);
1220 success = false; 1229 success = false;
1221 break; 1230 break;
1222 } 1231 }
1223 1232
1224 FT_Face face = XftLockFace (f); 1233 FT_Face face = XftLockFace (f);
… …
1232 1241
1233 XftUnlockFace (f); 1242 XftUnlockFace (f);
1234 1243
1235 int glheight = height; 1244 int glheight = height;
1236 1245
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1246 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1238 { 1247 {
1239 FcChar16 ch = *t; 1248 FcChar16 ch = *t;
1240 1249
1241 if (cs != CS_UNICODE 1250 if (cs != CS_UNICODE
1242 && ch > 0x100 1251 && ch > 0x100
… …
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398 1407
1399#ifdef HAVE_BG_PIXMAP 1408#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401 1410
1402 if (term->bgPixmap.pixmap 1411 if (term->bg_pixmap
1403 && (bg == Color_transparent || bg == Color_bg 1412 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1414 {
1406 int src_x = x, src_y = y; 1415 int src_x = x, src_y = y;
1407 1416
1408 if (term->bgPixmap.is_parentOrigin ()) 1417 if (term->bg_flags & rxvt_term::isTransparent)
1409 { 1418 {
1410 src_x += term->window_vt_x; 1419 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1420 src_y += term->window_vt_y;
1412 } 1421 }
1413 1422
1414 if (term->bgPixmap.pmap_width >= src_x + w 1423 if (term->bg_pmap_width >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h) 1424 && term->bg_pmap_height >= src_y + h)
1416 { 1425 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1426 XCopyArea (disp, term->bg_pixmap, d2, gc,
1418 src_x, src_y, w, h, 0, 0); 1427 src_x, src_y, w, h, 0, 0);
1419 } 1428 }
1420 else 1429 else
1421 { 1430 {
1422 XGCValues gcv; 1431 XGCValues gcv;
1423 1432
1424 gcv.fill_style = FillTiled; 1433 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap; 1434 gcv.tile = term->bg_pixmap;
1426 gcv.ts_x_origin = -src_x; 1435 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y; 1436 gcv.ts_y_origin = -src_y;
1428 1437
1429 XChangeGC (disp, gc, 1438 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1491 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1492 = rxvt_fontprop::unset;
1484 force_prop = false; 1493 force_prop = false;
1485 1494
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1495 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1496 (*i)->unref ();
1488 1497
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1498 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1499 delete *p;
1491 1500
1492 free (fontdesc); fontdesc = 0; 1501 free (fontdesc); fontdesc = 0;
… …
1494 fonts.clear (); 1503 fonts.clear ();
1495 1504
1496 fallback = fallback_fonts; 1505 fallback = fallback_fonts;
1497} 1506}
1498 1507
1508void
1509rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1510{
1511 font->set_term (term);
1512
1513 font->cs = cs;
1514 font->loaded = false;
1515}
1516
1499rxvt_font * 1517rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1518rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1519{
1502 rxvt_font *f; 1520 rxvt_font *f;
1503 1521
… …
1519 f = new rxvt_font_x11; 1537 f = new rxvt_font_x11;
1520 } 1538 }
1521 else 1539 else
1522 f = new rxvt_font_x11; 1540 f = new rxvt_font_x11;
1523 1541
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1542 f->set_name (strdup (name));
1526 1543 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1544
1530 return f; 1545 return f;
1531} 1546}
1532 1547
1533///////////////////////////////////////////////////////////////////////////// 1548/////////////////////////////////////////////////////////////////////////////
1549
1550void
1551rxvt_fontset::push_font (rxvt_font *font)
1552{
1553 // the fontCount index is reserved for the overflow font, it is only
1554 // necessary when we get fontCount or more fonts, as they cannot be
1555 // represented in the rendition.
1556 if (fonts.size () == fontCount)
1557 {
1558 rxvt_font *f = new rxvt_font_overflow (this);
1559
1560 prepare_font (f, CS_UNICODE);
1561 fonts.push_back (f);
1562 }
1563
1564 fonts.push_back (font);
1565}
1534 1566
1535void 1567void
1536rxvt_fontset::add_fonts (const char *desc) 1568rxvt_fontset::add_fonts (const char *desc)
1537{ 1569{
1538 if (desc) 1570 if (desc)
… …
1579 if (end - desc < 511) 1611 if (end - desc < 511)
1580 { 1612 {
1581 memcpy (buf, desc, end - desc); 1613 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1614 buf[end - desc] = 0;
1583 1615
1584 fonts.push_back (new_font (buf, cs)); 1616 push_font (new_font (buf, cs));
1585 } 1617 }
1586 else 1618 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1619 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1588 1620
1589 desc = end + 1; 1621 desc = end + 1;
1590 } 1622 }
1591 while (*end); 1623 while (*end);
1592 } 1624 }
… …
1617{ 1649{
1618 clear (); 1650 clear ();
1619 1651
1620 fontdesc = strdup (desc); 1652 fontdesc = strdup (desc);
1621 1653
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1654 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1655 realize_font (0);
1624 1656
1625 add_fonts (desc); 1657 add_fonts (desc);
1626 1658
1627 return true; 1659 return true;
… …
1683 if (i == fonts.size () - 1) 1715 if (i == fonts.size () - 1)
1684 { 1716 {
1685 if (fallback->name) 1717 if (fallback->name)
1686 { 1718 {
1687 // search through the fallback list 1719 // search through the fallback list
1688 fonts.push_back (new_font (fallback->name, fallback->cs)); 1720 push_font (new_font (fallback->name, fallback->cs));
1689 fallback++; 1721 fallback++;
1690 } 1722 }
1691 else 1723 else
1692 { 1724 {
1693 // try to find a new font. 1725 // try to find a new font.
… …
1726 if (find_font (font) < 0) 1758 if (find_font (font) < 0)
1727 { 1759 {
1728 char fontname[4096]; 1760 char fontname[4096];
1729 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1761 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1730 1762
1731 fonts.push_back (new_font (fontname, CS_UNICODE)); 1763 push_font (new_font (fontname, CS_UNICODE));
1732 } 1764 }
1733 1765
1734 free (font); 1766 free (font);
1735 } 1767 }
1736#endif 1768#endif
… …
1758 } 1790 }
1759 1791
1760 return i; 1792 return i;
1761} 1793}
1762 1794
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