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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC

…		…
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
		26	#include <cstdlib>
		27
26	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->Xdisplay
27	#define DRAWABLE r->TermWin.vt	29	#define DRAWABLE r->TermWin.vt
28	#define GC r->TermWin.gc	30	#define GC r->TermWin.gc
29		31
30	const struct rxvt_fallback_font {	32	const struct rxvt_fallback_font {
…		…
57		59
58	// japanese	60	// japanese
59	#if ENCODING_JP \|\| ENCODING_JP_EXT	61	#if ENCODING_JP \|\| ENCODING_JP_EXT
60	# if XFT	62	# if XFT
61	// prefer xft for complex scripts	63	// prefer xft for complex scripts
62	{ CS_UNICODE, "xft:Kochi Gothic" },	64	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63	# endif	65	# endif
64	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	66	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
65	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	67	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },
66	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	68	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
67	#endif	69	#endif
68		70
69	#if ENCODING_CN \|\| ENCODING_CN_EXT	71	#if ENCODING_CN \|\| ENCODING_CN_EXT
70	# if XFT	72	# if XFT
71	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75	# endif	77	# endif
76	{ CS_CNS11643_1992_1, "----r-------c--cns11643.1992-1" },	78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },
77	{ CS_CNS11643_1992_2, "----r-------c--cns11643.1992-2" },	79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },
78	{ CS_CNS11643_1992_3, "----r-------c--cns11643.1992-3" },	80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },
79	{ CS_CNS11643_1992_4, "----r-------c--cns11643.1992-4" },	81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },
80	{ CS_CNS11643_1992_5, "----r-------c--cns11643.1992-5" },	82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },
81	{ CS_CNS11643_1992_6, "----r-------c--cns11643.1992-6" },	83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },
82	{ CS_CNS11643_1992_7, "----r-------c--cns11643.1992-7" },	84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },
83	{ CS_CNS11643_1992_F, "----r-------c--cns11643.1992-f" },	85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },
84	#endif	86	#endif
85		87
86	#if XFT	88	#if XFT
87	{ CS_UNICODE, "xft:Andale Mono" },	89	{ CS_UNICODE, "xft:Andale Mono" },
88	{ CS_UNICODE, "xft:Arial Unicode MS" },	90	{ CS_UNICODE, "xft:Arial Unicode MS" },
89	#endif	91	#endif
90	{ CS_UNICODE, "--lucidatypewriter--r-------m-*-iso10646-1" },	92	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
		93	{ CS_UNICODE, "xft:FreeMono" },
		94	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
		95	{ CS_UNICODE, "----r-------c--iso10646-1" },
91	{ CS_UNICODE, "----r-------m--iso10646-1" },	96	{ CS_UNICODE, "----r-------m--iso10646-1" },
92	{ CS_UNICODE, "----r-------m--iso10646-1" },
93	{ CS_UNICODE, "----r-------m--iso10646-1" },
94		97
95	{ CS_UNKNOWN, 0 }	98	{ CS_UNKNOWN, 0 }
96	};	99	};
97		100
98	/////////////////////////////////////////////////////////////////////////////	101	/////////////////////////////////////////////////////////////////////////////
…		…
220		223
221	// to be done	224	// to be done
222	};	225	};
223		226
224	struct rxvt_font_default : rxvt_font {	227	struct rxvt_font_default : rxvt_font {
225	bool load (int maxheight)	228	rxvt_fontprop properties ()
		229	{
		230	rxvt_fontprop p;
		231
		232	p.height = 1;
		233	p.weight = rxvt_fontprop::medium;
		234	p.slant = rxvt_fontprop::roman;
		235
		236	return p;
		237	}
		238
		239	bool load (const rxvt_fontprop &prop)
226	{	240	{
227	width = 1; height = 1;	241	width = 1; height = 1;
228	ascent = 1; descent = 0;	242	ascent = 1; descent = 0;
229		243
230	return true;	244	return true;
…		…
322	struct rxvt_font_x11 : rxvt_font {	336	struct rxvt_font_x11 : rxvt_font {
323	rxvt_font_x11 () { f = 0; }	337	rxvt_font_x11 () { f = 0; }
324		338
325	void clear ();	339	void clear ();
326		340
327	bool load (int maxheight);	341	rxvt_fontprop properties ();
		342	rxvt_fontprop properties (XFontStruct *f);
		343
		344	bool load (const rxvt_fontprop &prop);
328		345
329	bool has_codepoint (uint32_t unicode);	346	bool has_codepoint (uint32_t unicode);
330		347
331	void draw (int x, int y,	348	void draw (int x, int y,
332	const text_t *text, int len,	349	const text_t *text, int len,
…		…
334		351
335	XFontStruct *f;	352	XFontStruct *f;
336	codeset cs;	353	codeset cs;
337	bool enc2b, encm;	354	bool enc2b, encm;
338		355
339	const char get_property (const char property, const char *repl) const;	356	const char get_property (XFontStruct f, const char property, const char repl) const;
340	};	357	};
341		358
342	const char *	359	const char *
343	rxvt_font_x11::get_property (const char property, const char repl) const	360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
344	{	361	{
345	unsigned long value;	362	unsigned long value;
346		363
347	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	364	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348	return XGetAtomName (DISPLAY, value);	365	return XGetAtomName (DISPLAY, value);
349	else	366	else
350	return repl;	367	return repl;
351	}	368	}
352		369
		370	rxvt_fontprop
		371	rxvt_font_x11::properties ()
		372	{
		373	return properties (f);
		374	}
		375
		376	rxvt_fontprop
		377	rxvt_font_x11::properties (XFontStruct *f)
		378	{
		379	rxvt_fontprop p;
		380
		381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		382	const char *slant = get_property (f, "SLANT", "r");
		383
		384	p.height = height;
		385	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		386	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		387
		388	return p;
		389	}
		390
353	bool	391	bool
354	rxvt_font_x11::load (int maxheight)	392	rxvt_font_x11::load (const rxvt_fontprop &prop)
355	{	393	{
356	clear ();	394	clear ();
		395
		396	char **list;
		397	int count;
		398	XFontStruct *info;
		399	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);
		400
		401	if (!list)
		402	return false;
		403
		404	int bestdiff = 0x7fffffff;
		405	XFontStruct *best = 0;
		406	for (int i = 0; i < count; i++)
		407	{
		408	XFontStruct *f = info + i;
		409
		410	if (f->ascent + f->descent <= prop.height) // weed out too large fonts
		411	{
		412	rxvt_fontprop p = properties (f);
		413	int diff = (prop.height - f->ascent + f->descent) * 32
		414	+ abs (prop.weight - p.weight)
		415	+ abs (prop.slant - p.slant );
		416
		417	if (!best // compare against best found so far
		418	\|\| diff < bestdiff)
		419	{
		420	best = f;
		421	bestdiff = diff;
		422	}
		423	}
		424	}
		425
		426	if (!best)
		427	return false;
		428
		429	set_name (strdup (list[best - info]));
		430
		431	XFreeFontInfo (list, info, count);
357		432
358	f = XLoadQueryFont (DISPLAY, name);	433	f = XLoadQueryFont (DISPLAY, name);
359		434
360	if (!f)	435	if (!f)
361	return false;	436	return false;
362		437
363	unsigned long value;	438	unsigned long value;
364		439
365	const char *registry = get_property ("CHARSET_REGISTRY", 0);	440	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366	const char *encoding = get_property ("CHARSET_ENCODING", 0);	441	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367		442
368	if (registry && encoding)	443	if (registry && encoding)
369	{	444	{
370	char charset[64];	445	char charset[64];
371	snprintf (charset, 64, "%s-%s", registry, encoding);	446	snprintf (charset, 64, "%s-%s", registry, encoding);
372		447
373	cs = codeset_from_name (charset);	448	cs = codeset_from_name (charset);
374	}	449	}
375	else	450	else
376	{	451	{
377	const char *charset = get_property ("FONT", 0);	452	const char *charset = get_property (f, "FONT", 0);
378		453
379	if (!charset)	454	if (!charset)
380	charset = name;	455	charset = name;
381		456
382	int count = 13;	457	int count = 13;
…		…
395		470
396	ascent = f->ascent;	471	ascent = f->ascent;
397	descent = f->descent;	472	descent = f->descent;
398	height = ascent + descent;	473	height = ascent + descent;
399		474
400	prop = false;	475	slow = false;
401		476
402	if (f->min_bounds.width == f->max_bounds.width)	477	if (f->min_bounds.width == f->max_bounds.width)
403	width = f->min_bounds.width;	478	width = f->min_bounds.width;
404	else if (f->per_char == NULL)	479	else if (f->per_char == NULL)
405	width = f->max_bounds.width;	480	width = f->max_bounds.width;
406	else	481	else
407	{	482	{
408	prop = true;	483	slow = true;
409		484
410	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	485	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411		486
412	if (encm)	487	if (encm)
413	N += (f->max_byte1 - f->min_byte1)	488	N += (f->max_byte1 - f->min_byte1)
…		…
498	// this looks like a mess /.	573	// this looks like a mess /.
499	// and it is a mess /.	574	// and it is a mess /.
500	// yet we are trying to be perfect /.	575	// yet we are trying to be perfect /.
501	// but the result still isn't perfect /.	576	// but the result still isn't perfect /.
502		577
503	bool slow = prop	578	bool slow = this->slow
504	\|\| width != r->TermWin.fwidth	579	\|\| width != r->TermWin.fwidth
505	\|\| height != r->TermWin.fheight;	580	\|\| height != r->TermWin.fheight;
506		581
507	int base = r->TermWin.fbase;	582	int base = r->TermWin.fbase;
508		583
…		…
613	#endif	688	#endif
614	rxvt_font_xft () { f = 0; d = 0; }	689	rxvt_font_xft () { f = 0; d = 0; }
615		690
616	void clear ();	691	void clear ();
617		692
618	bool load (int maxheight);	693	rxvt_fontprop properties ();
		694
		695	bool load (const rxvt_fontprop &prop);
619		696
620	void draw (int x, int y,	697	void draw (int x, int y,
621	const text_t *text, int len,	698	const text_t *text, int len,
622	int fg, int bg);	699	int fg, int bg);
623		700
…		…
655	for (int i = 0; i < SWATHCOUNT; i++)	732	for (int i = 0; i < SWATHCOUNT; i++)
656	delete cvr[i];	733	delete cvr[i];
657	#endif	734	#endif
658	}	735	}
659		736
		737	rxvt_fontprop
		738	rxvt_font_xft::properties ()
		739	{
		740	rxvt_fontprop p;
		741
		742	FT_Face face = XftLockFace (f);
		743
		744	p.height = height;
		745	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		746	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		747
		748	XftUnlockFace (f);
		749
		750	return p;
		751	}
		752
660	bool	753	bool
661	rxvt_font_xft::load (int maxheight)	754	rxvt_font_xft::load (const rxvt_fontprop &prop)
662	{	755	{
663	#if 0	756	#if 0
664	for (int i = 0; i < SWATHCOUNT; i++)	757	for (int i = 0; i < SWATHCOUNT; i++)
665	cvr[i] = 0;	758	cvr[i] = 0;
666	#endif	759	#endif
667		760
668	clear ();	761	clear ();
669		762
670	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	763	FcPattern p = FcNameParse ((FcChar8 ) name);
		764
		765	if (!p)
		766	return false;
		767
		768	FcValue v;
		769
		770	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		771	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		772
		773	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		774	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		775
		776	//FcPatternAddBool (p, FC_MINSPACE, 1);
		777
		778	XftResult result;
		779	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		780
		781	FcPatternDestroy (p);
		782
		783	if (!match)
		784	return false;
		785
		786	f = XftFontOpenPattern (DISPLAY, match);
671		787
672	if (!f)	788	if (!f)
		789	{
		790	FcPatternDestroy (match);
673	return false;	791	return false;
		792	}
674		793
675	FT_Face face = XftLockFace (f);	794	FT_Face face = XftLockFace (f);
676		795
677	prop = !FT_IS_FIXED_WIDTH (face);	796	slow = !FT_IS_FIXED_WIDTH (face);
678		797
679	int ftheight = 0;	798	int ftheight = 0;
680		799
681	for (;;)	800	for (;;)
682	{	801	{
…		…
684	FcChar8 c;	803	FcChar8 c;
685		804
686	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	805	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	806	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688		807
689	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	808	if (g1.xOff != g2.xOff) // don't simply trust the font
		809	slow = true;
690		810
691	width = g2.xOff;	811	width = g2.xOff;
692	ascent = (face->size->metrics.ascender + 63) >> 6;	812	ascent = (face->size->metrics.ascender + 63) >> 6;
693	descent = (-face->size->metrics.descender + 63) >> 6;	813	descent = (-face->size->metrics.descender + 63) >> 6;
694	height = ascent + descent;	814	height = ascent + descent;
695		815
696	if (height <= maxheight \|\| !maxheight)	816	if (height <= prop.height \|\| !prop.height)
697	break;	817	break;
698		818
699	if (ftheight)	819	if (ftheight)
700	{	820	{
701	// take smaller steps near the end	821	// take smaller steps near the end
702	if (height > maxheight + 1) ftheight++;	822	if (height > prop.height + 1) ftheight++;
703	if (height > maxheight + 2) ftheight++;	823	if (height > prop.height + 2) ftheight++;
704	if (height > maxheight + 3) ftheight++;	824	if (height > prop.height + 3) ftheight++;
705		825
706	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	826	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707	}	827	}
708	else	828	else
709	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	829	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710	}	830	}
711		831
712	XftUnlockFace (f);	832	XftUnlockFace (f);
713		833
714	return true;	834	return true;
…		…
746	if (bg >= 0 && bg != Color_bg)	866	if (bg >= 0 && bg != Color_bg)
747	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);	867	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
748	else	868	else
749	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	869	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750		870
751	if (!prop && width == r->TermWin.fwidth)	871	if (!slow && width == r->TermWin.fwidth)
752	{	872	{
753	if (sizeof (text_t) == sizeof (FcChar16))	873	if (sizeof (text_t) == sizeof (FcChar16))
754	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	874	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755	else	875	else
756	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	876	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
796	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	916	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
797	FONT_UNREF (*i);	917	FONT_UNREF (*i);
798		918
799	fonts.clear ();	919	fonts.clear ();
800	base_id = 0;	920	base_id = 0;
801	height = 0x7fffffff;	921	base_prop.height = 0x7fffffff;
		922	base_prop.weight = rxvt_fontprop::medium;
		923	base_prop.slant = rxvt_fontprop::roman;
802		924
803	fallback = fallback_fonts;	925	fallback = fallback_fonts;
804	}	926	}
805		927
806	rxvt_font *	928	rxvt_font *
…		…
891	rxvt_fontset::realize_font (int i)	1013	rxvt_fontset::realize_font (int i)
892	{	1014	{
893	if (fonts[i]->loaded)	1015	if (fonts[i]->loaded)
894	return true;	1016	return true;
895		1017
896	if (fonts[i]->load (height))
897	return fonts[i]->loaded = true;	1018	fonts[i]->loaded = true;
898		1019
899	delete fonts[i];	1020	if (!fonts[i]->load (base_prop))
900	fonts.erase (fonts.begin () + i);	1021	{
901		1022	fonts[i]->cs = CS_UNKNOWN;
902	return false;	1023	return false;
		1024	}
		1025
		1026	return true;
903	}	1027	}
904		1028
905	void	1029	void
906	rxvt_fontset::populate (const char *desc)	1030	rxvt_fontset::populate (const char *desc)
907	{	1031	{
…		…
914		1038
915	if (!base_id)	1039	if (!base_id)
916	base_id = 1;	1040	base_id = 1;
917		1041
918	// we currently need a base-font, no matter what	1042	// we currently need a base-font, no matter what
919	if (fonts.size () <= base_id)	1043	if (fonts.size () <= base_id \|\| !realize_font (base_id))
920	{	1044	{
921	add_fonts ("fixed");	1045	add_fonts ("fixed");
922	base_id = 1;	1046	base_id = fonts.size () - 1;
923	}	1047	}
924		1048
925	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1049	if (fonts.size () <= base_id \|\| !realize_font (base_id))
926	{	1050	{
927	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");	1051	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
928	exit (1);	1052	exit (1);
929	}	1053	}
930		1054
931	height = fonts[base_id]->height;	1055	base_prop = fonts[base_id]->properties ();
932
933	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/
934	}	1056	}
935		1057
936	int	1058	int
937	rxvt_fontset::find_font (uint32_t unicode)	1059	rxvt_fontset::find_font (uint32_t unicode)
938	{	1060	{
…		…
944	{	1066	{
945	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1067	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
946	goto next_font;	1068	goto next_font;
947		1069
948	if (!realize_font (i))	1070	if (!realize_font (i))
949	{
950	--i;
951	goto next_font;	1071	goto next_font;
952	}	1072	}
953		1073
954	//printf ("added font %s for %04lx\n", f->name, unicode);
955	}
956
957	if (f->has_codepoint (unicode))	1074	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
958	return i;	1075	return i;
959		1076
960	next_font:	1077	next_font:
961	if (i == fonts.size () - 1 && fallback->name)	1078	if (i == fonts.size () - 1 && fallback->name)
962	{	1079	{
963	fonts.push_back (new_font (fallback->name, fallback->cs));	1080	fonts.push_back (new_font (fallback->name, fallback->cs));
964	fallback++;	1081	fallback++;
		1082	i = 0;
965	}	1083	}
966	}	1084	}
967		1085
968	return 0; /* we must return SOME font */	1086	return 0; /* we must return SOME font */
969	}	1087	}

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs. Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC