[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.98 by root, Mon Feb 20 22:42:00 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
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
160	#if XFT
161	rxvt_drawable::~rxvt_drawable ()
162	{
163	if (xftdrawable)
164	XftDrawDestroy (xftdrawable);
165	}
166
167	rxvt_drawable::operator XftDraw *()
168	{
169	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172	return xftdrawable;
173	}
174	#endif
175
176	/////////////////////////////////////////////////////////////////////////////
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		167
194	static const char *	168	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	169	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	170	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	171	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		172	uint8_t *res = buf;
198		173
199	while (len--)	174	while (len--)
200	{	175	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	176	uint32_t c = FROM_UNICODE (cs, *text++);
202		177
…		…
207	}	182	}
208		183
209	*buf++ = c;	184	*buf++ = c;
210	}	185	}
211		186
212	return (const char *)enc_buf;	187	return (const char *)res;
213	}	188	}
214		189
215	static const XChar2b *	190	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	191	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	192	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	193	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		194	XChar2b *res = buf;
219		195
220	while (len--)	196	while (len--)
221	{	197	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	198	uint32_t c = FROM_UNICODE (cs, *text++);
223		199
…		…
230	buf->byte1 = c >> 8;	206	buf->byte1 = c >> 8;
231	buf->byte2 = c;	207	buf->byte2 = c;
232	buf++;	208	buf++;
233	}	209	}
234		210
235	return (XChar2b *)enc_buf;	211	return res;
236	}	212	}
237		213
238	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
239		220
240	void	221	void
241	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
242	{	223	{
243	if (this->name == name)	224	if (this->name == name)
…		…
251	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252	{	233	{
253	dTermDisplay;	234	dTermDisplay;
254	dTermGC;	235	dTermGC;
255		236
256	if (color == Color_bg)	237	if (color < 0 \|\| color == Color_bg)
257	XClearArea (disp, d, x, y, w, h, FALSE);	238	XClearArea (disp, d, x, y, w, h, false);
258	else if (color >= 0)	239	else
259	{	240	{
260	#if XFT	241	#if XFT
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
262	#else	243	#else
263	XSetForeground (disp, gc, term->pix_colors[color]);	244	XSetForeground (disp, gc, term->pix_colors[color]);
264	XFillRectangle (disp, d, gc, x, y, w, h);	245	XFillRectangle (disp, d, gc, x, y, w, h);
265	#endif	246	#endif
266	}	247	}
267	}	248	}
		249
		250	/////////////////////////////////////////////////////////////////////////////
268		251
269	#include "table/linedraw.h"	252	#include "table/linedraw.h"
270		253
271	struct rxvt_font_default : rxvt_font {	254	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	255	struct rxvt_fontset *fs;
…		…
439	}	422	}
440	}	423	}
441	#if ENABLE_COMBINING	424	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	426	{
		427	min_it (width, 2); // we only support wcwidth up to 2
		428
444	text_t chrs[2];	429	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	430	chrs [1] = NOCHAR;
447		431
448	*chrs = cc->c1;	432	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	434	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
500	bool slow; // wether this is a proportional font or has other funny characteristics	484	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	485	XFontStruct *f;
502	codeset cs;	486	codeset cs;
503	bool enc2b, encm;	487	bool enc2b, encm;
504		488
505	char get_property (XFontStruct f, const char property, const char repl) const;	489	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);	490	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);	491	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	492	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	493	};
510		494
511	char *	495	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	496	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	497	{
514	unsigned long value;	498	unsigned long value;
515		499
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	500	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	501	return XGetAtomName (term->dpy, value);
518	else	502	else
519	return rxvt_strdup (repl);	503	return rxvt_strdup (repl);
520	}	504	}
521		505
522	rxvt_fontprop	506	rxvt_fontprop
…		…
528	}	512	}
529		513
530	bool	514	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	515	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	516	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	517	p.width = width != rxvt_fontprop::unset ? width
		518	: avgwidth ? (avgwidth + 1) / 10
		519	: (height + 1) / 2;
534	p.height = height;	520	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	521	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	522	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;	523	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		524
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	529	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	530	{
545	unsigned long height;	531	unsigned long height;
546		532
547	#if 0	533	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	534	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549	return false;	535	return false;
550	#else	536	#else
551	height = f->ascent + f->descent;	537	height = f->ascent + f->descent;
552	#endif	538	#endif
553		539
554	unsigned long avgwidth;	540	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	541	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	542	avgwidth = 0;
557		543
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	544	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	545	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		546
561	set_properties (p, height, weight, slant, avgwidth);	547	set_properties (p, height, weight, slant, avgwidth);
562		548
563	free (weight);	549	free (weight);
564	free (slant);	550	free (slant);
…		…
662	f = XLoadQueryFont (disp, name);	648	f = XLoadQueryFont (disp, name);
663		649
664	if (!f)	650	if (!f)
665	return false;	651	return false;
666		652
667	char *new_name = get_property (f, "FONT", name);	653	char *new_name = get_property (f, XA_FONT, name);
668		654
669	if (new_name)	655	if (new_name)
670	set_name (new_name);	656	set_name (new_name);
671	else	657	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	658	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
781	delete [] fonts;	767	delete [] fonts;
782		768
783	if (!f)	769	if (!f)
784	return false;	770	return false;
785		771
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	772	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	773	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		774
789	if (registry && encoding)	775	if (registry && encoding)
790	{	776	{
791	char charset[64];	777	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	778	snprintf (charset, 64, "%s-%s", registry, encoding);
793		779
794	cs = codeset_from_name (charset);	780	cs = codeset_from_name (charset);
795	}	781	}
796	else	782	else
797	{	783	{
798	const char *charset = get_property (f, "FONT", 0);	784	const char *charset = get_property (f, XA_FONT, 0);
799		785
800	if (!charset)	786	if (!charset)
801	charset = name;	787	charset = name;
802		788
803	int count = 13;	789	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	804	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		805
820	slow = false;	806	slow = false;
821		807
822	#if 1 // only used for slow detection, TODO optimize	808	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	809	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;	810	width = f->max_bounds.width;
827	else	811	else
828	{	812	{
829	slow = true;	813	slow = true;
830		814
…		…
846		830
847	width = 1;	831	width = 1;
848		832
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	833	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	834	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	835	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	836	continue;
855		837
856	// ignore characters we wouldn't use anyways	838	// ignore characters we wouldn't use anyways
857	bool careful;	839	bool careful;
858	if (!has_char (*t, &prop, careful))	840	if (!has_char (*t, &prop, careful))
…		…
862		844
863	XCharStruct g;	845	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	846	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	847	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		848
		849	int wcw = WCWIDTH (*t);
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		851
869	if (width < g.width) width = g.width;	852	if (width < g.width) width = g.width;
870	}	853	}
871		854
872	if (cs == CS_UNKNOWN)	855	if (cs == CS_UNKNOWN)
873	{	856	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	874	void
892	rxvt_font_x11::clear ()	875	rxvt_font_x11::clear ()
893	{	876	{
894	if (f)	877	if (f)
895	{	878	{
896	XFreeFont (term->display->display, f);	879	XFreeFont (term->dpy, f);
897	f = 0;	880	f = 0;
898	}	881	}
899	}	882	}
900		883
901	bool	884	bool
…		…
944	return false;	927	return false;
945		928
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	929	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	930	return true;
948		931
949	// check character against base font bounding box	932	// check wether character overlaps previous/next character
950	int w = xcs->width;	933	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	934	int wcw = max (WCWIDTH (unicode), 1);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		935
954	careful = w > prop->width;	936	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	937
		938	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	939	return false;
957		940
958	return true;	941	return true;
959	}	942	}
960		943
…		…
1073	void	1056	void
1074	rxvt_font_xft::clear ()	1057	rxvt_font_xft::clear ()
1075	{	1058	{
1076	if (f)	1059	if (f)
1077	{	1060	{
1078	XftFontClose (term->display->display, f);	1061	XftFontClose (term->dpy, f);
1079	f = 0;	1062	f = 0;
1080	}	1063	}
1081	}	1064	}
1082		1065
1083	rxvt_fontprop	1066	rxvt_fontprop
…		…
1190	XGlyphInfo g;	1173	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1174	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1175
1193	g.width -= g.x;	1176	g.width -= g.x;
1194		1177
1195	int wcw = wcwidth (ch);	1178	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1179	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1180
1198	if (width < g.width ) width = g.width;	1181	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1182	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1183	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1233	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1234	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1235	{
1253	careful = false;	1236	careful = false;
1254		1237
1255	if (!XftCharExists (term->display->display, f, unicode))	1238	if (!XftCharExists (term->dpy, f, unicode))
1256	return false;	1239	return false;
1257		1240
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1241	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1242	return true;
1260		1243
1261	// check character against base font bounding box	1244	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1245	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1246	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1247	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265		1248
1266	int w = g.width - g.x;	1249	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1250	int wcw = max (WCWIDTH (unicode), 1);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1251
1270	careful = w > prop->width;	1252	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1253
		1254	if (careful && !OVERLAP_OK (w, wcw, prop))
		1255	return false;
		1256
		1257	// this weeds out _totally_ broken fonts, or glyphs
		1258	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1259	return false;
1273		1260
1274	return true;	1261	return true;
1275	}	1262	}
1276		1263
1277	void	1264	void
1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279	const text_t *text, int len,	1266	const text_t *text, int len,
1280	int fg, int bg)	1267	int fg, int bg)
1281	{	1268	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284	XGlyphInfo extents;	1269	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1271	XftGlyphSpec *ep = enc;
1287		1272
1288	dTermDisplay;	1273	dTermDisplay;
1289	dTermGC;	1274	dTermGC;
		1275
		1276	int w = term->fwidth * len;
		1277	int h = term->fheight;
		1278
		1279	bool buffered = 0
		1280	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
		1281	\|\| !term->am_transparent // we aren't transparent
		1282	\|\| term->am_pixmap_trans // we have a pixmap
		1283	#endif
		1284	\|\| bg >= 0; // we don't use a transparent bg
1290		1285
1291	// cut trailing spaces	1286	// cut trailing spaces
1292	while (len && text [len - 1] == ' ')	1287	while (len && text [len - 1] == ' ')
1293	len--;	1288	len--;
		1289
		1290	int x_ = buffered ? 0 : x;
		1291	int y_ = buffered ? 0 : y;
1294		1292
1295	while (len)	1293	while (len)
1296	{	1294	{
1297	int cwidth = term->fwidth;	1295	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1296	FcChar32 fc = *text++; len--;
…		…
1304	{	1302	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1303	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1304	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1305
1308	ep->glyph = glyph;	1306	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1307	ep->x = x_ + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1308	ep->y = y_ + ascent;
		1309
		1310	if (extents.xOff == 0)
		1311	ep->x = x_ + cwidth;
		1312
1311	ep++;	1313	ep++;
1312	}	1314	}
1313		1315
1314	x += cwidth;	1316	x_ += cwidth;
		1317	}
		1318
		1319	if (buffered)
1315	}	1320	{
1316
1317	if (ep != enc)	1321	if (ep != enc)
		1322	{
		1323	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1324
		1325	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
		1326	if (bg < 0 && term->am_pixmap_trans)
		1327	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
		1328	else if (bg < 0 && term->bgPixmap.pixmap)
		1329	{
		1330	XGCValues gcv;
		1331
		1332	gcv.fill_style = FillTiled;
		1333	gcv.tile = term->pixmap;
		1334	gcv.ts_x_origin = -x;
		1335	gcv.ts_y_origin = -y;
		1336
		1337	GC gc2 = XCreateGC (disp, d2,
		1338	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1339	&gcv);
		1340
		1341	XFillRectangle (disp, d2, gc2, 0, 0, w, h);
		1342
		1343	XFreeGC (disp, gc2);
		1344	}
		1345	else
		1346	#endif
		1347	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1348
		1349	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1350	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1351	}
		1352	else
		1353	clear_rect (d, x, y, w, h, bg);
		1354	}
		1355	else
		1356	{
		1357	clear_rect (d, x, y, w, h, bg);
1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1358	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1359	}
1319	}	1360	}
		1361
1320	#endif	1362	#endif
1321		1363
1322	/////////////////////////////////////////////////////////////////////////////	1364	/////////////////////////////////////////////////////////////////////////////
1323		1365
1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1366	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1609	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1610	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1611	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1612
1571	XftResult result;	1613	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1614	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573		1615
1574	FcPatternDestroy (p);	1616	FcPatternDestroy (p);
1575		1617
1576	if (match)	1618	if (match)
1577	{	1619	{

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.98 by root, Mon Feb 20 22:42:00 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.98 by root, Mon Feb 20 22:42:00 2006 UTC