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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.131 by root, Wed Jan 23 06:00:53 2008 UTC vs.
Revision 1.167 by sf-exg, Mon Nov 29 12:33:22 2010 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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 \
…		…
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" },
…		…
216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	220	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217	{	221	{
218	}	222	}
219		223
220	void	224	void
221	rxvt_font::set_name (char *name)	225	rxvt_font::set_name (char *name_)
222	{	226	{
223	if (this->name == name)	227	if (name == name_)
224	return;	228	return;
225		229
226	if (this->name) free (this->name); // let the compiler optimize	230	if (name) free (name); // let the compiler optimize
227	this->name = name;	231	name = name_;
228	}	232	}
229		233
230	void	234	void
231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	235	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232	{	236	{
…		…
236	if (color == Color_bg \|\| color == Color_transparent)	240	if (color == Color_bg \|\| color == Color_transparent)
237	XClearArea (disp, d, x, y, w, h, false);	241	XClearArea (disp, d, x, y, w, h, false);
238	else if (color >= 0)	242	else if (color >= 0)
239	{	243	{
240	#if XFT	244	#if XFT
241	bool done = false;	245	Picture dst;
		246
242	#ifdef HAVE_BG_PIXMAP	247	# ifdef HAVE_BG_PIXMAP
243	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)	248	if (term->bgPixmap.pixmap
244	{	249	&& !term->pix_colors[color].is_opaque ()
245	Picture dst = XftDrawPicture (d);	250	&& ((dst = XftDrawPicture (d))))
246	if (dst != 0)
247	{	251	{
248	XClearArea (disp, d, x, y, w, h, false);	252	XClearArea (disp, d, x, y, w, h, false);
		253
249	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);	254	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);	255	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
251	done = true;
252	}	256	}
253	}	257	else
254	#endif	258	# endif
255	if (!done)
256	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		260
257	#else	261	#else
258	XSetForeground (disp, gc, term->pix_colors[color]);	262	XSetForeground (disp, gc, term->pix_colors[color]);
259	XFillRectangle (disp, d, gc, x, y, w, h);	263	XFillRectangle (disp, d, gc, x, y, w, h);
260	#endif	264	#endif
261	}	265	}
…		…
448		452
449	text_t chrs[2];	453	text_t chrs[2];
450	chrs [1] = NOCHAR;	454	chrs [1] = NOCHAR;
451		455
452	*chrs = cc->c1;	456	*chrs = cc->c1;
453	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	457	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
454	f1->draw (d, x, y, chrs, width, fg, bg);	458	f1->draw (d, x, y, chrs, width, fg, bg);
455		459
456	if (cc->c2 != NOCHAR)	460	if (cc->c2 != NOCHAR)
457	{	461	{
458	bool careful;	462	bool careful;
459		463
460	// prefer font of first character, for no good reasons	464	// prefer font of first character, for no good reasons
461	*chrs = cc->c2;	465	*chrs = cc->c2;
462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	466	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463	? f1	467	? f1
464	: (*fs)[fs->find_font (cc->c2)];	468	: (*fs)[fs->find_font_idx (cc->c2)];
465		469
466	f2->draw (d, x, y, chrs, width, fg, Color_none);	470	f2->draw (d, x, y, chrs, width, fg, Color_none);
467	}	471	}
468	}	472	}
469	#endif	473	#endif
…		…
482		486
483	x += fwidth;	487	x += fwidth;
484	}	488	}
485	}	489	}
486		490
		491	struct rxvt_font_overflow : rxvt_font {
		492	struct rxvt_fontset *fs;
		493
		494	rxvt_font_overflow (rxvt_fontset *fs)
		495	: rxvt_font ()
		496	{
		497	this->fs = fs;
		498	}
		499
		500	rxvt_fontprop properties ()
		501	{
		502	rxvt_fontprop p;
		503
		504	p.width = p.height = 1;
		505	p.ascent = rxvt_fontprop::unset;
		506	p.weight = rxvt_fontprop::medium;
		507	p.slant = rxvt_fontprop::roman;
		508
		509	return p;
		510	}
		511
		512	bool load (const rxvt_fontprop &prop, bool force_prop)
		513	{
		514	width = 1; height = 1;
		515	ascent = 1; descent = 0;
		516
		517	set_name (strdup ("built-in rendition overflow font"));
		518
		519	return true;
		520	}
		521
		522	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		523	{
		524	return false;
		525	}
		526
		527	void draw (rxvt_drawable &d, int x, int y,
		528	const text_t *text, int len,
		529	int fg, int bg)
		530	{
		531	while (len--)
		532	{
		533	int fid = fs->find_font_idx (*text);
		534	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		535	++text;
		536	x += term->fwidth;
		537	}
		538	}
		539	};
		540
487	/////////////////////////////////////////////////////////////////////////////	541	/////////////////////////////////////////////////////////////////////////////
488		542
489	struct rxvt_font_x11 : rxvt_font {	543	struct rxvt_font_x11 : rxvt_font {
490	rxvt_font_x11 () { f = 0; }	544	rxvt_font_x11 () { f = 0; }
491		545
…		…
499		553
500	void draw (rxvt_drawable &d, int x, int y,	554	void draw (rxvt_drawable &d, int x, int y,
501	const text_t *text, int len,	555	const text_t *text, int len,
502	int fg, int bg);	556	int fg, int bg);
503		557
504	bool slow; // wether this is a proportional font or has other funny characteristics	558	bool slow; // whether this is a proportional font or has other funny characteristics
505	XFontStruct *f;	559	XFontStruct *f;
506	bool enc2b, encm;	560	bool enc2b, encm;
507		561
508	char get_property (XFontStruct f, Atom property, const char *repl) const;	562	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);	563	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
…		…
792	return false;	846	return false;
793		847
794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	848	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	849	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796		850
		851	cs = CS_UNKNOWN;
		852
797	if (registry && encoding)	853	if (registry && encoding)
798	{	854	{
799	char charset[64];	855	char charset[64];
800	snprintf (charset, 64, "%s-%s", registry, encoding);	856	snprintf (charset, 64, "%s-%s", registry, encoding);
801		857
802	cs = codeset_from_name (charset);	858	cs = codeset_from_name (charset);
		859
		860	if (cs == CS_UNKNOWN)
		861	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
803	}	862	}
804	else	863
		864	free (registry);
		865	free (encoding);
		866
		867	if (cs == CS_UNKNOWN)
805	{	868	{
806	const char *charset = get_property (f, XA_FONT, 0);	869	const char *charset = get_property (f, XA_FONT, 0);
807		870
808	if (!charset)	871	if (!charset)
809	charset = name;	872	charset = name;
…		…
812	while (*charset)	875	while (*charset)
813	if (*charset++ == '-' && !--count)	876	if (*charset++ == '-' && !--count)
814	break;	877	break;
815		878
816	cs = codeset_from_name (charset);	879	cs = codeset_from_name (charset);
		880	if (cs == CS_UNKNOWN)
		881	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		882	}
		883
		884	if (cs == CS_UNKNOWN)
817	}	885	{
818		886	clear ();
819	free (registry);	887	return false;
820	free (encoding);	888	}
821		889
822	if (cs == CS_UNICODE)	890	if (cs == CS_UNICODE)
823	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	891	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824		892
825	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	893	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
872	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	940	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873		941
874	if (width < g.width) width = g.width;	942	if (width < g.width) width = g.width;
875	}	943	}
876		944
877	if (cs == CS_UNKNOWN)	945	#if 0 // do it per-character
		946	if (prop && width > prop->width)
878	{	947	{
879	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881	clear ();	948	clear ();
882	return false;	949	return false;
883	}	950	}
884
885	#if 0 // do it per-character
886	if (prop && width > prop->width)
887	{
888	clear ();
889	return false;
890	}
891	#endif	951	#endif
892		952
893	return true;	953	return true;
894	}	954	}
895		955
…		…
909	uint32_t ch = FROM_UNICODE (cs, unicode);	969	uint32_t ch = FROM_UNICODE (cs, unicode);
910		970
911	if (ch == NOCHAR)	971	if (ch == NOCHAR)
912	return false;	972	return false;
913		973
914	/* check wether the character exists in _this_ font. horrible. */	974	/* check whether the character exists in _this_ font. horrible. */
915	XCharStruct *xcs;	975	XCharStruct *xcs;
916		976
917	if (encm)	977	if (encm)
918	{	978	{
919	unsigned char byte1 = ch >> 8;	979	unsigned char byte1 = ch >> 8;
…		…
949	return false;	1009	return false;
950		1010
951	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1011	if (!prop \|\| prop->width == rxvt_fontprop::unset)
952	return true;	1012	return true;
953		1013
954	// check wether character overlaps previous/next character	1014	// check whether character overlaps previous/next character
955	int w = xcs->rbearing - xcs->lbearing;	1015	int w = xcs->rbearing - xcs->lbearing;
956	int wcw = max (WCWIDTH (unicode), 1);	1016	int wcw = max (WCWIDTH (unicode), 1);
957		1017
958	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1018	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
959		1019
…		…
1133	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1193	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134		1194
1135	#if 0 // clipping unfortunately destroys our precious double-width-characters	1195	#if 0 // clipping unfortunately destroys our precious double-width-characters
1136	// clip width, we can't do better, or can we?	1196	// clip width, we can't do better, or can we?
1137	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1197	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1198	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139	#endif	1199	#endif
1140		1200
1141	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1201	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142	FcPatternAddBool (p, FC_MINSPACE, 1);	1202	FcPatternAddBool (p, FC_MINSPACE, 1);
1143		1203
…		…
1287	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1347	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288	const text_t *text, int len,	1348	const text_t *text, int len,
1289	int fg, int bg)	1349	int fg, int bg)
1290	{	1350	{
1291	XGlyphInfo extents;	1351	XGlyphInfo extents;
1292	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1352	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293	XftGlyphSpec *ep = enc;	1353	XftGlyphSpec *ep = enc;
1294		1354
1295	dTermDisplay;	1355	dTermDisplay;
1296	dTermGC;	1356	dTermGC;
1297		1357
1298	int w = term->fwidth * len;	1358	int w = term->fwidth * len;
1299	int h = term->fheight;	1359	int h = term->fheight;
1300		1360
1301	/*
1302	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303	* good idea from the perspective of packaging for wide variety of user configs.
1304	*/
1305	bool buffered = bg >= Color_transparent;	1361	bool buffered = bg >= Color_transparent
1306	#ifdef FORCE_UNBUFFERED_XFT	1362	&& term->option (Opt_buffered);
1307	buffered = false;
1308	#endif
1309		1363
1310	// cut trailing spaces	1364	// cut trailing spaces
1311	while (len && text [len - 1] == ' ')	1365	while (len && text [len - 1] == ' ')
1312	len--;	1366	len--;
1313		1367
…		…
1342		1396
1343	if (buffered)	1397	if (buffered)
1344	{	1398	{
1345	if (ep != enc)	1399	if (ep != enc)
1346	{	1400	{
1347	bool back_rendered = false;
1348	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1401	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349		1402
1350	#ifdef HAVE_BG_PIXMAP	1403	#ifdef HAVE_BG_PIXMAP
		1404	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1405
1351	if (term->bgPixmap.pixmap)	1406	if (term->bgPixmap.pixmap
		1407	&& (bg == Color_transparent \|\| bg == Color_bg
		1408	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352	{	1409	{
1353	Picture dst = 0;	1410	int src_x = x, src_y = y;
1354		1411
1355	if (bg >= 0 && term->pix_colors[bg].is_opaque ())	1412	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1356	dst = XftDrawPicture (d2);	1413	{
		1414	src_x += term->window_vt_x;
		1415	src_y += term->window_vt_y;
		1416	}
		1417
		1418	if (term->bgPixmap.pmap_width >= src_x + w
		1419	&& term->bgPixmap.pmap_height >= src_y + h)
		1420	{
		1421	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1422	src_x, src_y, w, h, 0, 0);
		1423	}
		1424	else
		1425	{
		1426	XGCValues gcv;
		1427
		1428	gcv.fill_style = FillTiled;
		1429	gcv.tile = term->bgPixmap.pixmap;
		1430	gcv.ts_x_origin = -src_x;
		1431	gcv.ts_y_origin = -src_y;
		1432
		1433	XChangeGC (disp, gc,
		1434	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1435	&gcv);
		1436
		1437	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1438
		1439	gcv.fill_style = FillSolid;
		1440	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1441	}
1357		1442
1358	if (dst)	1443	if (dst)
1359	{	1444	{
1360	int src_x = x, src_y = y;
1361
1362	if (term->bgPixmap.is_parentOrigin ())
1363	{
1364	src_x += term->window_vt_x;
1365	src_y += term->window_vt_y;
1366	}
1367
1368	if (term->bgPixmap.pmap_width >= src_x+w
1369	&& term->bgPixmap.pmap_height >= src_y+h)
1370	{
1371	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372	src_x, src_y, w, h, 0, 0);
1373	}
1374	else
1375	{
1376	XGCValues gcv;
1377
1378	gcv.fill_style = FillTiled;
1379	gcv.tile = term->bgPixmap.pixmap;
1380	gcv.ts_x_origin = -src_x;
1381	gcv.ts_y_origin = -src_y;
1382
1383	XChangeGC (disp, gc,
1384	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1385	&gcv);
1386
1387	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389	gcv.fill_style = FillSolid;
1390	XChangeGC (disp, gc, GCFillStyle, &gcv);
1391	}
1392
1393	if (bg >= 0)
1394	{
1395	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);	1445	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1446
		1447	// dst can only be set when bg >= 0
1396	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);	1448	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397	}
1398
1399	back_rendered = true;
1400	}	1449	}
1401	}	1450	}
		1451	else
1402	#endif	1452	#endif
1403
1404	if (!back_rendered)
1405	XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);	1453	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1406		1454
1407	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1455	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1456	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409	}	1457	}
1410	else	1458	else
…		…
1438	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1486	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1439	= rxvt_fontprop::unset;	1487	= rxvt_fontprop::unset;
1440	force_prop = false;	1488	force_prop = false;
1441		1489
1442	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1490	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1443	FONT_UNREF (*i);	1491	(*i)->unref ();
1444		1492
1445	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1493	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1446	delete *p;	1494	delete *p;
1447		1495
1448	free (fontdesc); fontdesc = 0;	1496	free (fontdesc); fontdesc = 0;
…		…
1450	fonts.clear ();	1498	fonts.clear ();
1451		1499
1452	fallback = fallback_fonts;	1500	fallback = fallback_fonts;
1453	}	1501	}
1454		1502
		1503	void
		1504	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1505	{
		1506	font->set_term (term);
		1507
		1508	font->cs = cs;
		1509	font->loaded = false;
		1510	}
		1511
1455	rxvt_font *	1512	rxvt_font *
1456	rxvt_fontset::new_font (const char *name, codeset cs)	1513	rxvt_fontset::new_font (const char *name, codeset cs)
1457	{	1514	{
1458	rxvt_font *f;	1515	rxvt_font *f;
1459		1516
…		…
1475	f = new rxvt_font_x11;	1532	f = new rxvt_font_x11;
1476	}	1533	}
1477	else	1534	else
1478	f = new rxvt_font_x11;	1535	f = new rxvt_font_x11;
1479		1536
1480	f->set_term (term);
1481	f->set_name (strdup (name));	1537	f->set_name (strdup (name));
1482		1538	prepare_font (f, cs);
1483	f->cs = cs;
1484	f->loaded = false;
1485		1539
1486	return f;	1540	return f;
1487	}	1541	}
1488		1542
1489	/////////////////////////////////////////////////////////////////////////////	1543	/////////////////////////////////////////////////////////////////////////////
		1544
		1545	void
		1546	rxvt_fontset::push_font (rxvt_font *font)
		1547	{
		1548	// the fontCount index is reserved for the overflow font, it is only
		1549	// necessary when we get fontCount or more fonts, as they cannot be
		1550	// represented in the rendition.
		1551	if (fonts.size () == fontCount)
		1552	{
		1553	rxvt_font *f = new rxvt_font_overflow (this);
		1554
		1555	prepare_font (f, CS_UNICODE);
		1556	fonts.push_back (f);
		1557	}
		1558
		1559	fonts.push_back (font);
		1560	}
1490		1561
1491	void	1562	void
1492	rxvt_fontset::add_fonts (const char *desc)	1563	rxvt_fontset::add_fonts (const char *desc)
1493	{	1564	{
1494	if (desc)	1565	if (desc)
…		…
1535	if (end - desc < 511)	1606	if (end - desc < 511)
1536	{	1607	{
1537	memcpy (buf, desc, end - desc);	1608	memcpy (buf, desc, end - desc);
1538	buf[end - desc] = 0;	1609	buf[end - desc] = 0;
1539		1610
1540	fonts.push_back (new_font (buf, cs));	1611	push_font (new_font (buf, cs));
1541	}	1612	}
1542	else	1613	else
1543	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1614	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1544		1615
1545	desc = end + 1;	1616	desc = end + 1;
…		…
1573	{	1644	{
1574	clear ();	1645	clear ();
1575		1646
1576	fontdesc = strdup (desc);	1647	fontdesc = strdup (desc);
1577		1648
1578	fonts.push_back (new_font (0, CS_UNICODE));	1649	push_font (new_font (0, CS_UNICODE));
1579	realize_font (0);	1650	realize_font (0);
1580		1651
1581	add_fonts (desc);	1652	add_fonts (desc);
1582		1653
1583	return true;	1654	return true;
…		…
1592		1663
1593	return -1;	1664	return -1;
1594	}	1665	}
1595		1666
1596	int	1667	int
1597	rxvt_fontset::find_font (unicode_t unicode)	1668	rxvt_fontset::find_font_idx (unicode_t unicode)
1598	{	1669	{
1599	if (unicode >= 1<<20)	1670	if (unicode >= 1<<20)
1600	return 0;	1671	return 0;
1601		1672
1602	unicode_t hi = unicode >> 8;	1673	unicode_t hi = unicode >> 8;
…		…
1628	goto next_font;	1699	goto next_font;
1629		1700
1630	bool careful;	1701	bool careful;
1631	if (f->has_char (unicode, &prop, careful))	1702	if (f->has_char (unicode, &prop, careful))
1632	{	1703	{
1633	if (careful)	1704	i = (i << 1) \| careful;
1634	i \|= 128;
1635		1705
1636	goto found;	1706	goto found;
1637	}	1707	}
1638		1708
1639	next_font:	1709	next_font:
1640	if (i == fonts.size () - 1)	1710	if (i == fonts.size () - 1)
1641	{	1711	{
1642	if (fallback->name)	1712	if (fallback->name)
1643	{	1713	{
1644	// search through the fallback list	1714	// search through the fallback list
1645	fonts.push_back (new_font (fallback->name, fallback->cs));	1715	push_font (new_font (fallback->name, fallback->cs));
1646	fallback++;	1716	fallback++;
1647	}	1717	}
1648	else	1718	else
1649	{	1719	{
1650	// try to find a new font.	1720	// try to find a new font.
…		…
1681	FcPatternDestroy (match);	1751	FcPatternDestroy (match);
1682		1752
1683	if (find_font (font) < 0)	1753	if (find_font (font) < 0)
1684	{	1754	{
1685	char fontname[4096];	1755	char fontname[4096];
1686	sprintf (fontname, "xft:%-.4090s", font);	1756	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1687		1757
1688	fonts.push_back (new_font (fontname, CS_UNICODE));	1758	push_font (new_font (fontname, CS_UNICODE));
1689	}	1759	}
1690		1760
1691	free (font);	1761	free (font);
1692	}	1762	}
1693	#endif	1763	#endif
…		…
1715	}	1785	}
1716		1786
1717	return i;	1787	return i;
1718	}	1788	}
1719		1789
1720
1721

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.131 by root, Wed Jan 23 06:00:53 2008 UTC vs. Revision 1.167 by sf-exg, Mon Nov 29 12:33:22 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.131 by root, Wed Jan 23 06:00:53 2008 UTC vs.
Revision 1.167 by sf-exg, Mon Nov 29 12:33:22 2010 UTC