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.180 by sf-exg, Mon May 30 18:39:03 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
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
… …
522 524
523 void draw (rxvt_drawable &d, int x, int y, 525 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len, 526 const text_t *text, int len,
525 int fg, int bg) 527 int fg, int bg)
526 { 528 {
527 while (len--) 529 while (len)
528 { 530 {
529 int fid = fs->find_font_idx (*text); 531 int fid = fs->find_font_idx (*text);
532 int w = 1;
533 while (w < len && text[w] == NOCHAR)
534 w++;
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 535 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
531 ++text; 536 text += w;
537 len -= w;
532 x += term->fwidth; 538 x += term->fwidth * w;
533 } 539 }
534 } 540 }
535}; 541};
536 542
537///////////////////////////////////////////////////////////////////////////// 543/////////////////////////////////////////////////////////////////////////////
… …
716 f = XLoadQueryFont (disp, name); 722 f = XLoadQueryFont (disp, name);
717 723
718 if (!f) 724 if (!f)
719 return false; 725 return false;
720 726
721 char *new_name = get_property (f, XA_FONT, name); 727 char *new_name = get_property (f, XA_FONT, 0);
722 728
723 if (new_name) 729 if (new_name)
724 set_name (new_name); 730 set_name (new_name);
725 else 731 else
726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 732 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
727 733
728 XFreeFont (disp, f); 734 XFreeFont (disp, f);
729 f = 0; 735 f = 0;
730 } 736 }
731 737
… …
788 free (fname); 794 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0")) 795 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 796 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 } 797 }
792 798
793 if (!set_properties (p, fname)) 799 if (!set_properties (p, fname)
800 // also weed out too large fonts
801 || (prop.height != rxvt_fontprop::unset
802 && p.height > prop.height))
803 {
804 free (fname);
794 continue; 805 continue;
795 806 }
796 if (prop.height != rxvt_fontprop::unset
797 && p.height > prop.height) // weed out too large fonts
798 continue;
799 807
800 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 808 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); 809 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); 810 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); 811 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
860 free (registry); 868 free (registry);
861 free (encoding); 869 free (encoding);
862 870
863 if (cs == CS_UNKNOWN) 871 if (cs == CS_UNKNOWN)
864 { 872 {
865 const char *charset = get_property (f, XA_FONT, 0); 873 char *value = get_property (f, XA_FONT, 0);
874 const char *charset = value;
866 875
867 if (!charset) 876 if (!charset)
868 charset = name; 877 charset = name;
869 878
870 int count = 13; 879 int count = 13;
… …
873 break; 882 break;
874 883
875 cs = codeset_from_name (charset); 884 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN) 885 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 886 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
887
888 free (value);
878 } 889 }
879 890
880 if (cs == CS_UNKNOWN) 891 if (cs == CS_UNKNOWN)
881 { 892 {
882 clear (); 893 clear ();
… …
914 } 925 }
915#endif 926#endif
916 927
917 width = 1; 928 width = 1;
918 929
919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 930 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
920 { 931 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 932 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 933 continue;
923 934
924 // ignore characters we wouldn't use anyways 935 // ignore characters we wouldn't use anyways
… …
960} 971}
961 972
962bool 973bool
963rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
964{ 975{
976 careful = false;
977
965 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
966 979
967 if (ch == NOCHAR) 980 if (ch == NOCHAR)
968 return false; 981 return false;
969 982
… …
1211 int ftheight = 0; 1224 int ftheight = 0;
1212 bool success = true; 1225 bool success = true;
1213 1226
1214 for (;;) 1227 for (;;)
1215 { 1228 {
1229 p = FcPatternDuplicate (match);
1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1230 f = XftFontOpenPattern (disp, p);
1217 1231
1218 if (!f) 1232 if (!f)
1219 { 1233 {
1234 FcPatternDestroy (p);
1220 success = false; 1235 success = false;
1221 break; 1236 break;
1222 } 1237 }
1223 1238
1224 FT_Face face = XftLockFace (f); 1239 FT_Face face = XftLockFace (f);
… …
1232 1247
1233 XftUnlockFace (f); 1248 XftUnlockFace (f);
1234 1249
1235 int glheight = height; 1250 int glheight = height;
1236 1251
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1252 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
1238 { 1253 {
1239 FcChar16 ch = *t; 1254 FcChar16 ch = *t;
1240 1255
1241 if (cs != CS_UNICODE 1256 if (cs != CS_UNICODE
1242 && ch > 0x100 1257 && ch > 0x100
… …
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398 1413
1399#ifdef HAVE_BG_PIXMAP 1414#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401 1416
1402 if (term->bgPixmap.pixmap 1417 if (term->bg_pixmap
1403 && (bg == Color_transparent || bg == Color_bg 1418 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1420 {
1406 int src_x = x, src_y = y; 1421 int src_x = x, src_y = y;
1407 1422
1408 if (term->bgPixmap.is_parentOrigin ()) 1423 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1409 { 1424 {
1410 src_x += term->window_vt_x; 1425 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1426 src_y += term->window_vt_y;
1412 } 1427 }
1413 1428
1414 if (term->bgPixmap.pmap_width >= src_x + w 1429 if (term->bg_pmap_width >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h) 1430 && term->bg_pmap_height >= src_y + h)
1416 { 1431 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1432 XCopyArea (disp, term->bg_pixmap, d2, gc,
1418 src_x, src_y, w, h, 0, 0); 1433 src_x, src_y, w, h, 0, 0);
1419 } 1434 }
1420 else 1435 else
1421 { 1436 {
1422 XGCValues gcv; 1437 XGCValues gcv;
1423 1438
1424 gcv.fill_style = FillTiled; 1439 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap; 1440 gcv.tile = term->bg_pixmap;
1426 gcv.ts_x_origin = -src_x; 1441 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y; 1442 gcv.ts_y_origin = -src_y;
1428 1443
1429 XChangeGC (disp, gc, 1444 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1497 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1498 = rxvt_fontprop::unset;
1484 force_prop = false; 1499 force_prop = false;
1485 1500
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1501 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1502 (*i)->unref ();
1488 1503
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1504 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1505 delete *p;
1491 1506
1492 free (fontdesc); fontdesc = 0; 1507 free (fontdesc); fontdesc = 0;
… …
1494 fonts.clear (); 1509 fonts.clear ();
1495 1510
1496 fallback = fallback_fonts; 1511 fallback = fallback_fonts;
1497} 1512}
1498 1513
1514void
1515rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1516{
1517 font->set_term (term);
1518
1519 font->cs = cs;
1520 font->loaded = false;
1521}
1522
1499rxvt_font * 1523rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1524rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1525{
1502 rxvt_font *f; 1526 rxvt_font *f;
1503 1527
… …
1519 f = new rxvt_font_x11; 1543 f = new rxvt_font_x11;
1520 } 1544 }
1521 else 1545 else
1522 f = new rxvt_font_x11; 1546 f = new rxvt_font_x11;
1523 1547
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1548 f->set_name (strdup (name));
1526 1549 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1550
1530 return f; 1551 return f;
1531} 1552}
1532 1553
1533///////////////////////////////////////////////////////////////////////////// 1554/////////////////////////////////////////////////////////////////////////////
1555
1556void
1557rxvt_fontset::push_font (rxvt_font *font)
1558{
1559 // the fontCount index is reserved for the overflow font, it is only
1560 // necessary when we get fontCount or more fonts, as they cannot be
1561 // represented in the rendition.
1562 if (fonts.size () == fontCount)
1563 {
1564 rxvt_font *f = new rxvt_font_overflow (this);
1565
1566 prepare_font (f, CS_UNICODE);
1567 fonts.push_back (f);
1568 }
1569
1570 fonts.push_back (font);
1571}
1534 1572
1535void 1573void
1536rxvt_fontset::add_fonts (const char *desc) 1574rxvt_fontset::add_fonts (const char *desc)
1537{ 1575{
1538 if (desc) 1576 if (desc)
… …
1579 if (end - desc < 511) 1617 if (end - desc < 511)
1580 { 1618 {
1581 memcpy (buf, desc, end - desc); 1619 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1620 buf[end - desc] = 0;
1583 1621
1584 fonts.push_back (new_font (buf, cs)); 1622 push_font (new_font (buf, cs));
1585 } 1623 }
1586 else 1624 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1625 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1588 1626
1589 desc = end + 1; 1627 desc = end + 1;
1590 } 1628 }
1591 while (*end); 1629 while (*end);
1592 } 1630 }
… …
1617{ 1655{
1618 clear (); 1656 clear ();
1619 1657
1620 fontdesc = strdup (desc); 1658 fontdesc = strdup (desc);
1621 1659
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1660 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1661 realize_font (0);
1624 1662
1625 add_fonts (desc); 1663 add_fonts (desc);
1626 1664
1627 return true; 1665 return true;
… …
1683 if (i == fonts.size () - 1) 1721 if (i == fonts.size () - 1)
1684 { 1722 {
1685 if (fallback->name) 1723 if (fallback->name)
1686 { 1724 {
1687 // search through the fallback list 1725 // search through the fallback list
1688 fonts.push_back (new_font (fallback->name, fallback->cs)); 1726 push_font (new_font (fallback->name, fallback->cs));
1689 fallback++; 1727 fallback++;
1690 } 1728 }
1691 else 1729 else
1692 { 1730 {
1693 // try to find a new font. 1731 // try to find a new font.
… …
1726 if (find_font (font) < 0) 1764 if (find_font (font) < 0)
1727 { 1765 {
1728 char fontname[4096]; 1766 char fontname[4096];
1729 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1767 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1730 1768
1731 fonts.push_back (new_font (fontname, CS_UNICODE)); 1769 push_font (new_font (fontname, CS_UNICODE));
1732 } 1770 }
1733 1771
1734 free (font); 1772 free (font);
1735 } 1773 }
1736#endif 1774#endif
… …
1758 } 1796 }
1759 1797
1760 return i; 1798 return i;
1761} 1799}
1762 1800
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