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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.21 by pcg, Sat Feb 21 20:33:40 2004 UTC

…		…
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
29	#define DRAWABLE r->TermWin.vt	29	#define DRAWABLE r->TermWin.vt
30	#define GC r->TermWin.gc	30	#define GC r->TermWin.gc
31		31
32	const struct rxvt_fallback_font {	32	const struct rxvt_fallback_font {
33	codeset cs;	33	codeset cs;
…		…
59		59
60	// japanese	60	// japanese
61	#if ENCODING_JP \|\| ENCODING_JP_EXT	61	#if ENCODING_JP \|\| ENCODING_JP_EXT
62	# if XFT	62	# if XFT
63	// prefer xft for complex scripts	63	// prefer xft for complex scripts
64	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	64	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65	# endif	65	# endif
66	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	66	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
67	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	67	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },
68	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	68	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
69	#endif	69	#endif
70		70
71	#if ENCODING_CN \|\| ENCODING_CN_EXT	71	#if ENCODING_CN \|\| ENCODING_CN_EXT
72	# if XFT	72	# if XFT
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	77	# endif
		78	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "----r-------c--cns11643.1992-1" },	79	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "----r-------c--cns11643.1992-2" },	80	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "----r-------c--cns11643.1992-3" },	81	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "----r-------c--cns11643.1992-4" },	82	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "----r-------c--cns11643.1992-5" },	83	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "----r-------c--cns11643.1992-6" },	84	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "----r-------c--cns11643.1992-7" },	85	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "----r-------c--cns11643.1992-f" },	86	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	87	#endif
87		88
88	#if XFT	89	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	90	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	91	{ CS_UNICODE, "xft:Arial Unicode MS" },
91	#endif	92	#endif
92	{ CS_UNICODE, "--lucidatypewriter--r-------m-*-iso10646-1" },	93	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
		94	{ CS_UNICODE, "xft:FreeMono" },
		95	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
		96	{ CS_UNICODE, "----r-------c--iso10646-1" },
93	{ CS_UNICODE, "----r-------m--iso10646-1" },	97	{ CS_UNICODE, "----r-------m--iso10646-1" },
94	{ CS_UNICODE, "----r-------m--iso10646-1" },
95	{ CS_UNICODE, "----r-------m--iso10646-1" },
96		98
97	{ CS_UNKNOWN, 0 }	99	{ CS_UNKNOWN, 0 }
98	};	100	};
99		101
100	/////////////////////////////////////////////////////////////////////////////	102	/////////////////////////////////////////////////////////////////////////////
101		103
102	static void *enc_buf;	104	static void *enc_buf;
103	static uint32_t enc_len;	105	static uint32_t enc_len;
104		106
105	static inline void *	107	static inline void *
106	get_enc_buf (int len)	108	get_enc_buf (uint32_t len)
107	{	109	{
108	if (len > enc_len)	110	if (len > enc_len)
109	{	111	{
110	free (enc_buf);	112	free (enc_buf);
111	enc_buf = malloc (len);	113	enc_buf = malloc (len);
…		…
113		115
114	return enc_buf;	116	return enc_buf;
115	}	117	}
116		118
117	static const char *	119	static const char *
118	enc_char (const text_t *text, int len, codeset cs, bool &zero)	120	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
119	{	121	{
120	uint8_t buf = (uint8_t )get_enc_buf (len);	122	uint8_t buf = (uint8_t )get_enc_buf (len);
121		123
122	while (len--)	124	while (len--)
123	{	125	{
…		…
134		136
135	return (const char *)enc_buf;	137	return (const char *)enc_buf;
136	}	138	}
137		139
138	static const XChar2b *	140	static const XChar2b *
139	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	141	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
140	{	142	{
141	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	143	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
142		144
143	while (len--)	145	while (len--)
144	{	146	{
…		…
226	struct rxvt_font_default : rxvt_font {	228	struct rxvt_font_default : rxvt_font {
227	rxvt_fontprop properties ()	229	rxvt_fontprop properties ()
228	{	230	{
229	rxvt_fontprop p;	231	rxvt_fontprop p;
230		232
231	p.height = 1;	233	p.width = p.height = 1;
232	p.weight = rxvt_fontprop::medium;	234	p.weight = rxvt_fontprop::medium;
233	p.slant = rxvt_fontprop::roman;	235	p.slant = rxvt_fontprop::roman;
234		236
235	return p;	237	return p;
236	}	238	}
…		…
336	rxvt_font_x11 () { f = 0; }	338	rxvt_font_x11 () { f = 0; }
337		339
338	void clear ();	340	void clear ();
339		341
340	rxvt_fontprop properties ();	342	rxvt_fontprop properties ();
341	rxvt_fontprop properties (XFontStruct *f);
342		343
343	bool load (const rxvt_fontprop &prop);	344	bool load (const rxvt_fontprop &prop);
344		345
345	bool has_codepoint (uint32_t unicode);	346	bool has_codepoint (uint32_t unicode);
346		347
…		…
351	XFontStruct *f;	352	XFontStruct *f;
352	codeset cs;	353	codeset cs;
353	bool enc2b, encm;	354	bool enc2b, encm;
354		355
355	const char get_property (XFontStruct f, const char property, const char repl) const;	356	const char get_property (XFontStruct f, const char property, const char repl) const;
		357	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		358	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		359	bool set_properties (rxvt_fontprop &p, const char *name);
356	};	360	};
357		361
358	const char *	362	const char *
359	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	363	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
360	{	364	{
…		…
367	}	371	}
368		372
369	rxvt_fontprop	373	rxvt_fontprop
370	rxvt_font_x11::properties ()	374	rxvt_font_x11::properties ()
371	{	375	{
372	return properties (f);
373	}
374
375	rxvt_fontprop
376	rxvt_font_x11::properties (XFontStruct *f)
377	{
378	rxvt_fontprop p;	376	rxvt_fontprop p;
		377	set_properties (p, f);
		378	return p;
		379	}
379		380
		381	bool
		382	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		383	{
		384	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		385	p.height = height;
		386	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		387	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		388
		389	return true;
		390	}
		391
		392	bool
		393	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		394	{
380	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	395	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381	const char *slant = get_property (f, "SLANT", "r");	396	const char *slant = get_property (f, "SLANT", "r");
382		397
383	p.height = height;	398	unsigned long height;
384	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	399	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
385	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	400	return false;
386		401
387	return p;	402	unsigned long avgwidth;
		403	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		404	avgwidth = 0;
		405
		406	return set_properties (p, height, weight, slant, avgwidth);
		407	}
		408
		409	bool
		410	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		411	{
		412	int slashes = 0;
		413	const char *comp[12];
		414
		415	for (const char c = name; c; c++)
		416	if (*c == '-')
		417	{
		418	comp[slashes++] = c + 1;
		419	if (slashes >= 13)
		420	break;
		421	}
		422
		423	/* can we short-circuit the costly XLoadQueryFont? */
		424	if (slashes >= 13
		425	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		426	&& (comp[11] >= '0' && comp[11] <= '9'))
		427	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		428
		429	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		430
		431	if (f)
		432	{
		433	// the font should really exist now. if not, we have a problem
		434	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		435	// in that case, just return garbage.
		436	bool ret = set_properties (p, f);
		437	XFreeFont (DISPLAY, f);
		438	return ret;
		439	}
		440	else
		441	return false;
		442	}
		443
		444	// fix the size of scalable fonts
		445	static void
		446	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		447	{
		448	int slashes = 0;
		449	const char *size;
		450
		451	for (const char c = name; c; c++)
		452	if (*c == '-')
		453	{
		454	if (slashes == 6)
		455	size = c + 1;
		456
		457	if (++slashes >= 13)
		458	break;
		459	}
		460
		461	if (slashes >= 13 && size[0] == '0')
		462	{
		463	strncpy (buf, name, size - name);
		464	buf += size - name;
		465	buf += sprintf (buf, "%d", prop.height);
		466	strcpy (buf, size + 1);
		467	}
		468	else
		469	strcpy (buf, name);
388	}	470	}
389		471
390	bool	472	bool
391	rxvt_font_x11::load (const rxvt_fontprop &prop)	473	rxvt_font_x11::load (const rxvt_fontprop &prop)
392	{	474	{
393	clear ();	475	clear ();
394		476
395	char **list;	477	char **list;
396	int count;	478	int count;
397	XFontStruct *info;
398	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	479	list = XListFonts (DISPLAY, name, 512, &count);
		480	set_name (0);
399		481
400	if (!list)	482	if (!list)
401	return false;	483	return false;
402		484
403	int bestdiff = 0x7fffffff;	485	int bestdiff = 0x7fffffff;
404	XFontStruct *best = 0;
405	for (int i = 0; i < count; i++)	486	for (int i = 0; i < count; i++)
406	{	487	{
407	XFontStruct *f = info + i;	488	rxvt_fontprop p;
		489	char fname[1024];
		490	fix_scalable (fname, list[i], prop);
408		491
		492	if (!set_properties (p, fname))
		493	continue;
		494
409	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	495	if (p.height > prop.height) // weed out too large fonts
410	{	496	continue;
411	rxvt_fontprop p = properties (f);	497
412	int diff = (prop.height - f->ascent + f->descent) * 32	498	int diff = (prop.height - p.height) * 32
413	+ abs (prop.weight - p.weight)	499	+ abs (prop.weight - p.weight)
414	+ abs (prop.slant - p.slant );	500	+ abs (prop.slant - p.slant );
415		501
416	if (!best // compare against best found so far	502	if (!name // compare against best found so far
417	\|\| diff < bestdiff)	503	\|\| diff < bestdiff)
418	{	504	{
419	best = f;	505	set_name (strdup (fname));
420	bestdiff = diff;	506	bestdiff = diff;
421	}	507	}
422	}
423	}	508	}
424		509
425	set_name (strdup (list[best - info]));	510	XFreeFontNames (list);
426		511
427	XFreeFontInfo (list, info, count);	512	if (!name)
		513	return false;
428		514
429	f = XLoadQueryFont (DISPLAY, name);	515	f = XLoadQueryFont (DISPLAY, name);
430		516
431	if (!f)	517	if (!f)
432	return false;	518	return false;
433
434	unsigned long value;
435		519
436	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	520	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	521	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438		522
439	if (registry && encoding)	523	if (registry && encoding)
…		…
526	/* check wether the character exists in _this_ font. horrible. */	610	/* check wether the character exists in _this_ font. horrible. */
527	XCharStruct *xcs;	611	XCharStruct *xcs;
528		612
529	if (encm)	613	if (encm)
530	{	614	{
531	int byte1 = ch >> 8;	615	unsigned char byte1 = ch >> 8;
532	int byte2 = ch & 255;	616	unsigned char byte2 = ch & 255;
533		617
534	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	618	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
535	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	619	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
536	return false;	620	return false;
537		621
…		…
654	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	738	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655	#define SWATHBITS 8	739	#define SWATHBITS 8
656	#endif	740	#endif
657		741
658	struct rxvt_font_xft : rxvt_font {	742	struct rxvt_font_xft : rxvt_font {
659	#if 0
660	enum {
661	SWATHCOUNT = 1 << (21 - UNIBITS),
662	SWATHSIZE = 1 << (SWATHBITS - 5)
663	};
664	typedef uint32_t swath[SWATHSIZE];
665
666	swath *cvr[SWATHCOUNT];
667	#endif
668
669	#if 0
670	void gen_coverage_swath (unsigned int page);
671
672	bool has_char (uint32_t ch)
673	{
674	unsigned int page = ch >> SWATHBITS;
675	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
676
677	if (page >= SWATHCOUNT)
678	return false;
679
680	if (!cvr[page]) gen_coverage_swath (page);
681
682	return cvr[page][idx >> 5] & (1 << (idx & 31));
683	}
684	#endif
685	rxvt_font_xft () { f = 0; d = 0; }	743	rxvt_font_xft () { f = 0; d = 0; }
686		744
687	void clear ();	745	void clear ();
688		746
689	rxvt_fontprop properties ();	747	rxvt_fontprop properties ();
…		…
697	bool has_codepoint (uint32_t unicode);	755	bool has_codepoint (uint32_t unicode);
698		756
699	protected:	757	protected:
700	XftFont *f;	758	XftFont *f;
701	XftDraw *d;	759	XftDraw *d;
702
703	#if 0
704	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
705	void set_swath (uint32_t ch)
706	{
707	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
708	}
709	#endif
710	};	760	};
711		761
712	void	762	void
713	rxvt_font_xft::clear ()	763	rxvt_font_xft::clear ()
714	{	764	{
		765	if (d)
		766	{
		767	XftDrawDestroy (d);
		768	d = 0;
		769	}
		770
715	if (f)	771	if (f)
716	{	772	{
717	XftFontClose (DISPLAY, f);	773	XftFontClose (DISPLAY, f);
718	f = 0;	774	f = 0;
719	}	775	}
720
721	if (d)
722	{
723	XftDrawDestroy (d);
724	d = 0;
725	}
726
727	#if 0
728	for (int i = 0; i < SWATHCOUNT; i++)
729	delete cvr[i];
730	#endif
731	}	776	}
732		777
733	rxvt_fontprop	778	rxvt_fontprop
734	rxvt_font_xft::properties ()	779	rxvt_font_xft::properties ()
735	{	780	{
736	rxvt_fontprop p;	781	rxvt_fontprop p;
737		782
738	FT_Face face = XftLockFace (f);	783	FT_Face face = XftLockFace (f);
739		784
740	p.height = height;	785	p.width = width; p.height = height;
741	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	786	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
742	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;	787	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743		788
744	XftUnlockFace (f);	789	XftUnlockFace (f);
745		790
…		…
767	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	812	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768		813
769	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	814	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770	FcPatternAddInteger (p, FC_SLANT, prop.slant);	815	FcPatternAddInteger (p, FC_SLANT, prop.slant);
771		816
		817	#if 0 // clipping unfortunately destroys our precious double-width-characters
		818	// clip width, we can't do better, or can we?
		819	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		820	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		821	#endif
		822
772	//FcPatternAddBool (p, FC_MINSPACE, 1);	823	//FcPatternAddBool (p, FC_MINSPACE, 1);
773		824
774	XftResult result;	825	XftResult result;
775	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	826	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
776		827
…		…
828	XftUnlockFace (f);	879	XftUnlockFace (f);
829		880
830	return true;	881	return true;
831	}	882	}
832		883
833	#if 0
834	void rxvt_font::gen_coverage_swath (unsigned int page)
835	{
836	cvr[page] = new swath;
837
838	for (int i = 0; i < SWATHSIZE; i++)
839	cvr[page][i] = 0;
840
841	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
842	}
843	#endif
844
845	bool	884	bool
846	rxvt_font_xft::has_codepoint (uint32_t unicode)	885	rxvt_font_xft::has_codepoint (uint32_t unicode)
847	{	886	{
848	return XftCharExists (DISPLAY, f, unicode);	887	return XftCharExists (DISPLAY, f, unicode);
849	}	888	}
…		…
851	void	890	void
852	rxvt_font_xft::draw (int x, int y,	891	rxvt_font_xft::draw (int x, int y,
853	const text_t *text, int len,	892	const text_t *text, int len,
854	int fg, int bg)	893	int fg, int bg)
855	{	894	{
856	if (!d)	895	d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
857	{
858	dR;
859	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
860	}
861		896
862	if (bg >= 0 && bg != Color_bg)	897	if (bg >= 0 && bg != Color_bg)
863	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);	898	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
864	else	899	else
865	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	900	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
866		901
867	if (!slow && width == r->TermWin.fwidth)	902	if (!slow && width == r->TermWin.fwidth && 0)
868	{	903	{
869	if (sizeof (text_t) == sizeof (FcChar16))	904	if (sizeof (text_t) == sizeof (FcChar16))
870	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	905	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
871	else	906	else
872	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	907	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
875	{	910	{
876	while (len)	911	while (len)
877	{	912	{
878	if (text != NOCHAR && text != ' ')	913	if (text != NOCHAR && text != ' ')
879	{	914	{
		915	int fwidth = r->TermWin.fwidth;
		916	if (len >= 2 && text[1] == NOCHAR)
		917	fwidth *= 2;
		918
		919	XGlyphInfo extents;
880	if (sizeof (text_t) == sizeof (FcChar16))	920	if (sizeof (text_t) == sizeof (FcChar16))
881	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	921	{
		922	XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
		923	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		924	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		925	}
882	else	926	else
883	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	927	{
		928	XGlyphInfo extents;
		929	XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
		930	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		931	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		932	}
884	}	933	}
885		934
886	x += r->TermWin.fwidth;	935	x += r->TermWin.fwidth;
887	text++;	936	text++;
888	len--;	937	len--;
…		…
892	#endif	941	#endif
893		942
894	/////////////////////////////////////////////////////////////////////////////	943	/////////////////////////////////////////////////////////////////////////////
895		944
896	rxvt_fontset::rxvt_fontset (rxvt_t r)	945	rxvt_fontset::rxvt_fontset (rxvt_t r)
897	#ifdef EXPLICIT_CONTEXT
898	: r(r)	946	: r (r)
899	#endif
900	{	947	{
901	clear ();	948	clear ();
902	}	949	}
903		950
904	rxvt_fontset::~rxvt_fontset ()	951	rxvt_fontset::~rxvt_fontset ()
…		…
907	}	954	}
908		955
909	void	956	void
910	rxvt_fontset::clear ()	957	rxvt_fontset::clear ()
911	{	958	{
912	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	959	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
913	FONT_UNREF (*i);	960	FONT_UNREF (*i);
914		961
915	fonts.clear ();	962	fonts.clear ();
916	base_id = 0;	963	base_id = 0;
917	base_prop.height = 0x7fffffff;	964	base_prop.height = 0x7fffffff;
…		…
971		1018
972	if (*desc == '[')	1019	if (*desc == '[')
973	{	1020	{
974	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1021	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
975		1022
976	const char *extra = desc++;	1023	//const char *extra = desc++; // not yet used
977		1024
978	desc = strchr (desc, ']');	1025	desc = strchr (desc, ']');
979		1026
980	if (!desc)	1027	if (!desc)
981	{	1028	{
…		…
1034		1081
1035	if (!base_id)	1082	if (!base_id)
1036	base_id = 1;	1083	base_id = 1;
1037		1084
1038	// we currently need a base-font, no matter what	1085	// we currently need a base-font, no matter what
1039	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1086	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1040	{	1087	{
		1088	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1041	add_fonts ("fixed");	1089	add_fonts ("fixed");
1042	base_id = fonts.size () - 1;	1090	base_id = fonts.size () - 1;
1043	}	1091	}
1044		1092
1045	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1093	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1046	{	1094	{
1047	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");	1095	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1048	exit (1);	1096	exit (1);
1049	}	1097	}
1050		1098
…		…
1052	}	1100	}
1053		1101
1054	int	1102	int
1055	rxvt_fontset::find_font (uint32_t unicode)	1103	rxvt_fontset::find_font (uint32_t unicode)
1056	{	1104	{
1057	for (int i = 0; i < fonts.size (); i++)	1105	for (unsigned int i = 0; i < fonts.size (); i++)
1058	{	1106	{
1059	rxvt_font *f = fonts[i];	1107	rxvt_font *f = fonts[i];
1060		1108
1061	if (!f->loaded)	1109	if (!f->loaded)
1062	{	1110	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs. Revision 1.21 by pcg, Sat Feb 21 20:33:40 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.21 by pcg, Sat Feb 21 20:33:40 2004 UTC