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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.157 by root, Tue Mar 30 23:38:02 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
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	24	#include "rxvtutil.h"
26	#include "rxvtfont.h"	25	#include "rxvtfont.h"
27		26
28	#include <cstdlib>	27	#include <cstdlib>
29		28
…		…
80		79
81	// japanese	80	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	82	# if XFT
84	// prefer xft for complex scripts	83	// prefer xft for complex scripts
		84	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	88	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	217	{
219	}	218	}
220		219
221	void	220	void
222	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
223	{	222	{
224	if (this->name == name)	223	if (name == name_)
225	return;	224	return;
226		225
227	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
228	this->name = name;	227	name = name_;
229	}	228	}
230		229
231	void	230	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	232	{
…		…
237	if (color == Color_bg \|\| color == Color_transparent)	236	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
239	else if (color >= 0)	238	else if (color >= 0)
240	{	239	{
241	#if XFT	240	#if XFT
242	bool done = false;	241	Picture dst;
		242
243	#ifdef HAVE_BG_PIXMAP	243	# ifdef HAVE_BG_PIXMAP
244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)	244	if (term->bgPixmap.pixmap
245	{	245	&& !term->pix_colors[color].is_opaque ()
246	Picture dst = XftDrawPicture (d);	246	&& ((dst = XftDrawPicture (d))))
247	if (dst != 0)
248	{	247	{
249	XClearArea (disp, d, x, y, w, h, false);	248	XClearArea (disp, d, x, y, w, h, false);
		249
250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);	250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);	251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252	done = true;
253	}	252	}
254	}	253	else
255	#endif	254	# endif
256	if (!done)
257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
258	#else	257	#else
259	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
260	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
261	#endif	260	#endif
262	}	261	}
…		…
306	return false;	305	return false;
307		306
308	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
309	return true;	308	return true;
310		309
		310	#ifdef BUILTIN_GLYPHS
311	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
312	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
313	return true;	313	return true;
		314	#endif
314		315
315	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
316	return true;	317	return true;
317		318
318	switch (unicode)	319	switch (unicode)
…		…
447		448
448	text_t chrs[2];	449	text_t chrs[2];
449	chrs [1] = NOCHAR;	450	chrs [1] = NOCHAR;
450		451
451	*chrs = cc->c1;	452	*chrs = cc->c1;
452	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	453	rxvt_font *f1 = fs->get (cc->c1);
453	f1->draw (d, x, y, chrs, width, fg, bg);	454	f1->draw (d, x, y, chrs, width, fg, bg);
454		455
455	if (cc->c2 != NOCHAR)	456	if (cc->c2 != NOCHAR)
456	{	457	{
457	bool careful;	458	bool careful;
458		459
459	// prefer font of first character, for no good reasons	460	// prefer font of first character, for no good reasons
460	*chrs = cc->c2;	461	*chrs = cc->c2;
461	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
462	? f1	463	? f1
463	: (*fs)[fs->find_font (cc->c2)];	464	: fs->get (cc->c2);
464		465
465	f2->draw (d, x, y, chrs, width, fg, Color_none);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
466	}	467	}
467	}	468	}
468	#endif	469	#endif
…		…
608	return false;	609	return false;
609	}	610	}
610		611
611	// fix the size of scalable fonts	612	// fix the size of scalable fonts
612	static bool	613	static bool
613	replace_field (char buf, const char name, int index, const char old, const char *replace)	614	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
614	{	615	{
615	int slashes = 0;	616	int slashes = 0;
616	const char field, end;	617	const char field, end;
617		618
618	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
628	break;	629	break;
629	}	630	}
630		631
631	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
632	{	633	{
633	// TODO: check for overflow in font-name	634	size_t len = field - name;
634	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	636	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
637	strcat (buf, end);	638	strcat (*ptr, end);
638		639
639	return true;	640	return true;
640	}	641	}
641	else	642	else
642	{	643	{
643	strcpy (buf, name);	644	*ptr = strdup (name);
644		645
645	return false;	646	return false;
646	}	647	}
647	}	648	}
648		649
…		…
656	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
657		658
658	// first morph the font if required	659	// first morph the font if required
659	if (force_prop)	660	if (force_prop)
660	{	661	{
661	char fname[1024];	662	char *fname;
662		663
663	if (name[0] != '-')	664	if (name[0] != '-')
664	{	665	{
665	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
666		667
…		…
678	f = 0;	679	f = 0;
679	}	680	}
680		681
681	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
682	{	683	{
683	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
684	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
685	? "medium" : "bold");	686	? "medium" : "bold");
686	set_name (strdup (fname));	687	set_name (fname);
687	}	688	}
688		689
689	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
690	{	691	{
691	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
692	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
693	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
694	set_name (strdup (fname));	695	set_name (fname);
695	}	696	}
696	}	697	}
697		698
698	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699	? 0 : prop.height);	700	? 0 : prop.height);
…		…
724	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
725		726
726	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
727	{	728	{
728	rxvt_fontprop p;	729	rxvt_fontprop p;
729	char fname[1024];	730	char *fname;
730		731
731	int diff = 0;	732	int diff = 0;
732		733
733	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
734	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
735	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
736	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
737		742
738	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
739	continue;	744	continue;
740		745
741	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
745	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	750	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
746	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	751	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
747	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	752	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	753	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749		754
750	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
751	fonts[i].diff = diff;	756	fonts[i].diff = diff;
752	}	757	}
753		758
754	XFreeFontNames (list);	759	XFreeFontNames (list);
755		760
…		…
787	return false;	792	return false;
788		793
789	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791		796
		797	cs = CS_UNKNOWN;
		798
792	if (registry && encoding)	799	if (registry && encoding)
793	{	800	{
794	char charset[64];	801	char charset[64];
795	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
796		803
797	cs = codeset_from_name (charset);	804	cs = codeset_from_name (charset);
		805
		806	if (cs == CS_UNKNOWN)
		807	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
798	}	808	}
799	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
800	{	814	{
801	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
802		816
803	if (!charset)	817	if (!charset)
804	charset = name;	818	charset = name;
…		…
807	while (*charset)	821	while (*charset)
808	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
809	break;	823	break;
810		824
811	cs = codeset_from_name (charset);	825	cs = codeset_from_name (charset);
		826	if (cs == CS_UNKNOWN)
		827	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		828	}
		829
		830	if (cs == CS_UNKNOWN)
812	}	831	{
813		832	clear ();
814	free (registry);	833	return false;
815	free (encoding);	834	}
816		835
817	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
818	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	837	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819		838
820	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
865		884
866	int wcw = WCWIDTH (*t);	885	int wcw = WCWIDTH (*t);
867	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		887
869	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
870	}
871
872	if (cs == CS_UNKNOWN)
873	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875
876	clear ();
877	return false;
878	}	889	}
879		890
880	#if 0 // do it per-character	891	#if 0 // do it per-character
881	if (prop && width > prop->width)	892	if (prop && width > prop->width)
882	{	893	{
…		…
1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129		1140
1130	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1131	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134	#endif	1145	#endif
1135		1146
1136	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1138		1149
…		…
1282	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1283	const text_t *text, int len,	1294	const text_t *text, int len,
1284	int fg, int bg)	1295	int fg, int bg)
1285	{	1296	{
1286	XGlyphInfo extents;	1297	XGlyphInfo extents;
1287	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1288	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1289		1300
1290	dTermDisplay;	1301	dTermDisplay;
1291	dTermGC;	1302	dTermGC;
1292		1303
1293	int w = term->fwidth * len;	1304	int w = term->fwidth * len;
1294	int h = term->fheight;	1305	int h = term->fheight;
1295		1306
1296	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.	1307	bool buffered = bg >= Color_transparent
1297	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a	1308	&& term->option (Opt_buffered);
1298	* good idea from the perspective of packaging for wide variety of user configs.	1309
1299	*/
1300	bool buffered = true
1301	#ifdef FORCE_UNBUFFERED_XFT
1302	&& bg >= 0
1303	#endif
1304	;
1305	// cut trailing spaces	1310	// cut trailing spaces
1306	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1307	len--;	1312	len--;
1308		1313
1309	int x_ = buffered ? 0 : x;	1314	int x_ = buffered ? 0 : x;
…		…
1335	x_ += cwidth;	1340	x_ += cwidth;
1336	}	1341	}
1337		1342
1338	if (buffered)	1343	if (buffered)
1339	{	1344	{
1340	bool back_rendered = false;
1341	if (ep != enc)	1345	if (ep != enc)
1342	{	1346	{
1343	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344		1348
1345	#ifdef HAVE_BG_PIXMAP	1349	#ifdef HAVE_BG_PIXMAP
		1350	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1351
1346	if (term->bgPixmap.pixmap)	1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347	{	1355	{
1348	Picture dst = 0;	1356	int src_x = x, src_y = y;
1349		1357
1350	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)	1358	if (term->bgPixmap.is_parentOrigin ())
1351	dst = XftDrawPicture (d2);
1352
1353	if (bg < 0 \|\| dst != 0)
1354	{	1359	{
1355	int src_x = x, src_y = y ;
1356
1357	if (term->bgPixmap.is_parentOrigin ())
1358	{
1359	src_x += term->window_vt_x;	1360	src_x += term->window_vt_x;
1360	src_y += term->window_vt_y;	1361	src_y += term->window_vt_y;
1361	}	1362	}
1362		1363
1363	if (term->bgPixmap.pmap_width >= src_x+w	1364	if (term->bgPixmap.pmap_width >= src_x + w
1364	&& term->bgPixmap.pmap_height >= src_y+h)	1365	&& term->bgPixmap.pmap_height >= src_y + h)
1365	{	1366	{
1366	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,	1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1367	src_x, src_y, w, h, 0, 0);	1368	src_x, src_y, w, h, 0, 0);
1368	}	1369	}
1369	else	1370	else
1370	{	1371	{
1371	XGCValues gcv;	1372	XGCValues gcv;
1372		1373
1373	gcv.fill_style = FillTiled;	1374	gcv.fill_style = FillTiled;
1374	gcv.tile = term->bgPixmap.pixmap;	1375	gcv.tile = term->bgPixmap.pixmap;
1375	gcv.ts_x_origin = -src_x;	1376	gcv.ts_x_origin = -src_x;
1376	gcv.ts_y_origin = -src_y;	1377	gcv.ts_y_origin = -src_y;
1377		1378
1378	XChangeGC (disp, gc,	1379	XChangeGC (disp, gc,
1379	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1380	&gcv);	1381	&gcv);
1381		1382
1382	XFillRectangle (disp, d2, gc, 0, 0, w, h);	1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383		1384
1384	gcv.fill_style = FillSolid;	1385	gcv.fill_style = FillSolid;
1385	XChangeGC (disp, gc, GCFillStyle, &gcv);	1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
1386	}	1387	}
1387		1388
1388	if (bg >= 0)	1389	if (dst)
1389	{	1390	{
1390	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);	1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
		1393	// dst can only be set when bg >= 0
1391	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);	1394	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392	}
1393
1394	back_rendered = true;
1395	}	1395	}
1396	}	1396	}
		1397	else
1397	#endif	1398	#endif
1398
1399	if (bg >= 0 && !back_rendered)
1400	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1399	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1401		1400
1402	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1401	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1402	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404	}	1403	}
1405	else	1404	else
…		…
1527	if (!end)	1526	if (!end)
1528	end = desc + strlen (desc);	1527	end = desc + strlen (desc);
1529		1528
1530	if (end - desc < 511)	1529	if (end - desc < 511)
1531	{	1530	{
1532	strncpy (buf, desc, end - desc);	1531	memcpy (buf, desc, end - desc);
1533	buf[end - desc] = 0;	1532	buf[end - desc] = 0;
1534		1533
1535	fonts.push_back (new_font (buf, cs));	1534	fonts.push_back (new_font (buf, cs));
1536	}	1535	}
1537	else	1536	else
…		…
1587		1586
1588	return -1;	1587	return -1;
1589	}	1588	}
1590		1589
1591	int	1590	int
1592	rxvt_fontset::find_font (unicode_t unicode)	1591	rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1593	{	1592	{
1594	if (unicode >= 1<<20)	1593	if (unicode >= 1<<20)
1595	return 0;	1594	return 0;
1596		1595
1597	unicode_t hi = unicode >> 8;	1596	unicode_t hi = unicode >> 8;
1598		1597
1599	if (hi < fmap.size ()	1598	if (hi < fmap.size () && fmap[hi])
1600	&& fmap[hi]	1599	{
1601	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1600	unsigned char m = (*fmap[hi])[unicode & 0xff];
1602	return (*fmap[hi])[unicode & 0xff];	1601
		1602	if (m != 0xff)
		1603	{
		1604	careful = m & 128;
		1605	return m & 127;
		1606	}
		1607	}
1603		1608
1604	unsigned int i;	1609	unsigned int i;
1605		1610
1606	for (i = 0; i < fonts.size (); i++)	1611	for (i = 0; i < fonts.size (); i++)
1607	{	1612	{
…		…
1620	}	1625	}
1621		1626
1622	if (f->cs == CS_UNKNOWN)	1627	if (f->cs == CS_UNKNOWN)
1623	goto next_font;	1628	goto next_font;
1624		1629
1625	bool careful;
1626	if (f->has_char (unicode, &prop, careful))	1630	if (f->has_char (unicode, &prop, careful))
1627	{
1628	if (careful)
1629	i \|= 128;
1630
1631	goto found;	1631	goto found;
1632	}
1633		1632
1634	next_font:	1633	next_font:
1635	if (i == fonts.size () - 1)	1634	if (i == fonts.size () - 1)
1636	{	1635	{
1637	if (fallback->name)	1636	if (fallback->name)
…		…
1676	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1677		1676
1678	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1679	{	1678	{
1680	char fontname[4096];	1679	char fontname[4096];
1681	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1682		1681
1683	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1684	}	1683	}
1685		1684
1686	free (font);	1685	free (font);
…		…
1690	}	1689	}
1691	}	1690	}
1692		1691
1693	/* we must return SOME font */	1692	/* we must return SOME font */
1694	i = 0;	1693	i = 0;
		1694	careful = false;
1695		1695
1696	found:	1696	found:
1697	// found a font, cache it	1697	// found a font, cache it
1698	if (i < 255)	1698	if (i < 127)
1699	{	1699	{
1700	while (hi >= fmap.size ())	1700	while (hi >= fmap.size ())
1701	fmap.push_back (0);	1701	fmap.push_back (0);
1702		1702
1703	if (!fmap[hi])	1703	if (!fmap[hi])
1704	{	1704	{
1705	fmap[hi] = (pagemap *)new pagemap;	1705	fmap[hi] = (pagemap *)new pagemap;
1706	memset (fmap[hi], 0xff, sizeof (pagemap));	1706	memset (fmap[hi], 0xff, sizeof (pagemap));
1707	}	1707	}
1708		1708
1709	(*fmap[hi])[unicode & 0xff] = i;	1709	(*fmap[hi])[unicode & 0xff] = i \| (careful ? 128 : 0);
1710	}	1710	}
1711		1711
1712	return i;	1712	return i;
1713	}	1713	}
1714		1714
		1715	int
		1716	rxvt_fontset::find_font (unicode_t unicode)
		1717	{
		1718	bool careful;
		1719	int id = find_font_idx (unicode, careful);
1715		1720
		1721	return min<int> (fontCount, id) \| (careful ? Careful : 0);
		1722	}
1716		1723

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs. Revision 1.157 by root, Tue Mar 30 23:38:02 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.157 by root, Tue Mar 30 23:38:02 2010 UTC