[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.12 by pcg, Fri Dec 26 07:42:23 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
		343	bool load (const rxvt_fontprop &prop);
331		344
332	bool has_codepoint (uint32_t unicode);	345	bool has_codepoint (uint32_t unicode);
333		346
334	void draw (int x, int y,	347	void draw (int x, int y,
335	const text_t *text, int len,	348	const text_t *text, int len,
…		…
337		350
338	XFontStruct *f;	351	XFontStruct *f;
339	codeset cs;	352	codeset cs;
340	bool enc2b, encm;	353	bool enc2b, encm;
341		354
342	const char get_property (const char property, const char *repl) const;	355	const char get_property (XFontStruct f, const char property, const char repl) const;
		356	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		357	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		358	bool set_properties (rxvt_fontprop &p, const char *name);
343	};	359	};
344		360
345	const char *	361	const char *
346	rxvt_font_x11::get_property (const char property, const char repl) const	362	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
347	{	363	{
348	unsigned long value;	364	unsigned long value;
349		365
350	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	366	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
351	return XGetAtomName (DISPLAY, value);	367	return XGetAtomName (DISPLAY, value);
352	else	368	else
353	return repl;	369	return repl;
354	}	370	}
355		371
		372	rxvt_fontprop
		373	rxvt_font_x11::properties ()
		374	{
		375	rxvt_fontprop p;
		376	set_properties (p, f);
		377	return p;
		378	}
		379
356	bool	380	bool
357	rxvt_font_x11::load (int maxheight)	381	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		382	{
		383	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		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 true;
		389	}
		390
		391	bool
		392	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		393	{
		394	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		395	const char *slant = get_property (f, "SLANT", "r");
		396
		397	unsigned long height;
		398	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		399	return false;
		400
		401	unsigned long avgwidth;
		402	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		403	avgwidth = 0;
		404
		405	return set_properties (p, height, weight, slant, avgwidth);
		406	}
		407
		408	bool
		409	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		410	{
		411	int slashes = 0;
		412	const char *comp[12];
		413
		414	for (const char c = name; c; c++)
		415	if (*c == '-')
		416	{
		417	comp[slashes++] = c + 1;
		418	if (slashes >= 13)
		419	break;
		420	}
		421
		422	/* can we short-circuit the costly XLoadQueryFont? */
		423	if (slashes >= 13
		424	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		425	&& (comp[11] >= '0' && comp[11] <= '9'))
		426	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		427
		428	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		429
		430	if (f)
		431	{
		432	// the font should really exists now. if not, we have a problem
		433	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		434	// in that case, just return garbage.
		435	bool ret = set_properties (p, f);
		436	XFreeFont (DISPLAY, f);
		437	return ret;
		438	}
		439	else
		440	return false;
		441	}
		442
		443	// fix the size of scalable fonts
		444	static void
		445	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		446	{
		447	int slashes = 0;
		448	const char *size;
		449
		450	for (const char c = name; c; c++)
		451	if (*c == '-')
		452	{
		453	if (slashes == 6)
		454	size = c + 1;
		455
		456	if (++slashes >= 13)
		457	break;
		458	}
		459
		460	if (slashes >= 13 && size[0] == '0')
		461	{
		462	strncpy (buf, name, size - name);
		463	buf += size - name;
		464	buf += sprintf (buf, "%d", prop.height);
		465	strcpy (buf, size + 1);
		466	}
		467	else
		468	strcpy (buf, name);
		469	}
		470
		471	bool
		472	rxvt_font_x11::load (const rxvt_fontprop &prop)
358	{	473	{
359	clear ();	474	clear ();
		475
		476	char **list;
		477	int count;
		478	list = XListFonts (DISPLAY, name, 512, &count);
		479	set_name (0);
		480
		481	if (!list)
		482	return false;
		483
		484	int bestdiff = 0x7fffffff;
		485	for (int i = 0; i < count; i++)
		486	{
		487	rxvt_fontprop p;
		488	char fname[1024];
		489	fix_scalable (fname, list[i], prop);
		490
		491	if (!set_properties (p, fname))
		492	continue;
		493
		494	if (p.height > prop.height) // weed out too large fonts
		495	continue;
		496
		497	int diff = (prop.height - p.height) * 32
		498	+ abs (prop.weight - p.weight)
		499	+ abs (prop.slant - p.slant );
		500
		501	if (!name // compare against best found so far
		502	\|\| diff < bestdiff)
		503	{
		504	set_name (strdup (fname));
		505	bestdiff = diff;
		506	}
		507	}
		508
		509	XFreeFontNames (list);
		510
		511	if (!name)
		512	return false;
360		513
361	f = XLoadQueryFont (DISPLAY, name);	514	f = XLoadQueryFont (DISPLAY, name);
362		515
363	if (!f)	516	if (!f)
364	return false;	517	return false;
365		518
366	unsigned long value;	519	unsigned long value;
367		520
368	const char *registry = get_property ("CHARSET_REGISTRY", 0);	521	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
369	const char *encoding = get_property ("CHARSET_ENCODING", 0);	522	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
370		523
371	if (registry && encoding)	524	if (registry && encoding)
372	{	525	{
373	char charset[64];	526	char charset[64];
374	snprintf (charset, 64, "%s-%s", registry, encoding);	527	snprintf (charset, 64, "%s-%s", registry, encoding);
375		528
376	cs = codeset_from_name (charset);	529	cs = codeset_from_name (charset);
377	}	530	}
378	else	531	else
379	{	532	{
380	const char *charset = get_property ("FONT", 0);	533	const char *charset = get_property (f, "FONT", 0);
381		534
382	if (!charset)	535	if (!charset)
383	charset = name;	536	charset = name;
384		537
385	int count = 13;	538	int count = 13;
…		…
398		551
399	ascent = f->ascent;	552	ascent = f->ascent;
400	descent = f->descent;	553	descent = f->descent;
401	height = ascent + descent;	554	height = ascent + descent;
402		555
403	prop = false;	556	slow = false;
404		557
405	if (f->min_bounds.width == f->max_bounds.width)	558	if (f->min_bounds.width == f->max_bounds.width)
406	width = f->min_bounds.width;	559	width = f->min_bounds.width;
407	else if (f->per_char == NULL)	560	else if (f->per_char == NULL)
408	width = f->max_bounds.width;	561	width = f->max_bounds.width;
409	else	562	else
410	{	563	{
411	prop = true;	564	slow = true;
412		565
413	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	566	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
414		567
415	if (encm)	568	if (encm)
416	N += (f->max_byte1 - f->min_byte1)	569	N += (f->max_byte1 - f->min_byte1)
…		…
501	// this looks like a mess /.	654	// this looks like a mess /.
502	// and it is a mess /.	655	// and it is a mess /.
503	// yet we are trying to be perfect /.	656	// yet we are trying to be perfect /.
504	// but the result still isn't perfect /.	657	// but the result still isn't perfect /.
505		658
506	bool slow = prop	659	bool slow = this->slow
507	\|\| width != r->TermWin.fwidth	660	\|\| width != r->TermWin.fwidth
508	\|\| height != r->TermWin.fheight;	661	\|\| height != r->TermWin.fheight;
509		662
510	int base = r->TermWin.fbase;	663	int base = r->TermWin.fbase;
511		664
…		…
586	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	739	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
587	#define SWATHBITS 8	740	#define SWATHBITS 8
588	#endif	741	#endif
589		742
590	struct rxvt_font_xft : rxvt_font {	743	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; }	744	rxvt_font_xft () { f = 0; d = 0; }
618		745
619	void clear ();	746	void clear ();
620		747
621	bool load (int maxheight);	748	rxvt_fontprop properties ();
		749
		750	bool load (const rxvt_fontprop &prop);
622		751
623	void draw (int x, int y,	752	void draw (int x, int y,
624	const text_t *text, int len,	753	const text_t *text, int len,
625	int fg, int bg);	754	int fg, int bg);
626		755
627	bool has_codepoint (uint32_t unicode);	756	bool has_codepoint (uint32_t unicode);
628		757
629	protected:	758	protected:
630	XftFont *f;	759	XftFont *f;
631	XftDraw *d;	760	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	};	761	};
641		762
642	void	763	void
643	rxvt_font_xft::clear ()	764	rxvt_font_xft::clear ()
644	{	765	{
…		…
651	if (d)	772	if (d)
652	{	773	{
653	XftDrawDestroy (d);	774	XftDrawDestroy (d);
654	d = 0;	775	d = 0;
655	}	776	}
		777	}
656		778
657	#if 0	779	rxvt_fontprop
658	for (int i = 0; i < SWATHCOUNT; i++)	780	rxvt_font_xft::properties ()
659	delete cvr[i];	781	{
660	#endif	782	rxvt_fontprop p;
		783
		784	FT_Face face = XftLockFace (f);
		785
		786	p.width = width; p.height = height;
		787	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		788	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		789
		790	XftUnlockFace (f);
		791
		792	return p;
661	}	793	}
662		794
663	bool	795	bool
664	rxvt_font_xft::load (int maxheight)	796	rxvt_font_xft::load (const rxvt_fontprop &prop)
665	{	797	{
666	#if 0	798	#if 0
667	for (int i = 0; i < SWATHCOUNT; i++)	799	for (int i = 0; i < SWATHCOUNT; i++)
668	cvr[i] = 0;	800	cvr[i] = 0;
669	#endif	801	#endif
670		802
671	clear ();	803	clear ();
672		804
673	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	805	FcPattern p = FcNameParse ((FcChar8 ) name);
		806
		807	if (!p)
		808	return false;
		809
		810	FcValue v;
		811
		812	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		813	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		814
		815	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		816	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		817
		818	#if 0 // clipping unfortunately destroys our precious double-width-characters
		819	// clip width, we can't do better, or can we?
		820	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		821	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		822	#endif
		823
		824	//FcPatternAddBool (p, FC_MINSPACE, 1);
		825
		826	XftResult result;
		827	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		828
		829	FcPatternDestroy (p);
		830
		831	if (!match)
		832	return false;
		833
		834	f = XftFontOpenPattern (DISPLAY, match);
674		835
675	if (!f)	836	if (!f)
		837	{
		838	FcPatternDestroy (match);
676	return false;	839	return false;
		840	}
677		841
678	FT_Face face = XftLockFace (f);	842	FT_Face face = XftLockFace (f);
679		843
680	prop = !FT_IS_FIXED_WIDTH (face);	844	slow = !FT_IS_FIXED_WIDTH (face);
681		845
682	int ftheight = 0;	846	int ftheight = 0;
683		847
684	for (;;)	848	for (;;)
685	{	849	{
…		…
687	FcChar8 c;	851	FcChar8 c;
688		852
689	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	853	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
690	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	854	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
691		855
692	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	856	if (g1.xOff != g2.xOff) // don't simply trust the font
		857	slow = true;
693		858
694	width = g2.xOff;	859	width = g2.xOff;
695	ascent = (face->size->metrics.ascender + 63) >> 6;	860	ascent = (face->size->metrics.ascender + 63) >> 6;
696	descent = (-face->size->metrics.descender + 63) >> 6;	861	descent = (-face->size->metrics.descender + 63) >> 6;
697	height = ascent + descent;	862	height = ascent + descent;
698		863
699	if (height <= maxheight \|\| !maxheight)	864	if (height <= prop.height \|\| !prop.height)
700	break;	865	break;
701		866
702	if (ftheight)	867	if (ftheight)
703	{	868	{
704	// take smaller steps near the end	869	// take smaller steps near the end
705	if (height > maxheight + 1) ftheight++;	870	if (height > prop.height + 1) ftheight++;
706	if (height > maxheight + 2) ftheight++;	871	if (height > prop.height + 2) ftheight++;
707	if (height > maxheight + 3) ftheight++;	872	if (height > prop.height + 3) ftheight++;
708		873
709	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	874	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
710	}	875	}
711	else	876	else
712	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	877	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
713	}	878	}
714		879
715	XftUnlockFace (f);	880	XftUnlockFace (f);
716		881
717	return true;	882	return true;
718	}	883	}
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		884
732	bool	885	bool
733	rxvt_font_xft::has_codepoint (uint32_t unicode)	886	rxvt_font_xft::has_codepoint (uint32_t unicode)
734	{	887	{
735	return XftCharExists (DISPLAY, f, unicode);	888	return XftCharExists (DISPLAY, f, unicode);
…		…
749	if (bg >= 0 && bg != Color_bg)	902	if (bg >= 0 && bg != Color_bg)
750	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);	903	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
751	else	904	else
752	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	905	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
753		906
754	if (!prop && width == r->TermWin.fwidth)	907	if (!slow && width == r->TermWin.fwidth && 0)
755	{	908	{
756	if (sizeof (text_t) == sizeof (FcChar16))	909	if (sizeof (text_t) == sizeof (FcChar16))
757	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	910	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
758	else	911	else
759	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	912	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
762	{	915	{
763	while (len)	916	while (len)
764	{	917	{
765	if (text != NOCHAR && text != ' ')	918	if (text != NOCHAR && text != ' ')
766	{	919	{
		920	XGlyphInfo extents;
767	if (sizeof (text_t) == sizeof (FcChar16))	921	if (sizeof (text_t) == sizeof (FcChar16))
768	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	922	{
		923	XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
		924	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2,
		925	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		926	}
769	else	927	else
770	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	928	{
		929	XGlyphInfo extents;
		930	XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
		931	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2,
		932	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		933	}
771	}	934	}
772		935
773	x += r->TermWin.fwidth;	936	x += r->TermWin.fwidth;
774	text++;	937	text++;
775	len--;	938	len--;
…		…
799	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	962	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)
800	FONT_UNREF (*i);	963	FONT_UNREF (*i);
801		964
802	fonts.clear ();	965	fonts.clear ();
803	base_id = 0;	966	base_id = 0;
804	height = 0x7fffffff;	967	base_prop.height = 0x7fffffff;
		968	base_prop.weight = rxvt_fontprop::medium;
		969	base_prop.slant = rxvt_fontprop::roman;
805		970
806	fallback = fallback_fonts;	971	fallback = fallback_fonts;
807	}	972	}
808		973
809	rxvt_font *	974	rxvt_font *
…		…
894	rxvt_fontset::realize_font (int i)	1059	rxvt_fontset::realize_font (int i)
895	{	1060	{
896	if (fonts[i]->loaded)	1061	if (fonts[i]->loaded)
897	return true;	1062	return true;
898		1063
899	if (fonts[i]->load (height))
900	return fonts[i]->loaded = true;	1064	fonts[i]->loaded = true;
901		1065
902	delete fonts[i];	1066	if (!fonts[i]->load (base_prop))
903	fonts.erase (fonts.begin () + i);	1067	{
904		1068	fonts[i]->cs = CS_UNKNOWN;
905	return false;	1069	return false;
		1070	}
		1071
		1072	return true;
906	}	1073	}
907		1074
908	void	1075	void
909	rxvt_fontset::populate (const char *desc)	1076	rxvt_fontset::populate (const char *desc)
910	{	1077	{
…		…
917		1084
918	if (!base_id)	1085	if (!base_id)
919	base_id = 1;	1086	base_id = 1;
920		1087
921	// we currently need a base-font, no matter what	1088	// we currently need a base-font, no matter what
922	if (fonts.size () <= base_id)	1089	if (fonts.size () <= base_id \|\| !realize_font (base_id))
923	{	1090	{
924	add_fonts ("fixed");	1091	add_fonts ("fixed");
925	base_id = 1;	1092	base_id = fonts.size () - 1;
926	}	1093	}
927		1094
928	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1095	if (fonts.size () <= base_id \|\| !realize_font (base_id))
929	{	1096	{
930	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");	1097	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
931	exit (1);	1098	exit (1);
932	}	1099	}
933		1100
934	height = fonts[base_id]->height;	1101	base_prop = fonts[base_id]->properties ();
935
936	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/
937	}	1102	}
938		1103
939	int	1104	int
940	rxvt_fontset::find_font (uint32_t unicode)	1105	rxvt_fontset::find_font (uint32_t unicode)
941	{	1106	{
…		…
947	{	1112	{
948	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1113	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
949	goto next_font;	1114	goto next_font;
950		1115
951	if (!realize_font (i))	1116	if (!realize_font (i))
952	{
953	--i;
954	goto next_font;	1117	goto next_font;
955	}	1118	}
956		1119
957	//printf ("added font %s for %04lx\n", f->name, unicode);
958	}
959
960	if (f->has_codepoint (unicode))	1120	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
961	return i;	1121	return i;
962		1122
963	next_font:	1123	next_font:
964	if (i == fonts.size () - 1 && fallback->name)	1124	if (i == fonts.size () - 1 && fallback->name)
965	{	1125	{
966	fonts.push_back (new_font (fallback->name, fallback->cs));	1126	fonts.push_back (new_font (fallback->name, fallback->cs));
967	fallback++;	1127	fallback++;
		1128	i = 0;
968	}	1129	}
969	}	1130	}
970		1131
971	return 0; /* we must return SOME font */	1132	return 0; /* we must return SOME font */
972	}	1133	}

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.12 by pcg, Fri Dec 26 07:42:23 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.12 by pcg, Fri Dec 26 07:42:23 2003 UTC