[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.147 by ayin, Sat Jan 26 14:26:49 2008 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
40	const struct rxvt_fallback_font {	44	static 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" },
…		…
79		83
80	// japanese	84	// japanese
81	#if ENCODING_JP \|\| ENCODING_JP_EXT	85	#if ENCODING_JP \|\| ENCODING_JP_EXT
82	# if XFT	86	# if XFT
83	// prefer xft for complex scripts	87	// prefer xft for complex scripts
		88	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	89	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	90	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	91	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88	# endif	92	# endif
89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	93	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	94	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
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
…		…
216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	218	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217	{	219	{
218	}	220	}
219		221
220	void	222	void
221	rxvt_font::set_name (char *name)	223	rxvt_font::set_name (char *name_)
222	{	224	{
223	if (this->name == name)	225	if (name == name_)
224	return;	226	return;
225		227
226	if (this->name) free (this->name); // let the compiler optimize	228	if (name) free (name); // let the compiler optimize
227	this->name = name;	229	name = name_;
228	}	230	}
229		231
230	void	232	void
231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	233	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232	{	234	{
…		…
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
		489	struct 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
489	struct rxvt_font_x11 : rxvt_font {	541	struct 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);
…		…
792	return false;	844	return false;
793		845
794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	846	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	847	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796		848
		849	cs = CS_UNKNOWN;
		850
797	if (registry && encoding)	851	if (registry && encoding)
798	{	852	{
799	char charset[64];	853	char charset[64];
800	snprintf (charset, 64, "%s-%s", registry, encoding);	854	snprintf (charset, 64, "%s-%s", registry, encoding);
801		855
802	cs = codeset_from_name (charset);	856	cs = codeset_from_name (charset);
		857
		858	if (cs == CS_UNKNOWN)
		859	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
803	}	860	}
804	else	861
		862	free (registry);
		863	free (encoding);
		864
		865	if (cs == CS_UNKNOWN)
805	{	866	{
806	const char *charset = get_property (f, XA_FONT, 0);	867	const char *charset = get_property (f, XA_FONT, 0);
807		868
808	if (!charset)	869	if (!charset)
809	charset = name;	870	charset = name;
…		…
812	while (*charset)	873	while (*charset)
813	if (*charset++ == '-' && !--count)	874	if (*charset++ == '-' && !--count)
814	break;	875	break;
815		876
816	cs = codeset_from_name (charset);	877	cs = codeset_from_name (charset);
		878	if (cs == CS_UNKNOWN)
		879	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		880	}
		881
		882	if (cs == CS_UNKNOWN)
817	}	883	{
818		884	clear ();
819	free (registry);	885	return false;
820	free (encoding);	886	}
821		887
822	if (cs == CS_UNICODE)	888	if (cs == CS_UNICODE)
823	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	889	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824		890
825	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	891	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
850	}	916	}
851	#endif	917	#endif
852		918
853	width = 1;	919	width = 1;
854		920
855	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; )
856	{	922	{
857	if (FROM_UNICODE (cs, *t) == NOCHAR)	923	if (FROM_UNICODE (cs, *t) == NOCHAR)
858	continue;	924	continue;
859		925
860	// ignore characters we wouldn't use anyways	926	// ignore characters we wouldn't use anyways
…		…
872	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	938	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873		939
874	if (width < g.width) width = g.width;	940	if (width < g.width) width = g.width;
875	}	941	}
876		942
877	if (cs == CS_UNKNOWN)	943	#if 0 // do it per-character
		944	if (prop && width > prop->width)
878	{	945	{
879	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881	clear ();	946	clear ();
882	return false;	947	return false;
883	}	948	}
884
885	#if 0 // do it per-character
886	if (prop && width > prop->width)
887	{
888	clear ();
889	return false;
890	}
891	#endif	949	#endif
892		950
893	return true;	951	return true;
894	}	952	}
895		953
…		…
909	uint32_t ch = FROM_UNICODE (cs, unicode);	967	uint32_t ch = FROM_UNICODE (cs, unicode);
910		968
911	if (ch == NOCHAR)	969	if (ch == NOCHAR)
912	return false;	970	return false;
913		971
914	/* check wether the character exists in _this_ font. horrible. */	972	/* check whether the character exists in _this_ font. horrible. */
915	XCharStruct *xcs;	973	XCharStruct *xcs;
916		974
917	if (encm)	975	if (encm)
918	{	976	{
919	unsigned char byte1 = ch >> 8;	977	unsigned char byte1 = ch >> 8;
…		…
949	return false;	1007	return false;
950		1008
951	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1009	if (!prop \|\| prop->width == rxvt_fontprop::unset)
952	return true;	1010	return true;
953		1011
954	// check wether character overlaps previous/next character	1012	// check whether character overlaps previous/next character
955	int w = xcs->rbearing - xcs->lbearing;	1013	int w = xcs->rbearing - xcs->lbearing;
956	int wcw = max (WCWIDTH (unicode), 1);	1014	int wcw = max (WCWIDTH (unicode), 1);
957		1015
958	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1016	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
959		1017
…		…
1133	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1191	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134		1192
1135	#if 0 // clipping unfortunately destroys our precious double-width-characters	1193	#if 0 // clipping unfortunately destroys our precious double-width-characters
1136	// clip width, we can't do better, or can we?	1194	// clip width, we can't do better, or can we?
1137	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1195	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1196	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139	#endif	1197	#endif
1140		1198
1141	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1199	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142	FcPatternAddBool (p, FC_MINSPACE, 1);	1200	FcPatternAddBool (p, FC_MINSPACE, 1);
1143		1201
…		…
1176		1234
1177	XftUnlockFace (f);	1235	XftUnlockFace (f);
1178		1236
1179	int glheight = height;	1237	int glheight = height;
1180		1238
1181	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; )
1182	{	1240	{
1183	FcChar16 ch = *t;	1241	FcChar16 ch = *t;
1184		1242
1185	if (cs != CS_UNICODE	1243	if (cs != CS_UNICODE
1186	&& ch > 0x100	1244	&& ch > 0x100
…		…
1287	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1345	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288	const text_t *text, int len,	1346	const text_t *text, int len,
1289	int fg, int bg)	1347	int fg, int bg)
1290	{	1348	{
1291	XGlyphInfo extents;	1349	XGlyphInfo extents;
1292	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1350	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293	XftGlyphSpec *ep = enc;	1351	XftGlyphSpec *ep = enc;
1294		1352
1295	dTermDisplay;	1353	dTermDisplay;
1296	dTermGC;	1354	dTermGC;
1297		1355
1298	int w = term->fwidth * len;	1356	int w = term->fwidth * len;
1299	int h = term->fheight;	1357	int h = term->fheight;
1300		1358
1301	bool buffered = bg >= Color_transparent	1359	bool buffered = bg >= Color_transparent
1302	&& term->option (Opt_buffered);	1360	&& term->option (Opt_buffered);
1303		1361
1304	// cut trailing spaces	1362	// cut trailing spaces
1305	while (len && text [len - 1] == ' ')	1363	while (len && text [len - 1] == ' ')
1306	len--;	1364	len--;
1307		1365
…		…
1347	&& (bg == Color_transparent \|\| bg == Color_bg	1405	&& (bg == Color_transparent \|\| bg == Color_bg
1348	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))	1406	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349	{	1407	{
1350	int src_x = x, src_y = y;	1408	int src_x = x, src_y = y;
1351		1409
1352	if (term->bgPixmap.is_parentOrigin ())	1410	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1353	{	1411	{
1354	src_x += term->window_vt_x;	1412	src_x += term->window_vt_x;
1355	src_y += term->window_vt_y;	1413	src_y += term->window_vt_y;
1356	}	1414	}
1357		1415
…		…
1426	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1484	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1427	= rxvt_fontprop::unset;	1485	= rxvt_fontprop::unset;
1428	force_prop = false;	1486	force_prop = false;
1429		1487
1430	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1488	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1431	FONT_UNREF (*i);	1489	(*i)->unref ();
1432		1490
1433	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1491	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1434	delete *p;	1492	delete *p;
1435		1493
1436	free (fontdesc); fontdesc = 0;	1494	free (fontdesc); fontdesc = 0;
…		…
1438	fonts.clear ();	1496	fonts.clear ();
1439		1497
1440	fallback = fallback_fonts;	1498	fallback = fallback_fonts;
1441	}	1499	}
1442		1500
		1501	void
		1502	rxvt_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
1443	rxvt_font *	1510	rxvt_font *
1444	rxvt_fontset::new_font (const char *name, codeset cs)	1511	rxvt_fontset::new_font (const char *name, codeset cs)
1445	{	1512	{
1446	rxvt_font *f;	1513	rxvt_font *f;
1447		1514
…		…
1463	f = new rxvt_font_x11;	1530	f = new rxvt_font_x11;
1464	}	1531	}
1465	else	1532	else
1466	f = new rxvt_font_x11;	1533	f = new rxvt_font_x11;
1467		1534
1468	f->set_term (term);
1469	f->set_name (strdup (name));	1535	f->set_name (strdup (name));
1470		1536	prepare_font (f, cs);
1471	f->cs = cs;
1472	f->loaded = false;
1473		1537
1474	return f;	1538	return f;
1475	}	1539	}
1476		1540
1477	/////////////////////////////////////////////////////////////////////////////	1541	/////////////////////////////////////////////////////////////////////////////
		1542
		1543	void
		1544	rxvt_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	}
1478		1559
1479	void	1560	void
1480	rxvt_fontset::add_fonts (const char *desc)	1561	rxvt_fontset::add_fonts (const char *desc)
1481	{	1562	{
1482	if (desc)	1563	if (desc)
…		…
1523	if (end - desc < 511)	1604	if (end - desc < 511)
1524	{	1605	{
1525	memcpy (buf, desc, end - desc);	1606	memcpy (buf, desc, end - desc);
1526	buf[end - desc] = 0;	1607	buf[end - desc] = 0;
1527		1608
1528	fonts.push_back (new_font (buf, cs));	1609	push_font (new_font (buf, cs));
1529	}	1610	}
1530	else	1611	else
1531	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1612	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1532		1613
1533	desc = end + 1;	1614	desc = end + 1;
…		…
1561	{	1642	{
1562	clear ();	1643	clear ();
1563		1644
1564	fontdesc = strdup (desc);	1645	fontdesc = strdup (desc);
1565		1646
1566	fonts.push_back (new_font (0, CS_UNICODE));	1647	push_font (new_font (0, CS_UNICODE));
1567	realize_font (0);	1648	realize_font (0);
1568		1649
1569	add_fonts (desc);	1650	add_fonts (desc);
1570		1651
1571	return true;	1652	return true;
…		…
1580		1661
1581	return -1;	1662	return -1;
1582	}	1663	}
1583		1664
1584	int	1665	int
1585	rxvt_fontset::find_font (unicode_t unicode)	1666	rxvt_fontset::find_font_idx (unicode_t unicode)
1586	{	1667	{
1587	if (unicode >= 1<<20)	1668	if (unicode >= 1<<20)
1588	return 0;	1669	return 0;
1589		1670
1590	unicode_t hi = unicode >> 8;	1671	unicode_t hi = unicode >> 8;
…		…
1616	goto next_font;	1697	goto next_font;
1617		1698
1618	bool careful;	1699	bool careful;
1619	if (f->has_char (unicode, &prop, careful))	1700	if (f->has_char (unicode, &prop, careful))
1620	{	1701	{
1621	if (careful)	1702	i = (i << 1) \| careful;
1622	i \|= 128;
1623		1703
1624	goto found;	1704	goto found;
1625	}	1705	}
1626		1706
1627	next_font:	1707	next_font:
1628	if (i == fonts.size () - 1)	1708	if (i == fonts.size () - 1)
1629	{	1709	{
1630	if (fallback->name)	1710	if (fallback->name)
1631	{	1711	{
1632	// search through the fallback list	1712	// search through the fallback list
1633	fonts.push_back (new_font (fallback->name, fallback->cs));	1713	push_font (new_font (fallback->name, fallback->cs));
1634	fallback++;	1714	fallback++;
1635	}	1715	}
1636	else	1716	else
1637	{	1717	{
1638	// try to find a new font.	1718	// try to find a new font.
…		…
1669	FcPatternDestroy (match);	1749	FcPatternDestroy (match);
1670		1750
1671	if (find_font (font) < 0)	1751	if (find_font (font) < 0)
1672	{	1752	{
1673	char fontname[4096];	1753	char fontname[4096];
1674	sprintf (fontname, "xft:%-.4090s", font);	1754	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1675		1755
1676	fonts.push_back (new_font (fontname, CS_UNICODE));	1756	push_font (new_font (fontname, CS_UNICODE));
1677	}	1757	}
1678		1758
1679	free (font);	1759	free (font);
1680	}	1760	}
1681	#endif	1761	#endif
…		…
1703	}	1783	}
1704		1784
1705	return i;	1785	return i;
1706	}	1786	}
1707		1787
1708
1709

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.147 by ayin, Sat Jan 26 14:26:49 2008 UTC vs. Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.147 by ayin, Sat Jan 26 14:26:49 2008 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC