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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.3 by pcg, Thu Nov 27 20:09:00 2003 UTC vs.
Revision 1.10 by pcg, Wed Dec 24 09:07:01 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.width = 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;
…		…
270		284
271	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
272	{	286	{
273	const char *p = linedraw_cmds[t - 0x2500];	287	const char *p = linedraw_cmds[t - 0x2500];
274		288
275	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;	289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;
276	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;	290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;
277		291
278	XGCValues gcv;	292	XGCValues gcv;
279
280	gcv.cap_style = CapButt;
281	XChangeGC (DISPLAY, GC, GCCapStyle, &gcv);
282		293
283	while (*p)	294	while (*p)
284	{	295	{
285	switch (*p++)	296	switch (*p++)
286	{	297	{
…		…
325	struct rxvt_font_x11 : rxvt_font {	336	struct rxvt_font_x11 : rxvt_font {
326	rxvt_font_x11 () { f = 0; }	337	rxvt_font_x11 () { f = 0; }
327		338
328	void clear ();	339	void clear ();
329		340
330	bool load (int maxheight);	341	rxvt_fontprop properties ();
		342	rxvt_fontprop properties (XFontStruct *f);
		343
		344	bool load (const rxvt_fontprop &prop);
331		345
332	bool has_codepoint (uint32_t unicode);	346	bool has_codepoint (uint32_t unicode);
333		347
334	void draw (int x, int y,	348	void draw (int x, int y,
335	const text_t *text, int len,	349	const text_t *text, int len,
…		…
337		351
338	XFontStruct *f;	352	XFontStruct *f;
339	codeset cs;	353	codeset cs;
340	bool enc2b, encm;	354	bool enc2b, encm;
341		355
342	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;
343	};	357	};
344		358
345	const char *	359	const char *
346	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
347	{	361	{
348	unsigned long value;	362	unsigned long value;
349		363
350	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	364	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
351	return XGetAtomName (DISPLAY, value);	365	return XGetAtomName (DISPLAY, value);
352	else	366	else
353	return repl;	367	return repl;
354	}	368	}
355		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	unsigned long avgwidth;
		385	p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)
		386	? avgwidth / 10
		387	: (height + 1) / 2;
		388	p.height = height;
		389	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		390	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		391
		392	return p;
		393	}
		394
356	bool	395	bool
357	rxvt_font_x11::load (int maxheight)	396	rxvt_font_x11::load (const rxvt_fontprop &prop)
358	{	397	{
359	clear ();	398	clear ();
		399
		400	char **list;
		401	int count;
		402	XFontStruct *info;
		403	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);
		404
		405	if (!list)
		406	return false;
		407
		408	int bestdiff = 0x7fffffff;
		409	XFontStruct *best = 0;
		410	for (int i = 0; i < count; i++)
		411	{
		412	XFontStruct *f = info + i;
		413
		414	if (f->ascent + f->descent <= prop.height) // weed out too large fonts
		415	{
		416	rxvt_fontprop p = properties (f);
		417	int diff = (prop.height - f->ascent + f->descent) * 32
		418	+ abs (prop.weight - p.weight)
		419	+ abs (prop.slant - p.slant );
		420
		421	if (!best // compare against best found so far
		422	\|\| diff < bestdiff)
		423	{
		424	best = f;
		425	bestdiff = diff;
		426	}
		427	}
		428	}
		429
		430	if (!best)
		431	return false;
		432
		433	set_name (strdup (list[best - info]));
		434
		435	XFreeFontInfo (list, info, count);
360		436
361	f = XLoadQueryFont (DISPLAY, name);	437	f = XLoadQueryFont (DISPLAY, name);
362		438
363	if (!f)	439	if (!f)
364	return false;	440	return false;
365		441
366	unsigned long value;	442	unsigned long value;
367		443
368	const char *registry = get_property ("CHARSET_REGISTRY", 0);	444	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
369	const char *encoding = get_property ("CHARSET_ENCODING", 0);	445	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
370		446
371	if (registry && encoding)	447	if (registry && encoding)
372	{	448	{
373	char charset[64];	449	char charset[64];
374	snprintf (charset, 64, "%s-%s", registry, encoding);	450	snprintf (charset, 64, "%s-%s", registry, encoding);
375		451
376	cs = codeset_from_name (charset);	452	cs = codeset_from_name (charset);
377	}	453	}
378	else	454	else
379	{	455	{
380	const char *charset = get_property ("FONT", 0);	456	const char *charset = get_property (f, "FONT", 0);
381		457
382	if (!charset)	458	if (!charset)
383	charset = name;	459	charset = name;
384		460
385	int count = 13;	461	int count = 13;
…		…
398		474
399	ascent = f->ascent;	475	ascent = f->ascent;
400	descent = f->descent;	476	descent = f->descent;
401	height = ascent + descent;	477	height = ascent + descent;
402		478
403	prop = false;	479	slow = false;
404		480
405	if (f->min_bounds.width == f->max_bounds.width)	481	if (f->min_bounds.width == f->max_bounds.width)
406	width = f->min_bounds.width;	482	width = f->min_bounds.width;
407	else if (f->per_char == NULL)	483	else if (f->per_char == NULL)
408	width = f->max_bounds.width;	484	width = f->max_bounds.width;
409	else	485	else
410	{	486	{
411	prop = true;	487	slow = true;
412		488
413	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	489	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
414		490
415	if (encm)	491	if (encm)
416	N += (f->max_byte1 - f->min_byte1)	492	N += (f->max_byte1 - f->min_byte1)
…		…
501	// this looks like a mess /.	577	// this looks like a mess /.
502	// and it is a mess /.	578	// and it is a mess /.
503	// yet we are trying to be perfect /.	579	// yet we are trying to be perfect /.
504	// but the result still isn't perfect /.	580	// but the result still isn't perfect /.
505		581
506	bool slow = prop	582	bool slow = this->slow
507	\|\| width != r->TermWin.fwidth	583	\|\| width != r->TermWin.fwidth
508	\|\| height != r->TermWin.fheight;	584	\|\| height != r->TermWin.fheight;
509		585
510	int base = r->TermWin.fbase;	586	int base = r->TermWin.fbase;
511		587
…		…
586	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	662	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
587	#define SWATHBITS 8	663	#define SWATHBITS 8
588	#endif	664	#endif
589		665
590	struct rxvt_font_xft : rxvt_font {	666	struct rxvt_font_xft : rxvt_font {
591	#if 0
592	enum {
593	SWATHCOUNT = 1 << (21 - UNIBITS),
594	SWATHSIZE = 1 << (SWATHBITS - 5)
595	};
596	typedef uint32_t swath[SWATHSIZE];
597
598	swath *cvr[SWATHCOUNT];
599	#endif
600
601	#if 0
602	void gen_coverage_swath (unsigned int page);
603
604	bool has_char (uint32_t ch)
605	{
606	unsigned int page = ch >> SWATHBITS;
607	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
608
609	if (page >= SWATHCOUNT)
610	return false;
611
612	if (!cvr[page]) gen_coverage_swath (page);
613
614	return cvr[page][idx >> 5] & (1 << (idx & 31));
615	}
616	#endif
617	rxvt_font_xft () { f = 0; d = 0; }	667	rxvt_font_xft () { f = 0; d = 0; }
618		668
619	void clear ();	669	void clear ();
620		670
621	bool load (int maxheight);	671	rxvt_fontprop properties ();
		672
		673	bool load (const rxvt_fontprop &prop);
622		674
623	void draw (int x, int y,	675	void draw (int x, int y,
624	const text_t *text, int len,	676	const text_t *text, int len,
625	int fg, int bg);	677	int fg, int bg);
626		678
627	bool has_codepoint (uint32_t unicode);	679	bool has_codepoint (uint32_t unicode);
628		680
629	protected:	681	protected:
630	XftFont *f;	682	XftFont *f;
631	XftDraw *d;	683	XftDraw *d;
632
633	#if 0
634	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
635	void set_swath (uint32_t ch)
636	{
637	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
638	}
639	#endif
640	};	684	};
641		685
642	void	686	void
643	rxvt_font_xft::clear ()	687	rxvt_font_xft::clear ()
644	{	688	{
…		…
651	if (d)	695	if (d)
652	{	696	{
653	XftDrawDestroy (d);	697	XftDrawDestroy (d);
654	d = 0;	698	d = 0;
655	}	699	}
		700	}
656		701
657	#if 0	702	rxvt_fontprop
658	for (int i = 0; i < SWATHCOUNT; i++)	703	rxvt_font_xft::properties ()
659	delete cvr[i];	704	{
660	#endif	705	rxvt_fontprop p;
		706
		707	FT_Face face = XftLockFace (f);
		708
		709	p.width = width; p.height = height;
		710	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		711	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		712
		713	XftUnlockFace (f);
		714
		715	return p;
661	}	716	}
662		717
663	bool	718	bool
664	rxvt_font_xft::load (int maxheight)	719	rxvt_font_xft::load (const rxvt_fontprop &prop)
665	{	720	{
666	#if 0	721	#if 0
667	for (int i = 0; i < SWATHCOUNT; i++)	722	for (int i = 0; i < SWATHCOUNT; i++)
668	cvr[i] = 0;	723	cvr[i] = 0;
669	#endif	724	#endif
670		725
671	clear ();	726	clear ();
672		727
673	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	728	FcPattern p = FcNameParse ((FcChar8 ) name);
		729
		730	if (!p)
		731	return false;
		732
		733	FcValue v;
		734
		735	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		736	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		737
		738	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		739	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		740
		741	// clip width, we can't do better, or can we?
		742	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		743	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		744
		745	//FcPatternAddBool (p, FC_MINSPACE, 1);
		746
		747	XftResult result;
		748	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		749
		750	FcPatternDestroy (p);
		751
		752	if (!match)
		753	return false;
		754
		755	f = XftFontOpenPattern (DISPLAY, match);
674		756
675	if (!f)	757	if (!f)
		758	{
		759	FcPatternDestroy (match);
676	return false;	760	return false;
		761	}
677		762
678	FT_Face face = XftLockFace (f);	763	FT_Face face = XftLockFace (f);
679		764
680	prop = !FT_IS_FIXED_WIDTH (face);	765	slow = !FT_IS_FIXED_WIDTH (face);
681		766
682	int ftheight = 0;	767	int ftheight = 0;
683		768
684	for (;;)	769	for (;;)
685	{	770	{
…		…
687	FcChar8 c;	772	FcChar8 c;
688		773
689	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	774	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
690	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	775	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
691		776
692	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	777	if (g1.xOff != g2.xOff) // don't simply trust the font
		778	slow = true;
693		779
694	width = g2.xOff;	780	width = g2.xOff;
695	ascent = (face->size->metrics.ascender + 63) >> 6;	781	ascent = (face->size->metrics.ascender + 63) >> 6;
696	descent = (-face->size->metrics.descender + 63) >> 6;	782	descent = (-face->size->metrics.descender + 63) >> 6;
697	height = ascent + descent;	783	height = ascent + descent;
698		784
699	if (height <= maxheight \|\| !maxheight)	785	if (height <= prop.height \|\| !prop.height)
700	break;	786	break;
701		787
702	if (ftheight)	788	if (ftheight)
703	{	789	{
704	// take smaller steps near the end	790	// take smaller steps near the end
705	if (height > maxheight + 1) ftheight++;	791	if (height > prop.height + 1) ftheight++;
706	if (height > maxheight + 2) ftheight++;	792	if (height > prop.height + 2) ftheight++;
707	if (height > maxheight + 3) ftheight++;	793	if (height > prop.height + 3) ftheight++;
708		794
709	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	795	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
710	}	796	}
711	else	797	else
712	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	798	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
713	}	799	}
714		800
715	XftUnlockFace (f);	801	XftUnlockFace (f);
716		802
717	return true;	803	return true;
718	}	804	}
719
720	#if 0
721	void rxvt_font::gen_coverage_swath (unsigned int page)
722	{
723	cvr[page] = new swath;
724
725	for (int i = 0; i < SWATHSIZE; i++)
726	cvr[page][i] = 0;
727
728	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
729	}
730	#endif
731		805
732	bool	806	bool
733	rxvt_font_xft::has_codepoint (uint32_t unicode)	807	rxvt_font_xft::has_codepoint (uint32_t unicode)
734	{	808	{
735	return XftCharExists (DISPLAY, f, unicode);	809	return XftCharExists (DISPLAY, f, unicode);
…		…
749	if (bg >= 0 && bg != Color_bg)	823	if (bg >= 0 && bg != Color_bg)
750	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);	824	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
751	else	825	else
752	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	826	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
753		827
754	if (!prop && width == r->TermWin.fwidth)	828	if (!slow && width == r->TermWin.fwidth)
755	{	829	{
756	if (sizeof (text_t) == sizeof (FcChar16))	830	if (sizeof (text_t) == sizeof (FcChar16))
757	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	831	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
758	else	832	else
759	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	833	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
799	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	873	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
800	FONT_UNREF (*i);	874	FONT_UNREF (*i);
801		875
802	fonts.clear ();	876	fonts.clear ();
803	base_id = 0;	877	base_id = 0;
804	height = 0x7fffffff;	878	base_prop.height = 0x7fffffff;
		879	base_prop.weight = rxvt_fontprop::medium;
		880	base_prop.slant = rxvt_fontprop::roman;
805		881
806	fallback = fallback_fonts;	882	fallback = fallback_fonts;
807	}	883	}
808		884
809	rxvt_font *	885	rxvt_font *
…		…
894	rxvt_fontset::realize_font (int i)	970	rxvt_fontset::realize_font (int i)
895	{	971	{
896	if (fonts[i]->loaded)	972	if (fonts[i]->loaded)
897	return true;	973	return true;
898		974
899	if (fonts[i]->load (height))
900	return fonts[i]->loaded = true;	975	fonts[i]->loaded = true;
901		976
902	delete fonts[i];	977	if (!fonts[i]->load (base_prop))
903	fonts.erase (fonts.begin () + i);	978	{
904		979	fonts[i]->cs = CS_UNKNOWN;
905	return false;	980	return false;
		981	}
		982
		983	return true;
906	}	984	}
907		985
908	void	986	void
909	rxvt_fontset::populate (const char *desc)	987	rxvt_fontset::populate (const char *desc)
910	{	988	{
…		…
917		995
918	if (!base_id)	996	if (!base_id)
919	base_id = 1;	997	base_id = 1;
920		998
921	// we currently need a base-font, no matter what	999	// we currently need a base-font, no matter what
922	if (fonts.size () <= base_id)	1000	if (fonts.size () <= base_id \|\| !realize_font (base_id))
923	{	1001	{
924	add_fonts ("fixed");	1002	add_fonts ("fixed");
925	base_id = 1;	1003	base_id = fonts.size () - 1;
926	}	1004	}
927		1005
928	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1006	if (fonts.size () <= base_id \|\| !realize_font (base_id))
929	{	1007	{
930	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");	1008	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
931	exit (1);	1009	exit (1);
932	}	1010	}
933		1011
934	height = fonts[base_id]->height;	1012	base_prop = fonts[base_id]->properties ();
935
936	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/
937	}	1013	}
938		1014
939	int	1015	int
940	rxvt_fontset::find_font (uint32_t unicode)	1016	rxvt_fontset::find_font (uint32_t unicode)
941	{	1017	{
…		…
947	{	1023	{
948	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1024	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
949	goto next_font;	1025	goto next_font;
950		1026
951	if (!realize_font (i))	1027	if (!realize_font (i))
952	{
953	--i;
954	goto next_font;	1028	goto next_font;
955	}	1029	}
956		1030
957	//printf ("added font %s for %04lx\n", f->name, unicode);
958	}
959
960	if (f->has_codepoint (unicode))	1031	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
961	return i;	1032	return i;
962		1033
963	next_font:	1034	next_font:
964	if (i == fonts.size () - 1 && fallback->name)	1035	if (i == fonts.size () - 1 && fallback->name)
965	{	1036	{
966	fonts.push_back (new_font (fallback->name, fallback->cs));	1037	fonts.push_back (new_font (fallback->name, fallback->cs));
967	fallback++;	1038	fallback++;
		1039	i = 0;
968	}	1040	}
969	}	1041	}
970		1042
971	return 0; /* we must return SOME font */	1043	return 0; /* we must return SOME font */
972	}	1044	}

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.3 by pcg, Thu Nov 27 20:09:00 2003 UTC vs. Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.3 by pcg, Thu Nov 27 20:09:00 2003 UTC vs.
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC