[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.94 by root, Thu Feb 2 18:04:46 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
128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
129	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	135	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
130	{ CS_UNICODE, "----r-------c--iso10646-1" },
131	{ CS_UNICODE, "----r-------m--iso10646-1" },
132	#if XFT	136	#if XFT
133	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137		141
138	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
139	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
140	#endif	144	#endif
141		145
		146	// generic font fallback, put this last, as many iso10646 fonts have extents
		147	// specified for all glyphs in the range they cover, but most are simply empty
		148	//{ CS_UNICODE, "----r-------c--iso10646-1" },
		149	//{ CS_UNICODE, "----r-------m--iso10646-1" },
142	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
143	};	151	};
144		152
145	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
146	// pango uses a similar algorithm and doesn't trust the font either.	154	// pango uses a similar algorithm and doesn't trust the font either.
…		…
150	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
151	};	159	};
152		160
153	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154		162
155	#define dTermDisplay Display *disp = term->display->display	163	#define dTermDisplay Display *disp = term->dpy
156	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
157		165
158	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
159		167
160	#if XFT	168	#if XFT
…		…
165	}	173	}
166		174
167	rxvt_drawable::operator XftDraw *()	175	rxvt_drawable::operator XftDraw *()
168	{	176	{
169	if (!xftdrawable)	177	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);	178	xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
171		179
172	return xftdrawable;	180	return xftdrawable;
173	}	181	}
174	#endif	182	#endif
175		183
176	/////////////////////////////////////////////////////////////////////////////	184	/////////////////////////////////////////////////////////////////////////////
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		185
194	static const char *	186	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	187	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	188	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	189	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		190	uint8_t *res = buf;
198		191
199	while (len--)	192	while (len--)
200	{	193	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	194	uint32_t c = FROM_UNICODE (cs, *text++);
202		195
…		…
207	}	200	}
208		201
209	*buf++ = c;	202	*buf++ = c;
210	}	203	}
211		204
212	return (const char *)enc_buf;	205	return (const char *)res;
213	}	206	}
214		207
215	static const XChar2b *	208	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	209	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	210	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	211	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		212	XChar2b *res = buf;
219		213
220	while (len--)	214	while (len--)
221	{	215	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	216	uint32_t c = FROM_UNICODE (cs, *text++);
223		217
…		…
230	buf->byte1 = c >> 8;	224	buf->byte1 = c >> 8;
231	buf->byte2 = c;	225	buf->byte2 = c;
232	buf++;	226	buf++;
233	}	227	}
234		228
235	return (XChar2b *)enc_buf;	229	return res;
236	}	230	}
237		231
238	/////////////////////////////////////////////////////////////////////////////	232	/////////////////////////////////////////////////////////////////////////////
		233
		234	rxvt_font::rxvt_font ()
		235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		236	{
		237	}
239		238
240	void	239	void
241	rxvt_font::set_name (char *name)	240	rxvt_font::set_name (char *name)
242	{	241	{
243	if (this->name == name)	242	if (this->name == name)
…		…
252	{	251	{
253	dTermDisplay;	252	dTermDisplay;
254	dTermGC;	253	dTermGC;
255		254
256	if (color == Color_bg)	255	if (color == Color_bg)
257	XClearArea (disp, d, x, y, w, h, FALSE);	256	XClearArea (disp, d, x, y, w, h, false);
258	else if (color >= 0)	257	else if (color >= 0)
259	{	258	{
260	#if XFT	259	#if XFT
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
262	#else	261	#else
263	XSetForeground (disp, gc, term->pix_colors[color]);	262	XSetForeground (disp, gc, term->pix_colors[color]);
264	XFillRectangle (disp, d, gc, x, y, w, h);	263	XFillRectangle (disp, d, gc, x, y, w, h);
265	#endif	264	#endif
266	}	265	}
267	}	266	}
		267
		268	/////////////////////////////////////////////////////////////////////////////
268		269
269	#include "table/linedraw.h"	270	#include "table/linedraw.h"
270		271
271	struct rxvt_font_default : rxvt_font {	272	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	273	struct rxvt_fontset *fs;
…		…
439	}	440	}
440	}	441	}
441	#if ENABLE_COMBINING	442	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	444	{
		445	min_it (width, 2); // we only support wcwidth up to 2
		446
444	text_t chrs[2];	447	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	448	chrs [1] = NOCHAR;
447		449
448	*chrs = cc->c1;	450	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	451	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	452	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
500	bool slow; // wether this is a proportional font or has other funny characteristics	502	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	503	XFontStruct *f;
502	codeset cs;	504	codeset cs;
503	bool enc2b, encm;	505	bool enc2b, encm;
504		506
505	char get_property (XFontStruct f, const char property, const char repl) const;	507	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);	508	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);	509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	510	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	511	};
510		512
511	char *	513	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	515	{
514	unsigned long value;	516	unsigned long value;
515		517
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	518	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	519	return XGetAtomName (term->dpy, value);
518	else	520	else
519	return rxvt_strdup (repl);	521	return rxvt_strdup (repl);
520	}	522	}
521		523
522	rxvt_fontprop	524	rxvt_fontprop
…		…
528	}	530	}
529		531
530	bool	532	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	533	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	534	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	535	p.width = width != rxvt_fontprop::unset ? width
		536	: avgwidth ? (avgwidth + 1) / 10
		537	: (height + 1) / 2;
534	p.height = height;	538	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	539	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	540	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;	541	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		542
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	548	{
545	unsigned long height;	549	unsigned long height;
546		550
547	#if 0	551	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	552	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549	return false;	553	return false;
550	#else	554	#else
551	height = f->ascent + f->descent;	555	height = f->ascent + f->descent;
552	#endif	556	#endif
553		557
554	unsigned long avgwidth;	558	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	559	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	560	avgwidth = 0;
557		561
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	562	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	563	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		564
561	set_properties (p, height, weight, slant, avgwidth);	565	set_properties (p, height, weight, slant, avgwidth);
562		566
563	free (weight);	567	free (weight);
564	free (slant);	568	free (slant);
…		…
662	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
663		667
664	if (!f)	668	if (!f)
665	return false;	669	return false;
666		670
667	char *new_name = get_property (f, "FONT", name);	671	char *new_name = get_property (f, XA_FONT, name);
668		672
669	if (new_name)	673	if (new_name)
670	set_name (new_name);	674	set_name (new_name);
671	else	675	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	676	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
781	delete [] fonts;	785	delete [] fonts;
782		786
783	if (!f)	787	if (!f)
784	return false;	788	return false;
785		789
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		792
789	if (registry && encoding)	793	if (registry && encoding)
790	{	794	{
791	char charset[64];	795	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	796	snprintf (charset, 64, "%s-%s", registry, encoding);
793		797
794	cs = codeset_from_name (charset);	798	cs = codeset_from_name (charset);
795	}	799	}
796	else	800	else
797	{	801	{
798	const char *charset = get_property (f, "FONT", 0);	802	const char *charset = get_property (f, XA_FONT, 0);
799		803
800	if (!charset)	804	if (!charset)
801	charset = name;	805	charset = name;
802		806
803	int count = 13;	807	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	822	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		823
820	slow = false;	824	slow = false;
821		825
822	#if 1 // only used for slow detection, TODO optimize	826	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	827	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;	828	width = f->max_bounds.width;
827	else	829	else
828	{	830	{
829	slow = true;	831	slow = true;
830		832
…		…
846		848
847	width = 1;	849	width = 1;
848		850
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	851	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	852	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	853	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	854	continue;
855		855
856	// ignore characters we wouldn't use anyways	856	// ignore characters we wouldn't use anyways
857	bool careful;	857	bool careful;
858	if (!has_char (*t, &prop, careful))	858	if (!has_char (*t, &prop, careful))
…		…
862		862
863	XCharStruct g;	863	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	864	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		866
		867	int wcw = WCWIDTH (*t);
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		869
869	if (width < g.width) width = g.width;	870	if (width < g.width) width = g.width;
870	}	871	}
871		872
872	if (cs == CS_UNKNOWN)	873	if (cs == CS_UNKNOWN)
873	{	874	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	892	void
892	rxvt_font_x11::clear ()	893	rxvt_font_x11::clear ()
893	{	894	{
894	if (f)	895	if (f)
895	{	896	{
896	XFreeFont (term->display->display, f);	897	XFreeFont (term->dpy, f);
897	f = 0;	898	f = 0;
898	}	899	}
899	}	900	}
900		901
901	bool	902	bool
…		…
944	return false;	945	return false;
945		946
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	947	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	948	return true;
948		949
949	// check character against base font bounding box	950	// check wether character overlaps previous/next character
950	int w = xcs->width;	951	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	952	int wcw = max (WCWIDTH (unicode), 1);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		953
954	careful = w > prop->width;	954	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	955
		956	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	957	return false;
957		958
958	return true;	959	return true;
959	}	960	}
960		961
…		…
1073	void	1074	void
1074	rxvt_font_xft::clear ()	1075	rxvt_font_xft::clear ()
1075	{	1076	{
1076	if (f)	1077	if (f)
1077	{	1078	{
1078	XftFontClose (term->display->display, f);	1079	XftFontClose (term->dpy, f);
1079	f = 0;	1080	f = 0;
1080	}	1081	}
1081	}	1082	}
1082		1083
1083	rxvt_fontprop	1084	rxvt_fontprop
…		…
1190	XGlyphInfo g;	1191	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1192	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1193
1193	g.width -= g.x;	1194	g.width -= g.x;
1194		1195
1195	int wcw = wcwidth (ch);	1196	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1197	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1198
1198	if (width < g.width ) width = g.width;	1199	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1200	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1201	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1251	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1252	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1253	{
1253	careful = false;	1254	careful = false;
1254		1255
1255	if (!XftCharExists (term->display->display, f, unicode))	1256	if (!XftCharExists (term->dpy, f, unicode))
1256	return false;	1257	return false;
1257		1258
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1260	return true;
1260		1261
1261	// check character against base font bounding box	1262	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1263	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1264	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1265	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265		1266
1266	int w = g.width - g.x;	1267	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1268	int wcw = max (WCWIDTH (unicode), 1);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1269
1270	careful = w > prop->width;	1270	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1271
		1272	if (careful && !OVERLAP_OK (w, wcw, prop))
		1273	return false;
		1274
		1275	// this weeds out _totally_ broken fonts, or glyphs
		1276	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1277	return false;
1273		1278
1274	return true;	1279	return true;
1275	}	1280	}
1276		1281
…		…
1280	int fg, int bg)	1285	int fg, int bg)
1281	{	1286	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283		1288
1284	XGlyphInfo extents;	1289	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1291	XftGlyphSpec *ep = enc;
1287		1292
1288	dTermDisplay;	1293	dTermDisplay;
1289	dTermGC;	1294	dTermGC;
1290		1295
…		…
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1312
1308	ep->glyph = glyph;	1313	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1314	ep->x = x + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1315	ep->y = y + ascent;
		1316
		1317	if (extents.xOff == 0)
		1318	ep->x = x + cwidth;
		1319
1311	ep++;	1320	ep++;
1312	}	1321	}
1313		1322
1314	x += cwidth;	1323	x += cwidth;
1315	}	1324	}
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1576	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1577	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1578	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1579
1571	XftResult result;	1580	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1581	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573		1582
1574	FcPatternDestroy (p);	1583	FcPatternDestroy (p);
1575		1584
1576	if (match)	1585	if (match)
1577	{	1586	{

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.94 by root, Thu Feb 2 18:04:46 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.94 by root, Thu Feb 2 18:04:46 2006 UTC