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.170 by sf-exg, Thu Dec 30 01:13:24 2010 UTC vs.
Revision 1.188 by root, Thu Jan 26 13:08:51 2012 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
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#if XFT 31#if XFT
32# include <fontconfig/fontconfig.h> 32# include <fontconfig/fontconfig.h>
… …
132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
134# endif 134# endif
135#endif 135#endif
136 136
137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
138 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
241 { 240 {
242#if XFT 241#if XFT
243 Picture dst; 242 Picture dst;
244 243
245# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
246 if (term->bgPixmap.pixmap 245 if (term->bg_pixmap
247 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
249 { 248 {
250 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
251 250
… …
524 523
525 void draw (rxvt_drawable &d, int x, int y, 524 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 525 const text_t *text, int len,
527 int fg, int bg) 526 int fg, int bg)
528 { 527 {
529 while (len--) 528 while (len)
530 { 529 {
531 int fid = fs->find_font_idx (*text); 530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 535 text += w;
536 len -= w;
534 x += term->fwidth; 537 x += term->fwidth * w;
535 } 538 }
536 } 539 }
537}; 540};
538 541
539///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
… …
718 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
719 722
720 if (!f) 723 if (!f)
721 return false; 724 return false;
722 725
723 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
724 727
725 if (new_name) 728 if (new_name)
726 set_name (new_name); 729 set_name (new_name);
727 else 730 else
728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
729 732
730 XFreeFont (disp, f); 733 XFreeFont (disp, f);
731 f = 0; 734 f = 0;
732 } 735 }
733 736
… …
813 XFreeFontNames (list); 816 XFreeFontNames (list);
814 817
815 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
816 for (;;) 819 for (;;)
817 { 820 {
818 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
819 822
820 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
822 best = w; 825 best = w;
823 826
824 if (!best->name 827 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 829 break;
… …
864 free (registry); 867 free (registry);
865 free (encoding); 868 free (encoding);
866 869
867 if (cs == CS_UNKNOWN) 870 if (cs == CS_UNKNOWN)
868 { 871 {
869 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
870 874
871 if (!charset) 875 if (!charset)
872 charset = name; 876 charset = name;
873 877
874 int count = 13; 878 int count = 13;
… …
877 break; 881 break;
878 882
879 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 884 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
882 } 888 }
883 889
884 if (cs == CS_UNKNOWN) 890 if (cs == CS_UNKNOWN)
885 { 891 {
886 clear (); 892 clear ();
… …
918 } 924 }
919#endif 925#endif
920 926
921 width = 1; 927 width = 1;
922 928
923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
924 { 930 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 932 continue;
927 933
928 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
964} 970}
965 971
966bool 972bool
967rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
968{ 974{
975 careful = false;
976
969 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
970 978
971 if (ch == NOCHAR) 979 if (ch == NOCHAR)
972 return false; 980 return false;
973 981
… …
1215 int ftheight = 0; 1223 int ftheight = 0;
1216 bool success = true; 1224 bool success = true;
1217 1225
1218 for (;;) 1226 for (;;)
1219 { 1227 {
1228 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1221 1230
1222 if (!f) 1231 if (!f)
1223 { 1232 {
1233 FcPatternDestroy (p);
1224 success = false; 1234 success = false;
1225 break; 1235 break;
1226 } 1236 }
1227 1237
1228 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1236 1246
1237 XftUnlockFace (f); 1247 XftUnlockFace (f);
1238 1248
1239 int glheight = height; 1249 int glheight = height;
1240 1250
1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1251 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1242 { 1252 {
1243 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1244 1254
1245 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1246 && ch > 0x100 1256 && ch > 0x100
… …
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1412
1403#ifdef HAVE_BG_PIXMAP 1413#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1415
1406 if (term->bgPixmap.pixmap 1416 if (term->bg_pixmap
1407 && (bg == Color_transparent || bg == Color_bg 1417 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1419 {
1410 int src_x = x, src_y = y; 1420 int src_x = x, src_y = y;
1411 1421
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1423 {
1414 src_x += term->window_vt_x; 1424 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1425 src_y += term->window_vt_y;
1416 } 1426 }
1417 1427
1418 if (term->bgPixmap.pmap_width >= src_x + w 1428 if (term->bg_pmap_width >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1429 && term->bg_pmap_height >= src_y + h)
1420 { 1430 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1431 XCopyArea (disp, term->bg_pixmap, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1432 src_x, src_y, w, h, 0, 0);
1423 } 1433 }
1424 else 1434 else
1425 { 1435 {
1426 XGCValues gcv; 1436 XGCValues gcv;
1427 1437
1428 gcv.fill_style = FillTiled; 1438 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1439 gcv.tile = term->bg_pixmap;
1430 gcv.ts_x_origin = -src_x; 1440 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1441 gcv.ts_y_origin = -src_y;
1432 1442
1433 XChangeGC (disp, gc, 1443 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1489 1499
1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1491 (*i)->unref (); 1501 (*i)->unref ();
1492 1502
1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1494 delete *p; 1504 delete [] *p;
1495 1505
1496 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
1497 1507
1498 fonts.clear (); 1508 fonts.clear ();
1499 1509
… …
1609 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1610 1620
1611 push_font (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1612 } 1622 }
1613 else 1623 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1625
1616 desc = end + 1; 1626 desc = end + 1;
1617 } 1627 }
1618 while (*end); 1628 while (*end);
1619 } 1629 }
… …
1775 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1776 fmap.push_back (0); 1786 fmap.push_back (0);
1777 1787
1778 if (!fmap[hi]) 1788 if (!fmap[hi])
1779 { 1789 {
1780 fmap[hi] = (pagemap *)new pagemap; 1790 // we use [1] here because C++ has no separate new and new [] forms,
1791 // and pagemap is char[256], so new incorrectly assumes we want to
1792 // allocate an array of chars instead of a single pagemap.
1793 // we can either cast the resulting pointer to (pagemap *) or
1794 // allocate an array of pagemaps, returning a pointer to the first member
1795 // this is no extra overhead, as new even allocates an array for
1796 // "new pagemap"
1797 fmap[hi] = new pagemap[1];
1781 memset (fmap[hi], 0xff, sizeof (pagemap)); 1798 memset (fmap[hi], 0xff, sizeof (pagemap));
1782 } 1799 }
1783 1800
1784 (*fmap[hi])[unicode & 0xff] = i; 1801 (*fmap[hi])[unicode & 0xff] = i;
1785 } 1802 }

Diff Legend

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