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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC

…		…
24	#include "rxvtlib.h"	24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	25	#include "rxvtutil.h"
26	#include "rxvtfont.h"	26	#include "rxvtfont.h"
27		27
28	#include <cstdlib>	28	#include <cstdlib>
29	#include <wchar.h>	29
30	#include <inttypes.h>	30	#include <inttypes.h>
31		31
32	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width	32	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
		33	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
		34
		35	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
		36	(prop)->slant >= rxvt_fontprop::italic \
		37	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
		38	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
		39	))
33		40
34	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
35	codeset cs;	42	codeset cs;
36	const char *name;	43	const char *name;
37	} fallback_fonts[] = {	44	} fallback_fonts[] = {
…		…
57	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
58	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
59	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
60		67
61	# if XFT	68	# if XFT
62	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	69	{ CS_KOI8_U, "xft::lang=ru" },
63		70
64	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
65	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
66	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	73	{ CS_ISO8859_7, "xft::lang=el" },
67	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	74	{ CS_ISO8859_8, "xft::lang=he" },
68	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
69	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	76	{ CS_ISO8859_10, "xft::lang=se" },
70	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	77	{ CS_ISO8859_11, "xft::lang=th" },
71	# endif	78	# endif
72	#endif	79	#endif
73		80
74	// japanese	81	// japanese
75	#if ENCODING_JP \|\| ENCODING_JP_EXT	82	#if ENCODING_JP \|\| ENCODING_JP_EXT
76	# if XFT	83	# if XFT
77	// prefer xft for complex scripts	84	// prefer xft for complex scripts
78	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82	# endif	89	# endif
83	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
84	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
85	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
86	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
90		97
91	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
92	# if XFT	99	# if XFT
93	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
94	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
95	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	102	{ CS_GBK_0, "xft::lang=zh" },
96	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	107	{ CS_GB2312_1980_0, "xft::lang=zh" },
101	# endif	108	# endif
102	{ CS_GBK_0, "-----------c--gbk-0" },	109	{ CS_GBK_0, "-----------c--gbk-0" },
103	{ CS_BIG5, "-----------c-*-big5-0" },	110	{ CS_BIG5, "-----------c-*-big5-0" },
104	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
105	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
118	#if ENCODING_KR	125	#if ENCODING_KR
119	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
120	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
121	# if XFT	128	# if XFT
122	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124	# endif	131	# endif
125	#endif	132	#endif
126		133
127	// generic font fallback	134	// generic font fallback
128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	135	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
…		…
150	0x304c, 0x672c, // が本	157	0x304c, 0x672c, // が本
151	};	158	};
152		159
153	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	160	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154		161
155	#define dTermDisplay Display *disp = term->display->display	162	#define dTermDisplay Display *disp = term->xdisp
156	#define dTermGC GC gc = term->gc	163	#define dTermGC GC gc = term->gc
157		164
158	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
159		166
160	#if XFT	167	#if XFT
…		…
165	}	172	}
166		173
167	rxvt_drawable::operator XftDraw *()	174	rxvt_drawable::operator XftDraw *()
168	{	175	{
169	if (!xftdrawable)	176	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);	177	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
171		178
172	return xftdrawable;	179	return xftdrawable;
173	}	180	}
174	#endif	181	#endif
175		182
176	/////////////////////////////////////////////////////////////////////////////	183	/////////////////////////////////////////////////////////////////////////////
177
178	static void *enc_buf;
179	static uint32_t enc_len;
180
181	static inline void *
182	get_enc_buf (uint32_t len)
183	{
184	if (len > enc_len)
185	{
186	free (enc_buf);
187	enc_buf = malloc (len);
188	enc_len = len;
189	}
190
191	return enc_buf;
192	}
193		184
194	static const char *	185	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	186	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	187	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	188	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		189	uint8_t *res = buf;
198		190
199	while (len--)	191	while (len--)
200	{	192	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	193	uint32_t c = FROM_UNICODE (cs, *text++);
202		194
…		…
207	}	199	}
208		200
209	*buf++ = c;	201	*buf++ = c;
210	}	202	}
211		203
212	return (const char *)enc_buf;	204	return (const char *)res;
213	}	205	}
214		206
215	static const XChar2b *	207	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	208	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	209	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	210	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		211	XChar2b *res = buf;
219		212
220	while (len--)	213	while (len--)
221	{	214	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	215	uint32_t c = FROM_UNICODE (cs, *text++);
223		216
…		…
230	buf->byte1 = c >> 8;	223	buf->byte1 = c >> 8;
231	buf->byte2 = c;	224	buf->byte2 = c;
232	buf++;	225	buf++;
233	}	226	}
234		227
235	return (XChar2b *)enc_buf;	228	return res;
236	}	229	}
237		230
238	/////////////////////////////////////////////////////////////////////////////	231	/////////////////////////////////////////////////////////////////////////////
		232
		233	rxvt_font::rxvt_font ()
		234	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		235	{
		236	}
239		237
240	void	238	void
241	rxvt_font::set_name (char *name)	239	rxvt_font::set_name (char *name)
242	{	240	{
243	if (this->name == name)	241	if (this->name == name)
…		…
252	{	250	{
253	dTermDisplay;	251	dTermDisplay;
254	dTermGC;	252	dTermGC;
255		253
256	if (color == Color_bg)	254	if (color == Color_bg)
257	XClearArea (disp, d, x, y, w, h, FALSE);	255	XClearArea (disp, d, x, y, w, h, false);
258	else if (color >= 0)	256	else if (color >= 0)
259	{	257	{
260	#if XFT	258	#if XFT
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
262	#else	260	#else
263	XSetForeground (disp, gc, term->pix_colors[color]);	261	XSetForeground (disp, gc, term->pix_colors[color]);
264	XFillRectangle (disp, d, gc, x, y, w, h);	262	XFillRectangle (disp, d, gc, x, y, w, h);
265	#endif	263	#endif
266	}	264	}
267	}	265	}
		266
		267	/////////////////////////////////////////////////////////////////////////////
268		268
269	#include "table/linedraw.h"	269	#include "table/linedraw.h"
270		270
271	struct rxvt_font_default : rxvt_font {	271	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	272	struct rxvt_fontset *fs;
…		…
439	}	439	}
440	}	440	}
441	#if ENABLE_COMBINING	441	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	443	{
		444	min_it (width, 2); // we only support wcwidth up to 2
		445
444	text_t chrs[2];	446	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	447	chrs [1] = NOCHAR;
447		448
448	*chrs = cc->c1;	449	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	450	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	451	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
500	bool slow; // wether this is a proportional font or has other funny characteristics	501	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	502	XFontStruct *f;
502	codeset cs;	503	codeset cs;
503	bool enc2b, encm;	504	bool enc2b, encm;
504		505
505	char get_property (XFontStruct f, const char property, const char repl) const;	506	char get_property (XFontStruct f, Atom property, const char *repl) const;
506	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	507	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
507	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	508	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	509	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	510	};
510		511
511	char *	512	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	513	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	514	{
514	unsigned long value;	515	unsigned long value;
515		516
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	517	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	518	return XGetAtomName (term->xdisp, value);
518	else	519	else
519	return rxvt_strdup (repl);	520	return rxvt_strdup (repl);
520	}	521	}
521		522
522	rxvt_fontprop	523	rxvt_fontprop
…		…
528	}	529	}
529		530
530	bool	531	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	532	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	533	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	534	p.width = width != rxvt_fontprop::unset ? width
		535	: avgwidth ? (avgwidth + 1) / 10
		536	: (height + 1) / 2;
534	p.height = height;	537	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	538	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	539	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	540	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		541
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	546	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	547	{
545	unsigned long height;	548	unsigned long height;
546		549
547	#if 0	550	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	551	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
549	return false;	552	return false;
550	#else	553	#else
551	height = f->ascent + f->descent;	554	height = f->ascent + f->descent;
552	#endif	555	#endif
553		556
554	unsigned long avgwidth;	557	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	558	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	559	avgwidth = 0;
557		560
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	561	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	562	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		563
561	set_properties (p, height, weight, slant, avgwidth);	564	set_properties (p, height, weight, slant, avgwidth);
562		565
563	free (weight);	566	free (weight);
564	free (slant);	567	free (slant);
…		…
662	f = XLoadQueryFont (disp, name);	665	f = XLoadQueryFont (disp, name);
663		666
664	if (!f)	667	if (!f)
665	return false;	668	return false;
666		669
667	char *new_name = get_property (f, "FONT", name);	670	char *new_name = get_property (f, XA_FONT, name);
668		671
669	if (new_name)	672	if (new_name)
670	set_name (new_name);	673	set_name (new_name);
671	else	674	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	675	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
781	delete [] fonts;	784	delete [] fonts;
782		785
783	if (!f)	786	if (!f)
784	return false;	787	return false;
785		788
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	789	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	790	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		791
789	if (registry && encoding)	792	if (registry && encoding)
790	{	793	{
791	char charset[64];	794	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	795	snprintf (charset, 64, "%s-%s", registry, encoding);
793		796
794	cs = codeset_from_name (charset);	797	cs = codeset_from_name (charset);
795	}	798	}
796	else	799	else
797	{	800	{
798	const char *charset = get_property (f, "FONT", 0);	801	const char *charset = get_property (f, XA_FONT, 0);
799		802
800	if (!charset)	803	if (!charset)
801	charset = name;	804	charset = name;
802		805
803	int count = 13;	806	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	821	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		822
820	slow = false;	823	slow = false;
821		824
822	#if 1 // only used for slow detection, TODO optimize	825	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	826	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
824	width = f->min_bounds.width;
825	else if (f->per_char == NULL)
826	width = f->max_bounds.width;	827	width = f->max_bounds.width;
827	else	828	else
828	{	829	{
829	slow = true;	830	slow = true;
830		831
…		…
846		847
847	width = 1;	848	width = 1;
848		849
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	850	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	851	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	852	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	853	continue;
855		854
856	// ignore characters we wouldn't use anyways	855	// ignore characters we wouldn't use anyways
857	bool careful;	856	bool careful;
858	if (!has_char (*t, &prop, careful))	857	if (!has_char (*t, &prop, careful))
…		…
862		861
863	XCharStruct g;	862	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	863	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	864	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		865
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	866	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		867
869	if (width < g.width) width = g.width;	868	if (width < g.width) width = g.width;
870	}	869	}
871		870
872	if (cs == CS_UNKNOWN)	871	if (cs == CS_UNKNOWN)
873	{	872	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	873	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	890	void
892	rxvt_font_x11::clear ()	891	rxvt_font_x11::clear ()
893	{	892	{
894	if (f)	893	if (f)
895	{	894	{
896	XFreeFont (term->display->display, f);	895	XFreeFont (term->xdisp, f);
897	f = 0;	896	f = 0;
898	}	897	}
899	}	898	}
900		899
901	bool	900	bool
…		…
944	return false;	943	return false;
945		944
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	945	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	946	return true;
948		947
949	// check character against base font bounding box	948	// check wether character overlaps previous/next character
950	int w = xcs->width;	949	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	950	int wcw = WCWIDTH (unicode);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		951
954	careful = w > prop->width;	952	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	953
		954	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	955	return false;
957		956
958	return true;	957	return true;
959	}	958	}
960		959
…		…
1073	void	1072	void
1074	rxvt_font_xft::clear ()	1073	rxvt_font_xft::clear ()
1075	{	1074	{
1076	if (f)	1075	if (f)
1077	{	1076	{
1078	XftFontClose (term->display->display, f);	1077	XftFontClose (term->xdisp, f);
1079	f = 0;	1078	f = 0;
1080	}	1079	}
1081	}	1080	}
1082		1081
1083	rxvt_fontprop	1082	rxvt_fontprop
…		…
1190	XGlyphInfo g;	1189	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1190	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1191
1193	g.width -= g.x;	1192	g.width -= g.x;
1194		1193
1195	int wcw = wcwidth (ch);	1194	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1195	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1196
1198	if (width < g.width ) width = g.width;	1197	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1198	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1199	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1249	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1250	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1251	{
1253	careful = false;	1252	careful = false;
1254		1253
1255	if (!XftCharExists (term->display->display, f, unicode))	1254	if (!XftCharExists (term->xdisp, f, unicode))
1256	return false;	1255	return false;
1257		1256
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1257	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1258	return true;
1260		1259
1261	// check character against base font bounding box	1260	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1261	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1262	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1263	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1265		1264
1266	int w = g.width - g.x;	1265	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1266	int wcw = WCWIDTH (unicode);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1267
1270	careful = w > prop->width;	1268	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1269
		1270	if (careful && !OVERLAP_OK (w, wcw, prop))
		1271	return false;
		1272
		1273	// this weeds out _totally_ broken fonts, or glyphs
		1274	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1275	return false;
1273		1276
1274	return true;	1277	return true;
1275	}	1278	}
1276		1279
…		…
1280	int fg, int bg)	1283	int fg, int bg)
1281	{	1284	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1285	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283		1286
1284	XGlyphInfo extents;	1287	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1288	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1289	XftGlyphSpec *ep = enc;
1287		1290
1288	dTermDisplay;	1291	dTermDisplay;
1289	dTermGC;	1292	dTermGC;
1290		1293
…		…
1303	if (fc != ' ') // skip spaces	1306	if (fc != ' ') // skip spaces
1304	{	1307	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1308	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1309	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1310
		1311
1308	ep->glyph = glyph;	1312	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1313	ep->x = x + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1314	ep->y = y + ascent;
		1315
		1316	if (extents.xOff == 0)
		1317	ep->x = x + cwidth;
		1318
1311	ep++;	1319	ep++;
1312	}	1320	}
1313		1321
1314	x += cwidth;	1322	x += cwidth;
1315	}	1323	}
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1575	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1576	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1577	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1578
1571	XftResult result;	1579	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1580	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1573		1581
1574	FcPatternDestroy (p);	1582	FcPatternDestroy (p);
1575		1583
1576	if (match)	1584	if (match)
1577	{	1585	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs. Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC