[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.133 by root, Wed Jan 23 06:49:30 2008 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	*
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	24	#include "rxvtutil.h"
26	#include "rxvtfont.h"	25	#include "rxvtfont.h"
27		26
28	#include <cstdlib>	27	#include <cstdlib>
29	#include <wchar.h>	28
30	#include <inttypes.h>	29	#include <inttypes.h>
31		30
32	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width	31	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
		32	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
		33
		34	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
		35	(prop)->slant >= rxvt_fontprop::italic \
		36	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
		37	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
		38	))
33		39
34	const struct rxvt_fallback_font {	40	const struct rxvt_fallback_font {
35	codeset cs;	41	codeset cs;
36	const char *name;	42	const char *name;
37	} fallback_fonts[] = {	43	} fallback_fonts[] = {
38	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	44	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
39	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	45	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
40	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
41		47
42	#if ENCODING_EU	48	#if ENCODING_EU
43	// cyrillic	49	// cyrillic
44	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	50	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
45	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	51	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
46		52
47	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	53	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
48	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	54	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
49	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	55	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
50	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	56	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
51	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	57	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
57	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	63	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
58	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	64	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
59	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	65	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
60		66
61	# if XFT	67	# if XFT
62	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	68	{ CS_KOI8_U, "xft::lang=ru" },
63		69
64	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	70	{ CS_ISO8859_5, "xft::lang=ru" },
65	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	71	{ CS_ISO8859_6, "xft::lang=ar" },
66	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	72	{ CS_ISO8859_7, "xft::lang=el" },
67	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	73	{ CS_ISO8859_8, "xft::lang=he" },
68	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	74	{ CS_ISO8859_9, "xft::lang=tr" },
69	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	75	{ CS_ISO8859_10, "xft::lang=se" },
70	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	76	{ CS_ISO8859_11, "xft::lang=th" },
71	# endif	77	# endif
72	#endif	78	#endif
73		79
74	// japanese	80	// japanese
75	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
76	# if XFT	82	# if XFT
77	// prefer xft for complex scripts	83	// prefer xft for complex scripts
78	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	84	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82	# endif	88	# endif
83	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
84	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
85	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	91	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
86	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	92	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
90		96
91	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	97	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
92	# if XFT	98	# if XFT
93	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	99	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
94	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	100	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
95	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	101	{ CS_GBK_0, "xft::lang=zh" },
96	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	102	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	104	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	106	{ CS_GB2312_1980_0, "xft::lang=zh" },
101	# endif	107	# endif
102	{ CS_GBK_0, "-----------c--gbk-0" },	108	{ CS_GBK_0, "-----------c--gbk-0" },
103	{ CS_BIG5, "-----------c-*-big5-0" },	109	{ CS_BIG5, "-----------c-*-big5-0" },
104	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	110	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
105	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	111	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
118	#if ENCODING_KR	124	#if ENCODING_KR
119	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	125	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
120	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
121	# if XFT	127	# if XFT
122	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	128	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124	# endif	130	# endif
125	#endif	131	#endif
126		132
127	// generic font fallback
128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	133	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
129	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	134	//{ 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	135	#if XFT
133	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	136	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	138	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137		140
138	// FreeMono is usually uglier than x fonts, so try last only.	141	// FreeMono is usually uglier than x fonts, so try after the others
139	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	142	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
140	#endif	143	#endif
141		144
		145	// generic font fallback, put this last, as many iso10646 fonts have extents
		146	// specified for all glyphs in the range they cover, but most are simply empty
		147	//{ CS_UNICODE, "----r-------c--iso10646-1" },
		148	//{ CS_UNICODE, "----r-------m--iso10646-1" },
142	{ CS_UNKNOWN, 0 }	149	{ CS_UNKNOWN, 0 }
143	};	150	};
144		151
145	// these characters are used to guess the font height and width	152	// these characters are used to guess the font height and width
146	// pango uses a similar algorithm and doesn't trust the font either.	153	// pango uses a similar algorithm and doesn't trust the font either.
…		…
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->dpy
156	#define dTermGC GC gc = term->gc	163	#define dTermGC GC gc = term->gc
157		164
158	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
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		166
194	static const char *	167	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	168	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	169	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	170	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		171	uint8_t *res = buf;
198		172
199	while (len--)	173	while (len--)
200	{	174	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	175	uint32_t c = FROM_UNICODE (cs, *text++);
202		176
…		…
207	}	181	}
208		182
209	*buf++ = c;	183	*buf++ = c;
210	}	184	}
211		185
212	return (const char *)enc_buf;	186	return (const char *)res;
213	}	187	}
214		188
215	static const XChar2b *	189	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	190	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	191	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	192	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		193	XChar2b *res = buf;
219		194
220	while (len--)	195	while (len--)
221	{	196	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	197	uint32_t c = FROM_UNICODE (cs, *text++);
223		198
…		…
230	buf->byte1 = c >> 8;	205	buf->byte1 = c >> 8;
231	buf->byte2 = c;	206	buf->byte2 = c;
232	buf++;	207	buf++;
233	}	208	}
234		209
235	return (XChar2b *)enc_buf;	210	return res;
236	}	211	}
237		212
238	/////////////////////////////////////////////////////////////////////////////	213	/////////////////////////////////////////////////////////////////////////////
		214
		215	rxvt_font::rxvt_font ()
		216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		217	{
		218	}
239		219
240	void	220	void
241	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name)
242	{	222	{
243	if (this->name == name)	223	if (this->name == name)
…		…
250	void	230	void
251	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252	{	232	{
253	dTermDisplay;	233	dTermDisplay;
254	dTermGC;	234	dTermGC;
255		235
256	if (color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
257	XClearArea (disp, d, x, y, w, h, FALSE);	237	XClearArea (disp, d, x, y, w, h, false);
258	else if (color >= 0)	238	else if (color >= 0)
259	{	239	{
260	#if XFT	240	#if XFT
		241	bool done = false;
		242
		243	# ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
		245	{
		246	Picture dst = XftDrawPicture (d);
		247
		248	if (dst != 0)
		249	{
		250	XClearArea (disp, d, x, y, w, h, false);
		251	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		252	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		253	done = true;
		254	}
		255	}
		256	# endif
		257	if (!done)
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	258	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		259
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	}
268		266
269	#include "table/linedraw.h"	267	/////////////////////////////////////////////////////////////////////////////
270		268
271	struct rxvt_font_default : rxvt_font {	269	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	270	struct rxvt_fontset *fs;
273		271
274	rxvt_font_default (rxvt_fontset *fs)	272	rxvt_font_default (rxvt_fontset *fs)
…		…
287	p.slant = rxvt_fontprop::roman;	285	p.slant = rxvt_fontprop::roman;
288		286
289	return p;	287	return p;
290	}	288	}
291		289
292	bool load (const rxvt_fontprop &prop)	290	bool load (const rxvt_fontprop &prop, bool force_prop)
293	{	291	{
294	width = 1; height = 1;	292	width = 1; height = 1;
295	ascent = 1; descent = 0;	293	ascent = 1; descent = 0;
296		294
297	set_name (strdup ("built-in support font"));	295	set_name (strdup ("built-in support font"));
…		…
310	return false;	308	return false;
311		309
312	if (unicode <= 0x009f)	310	if (unicode <= 0x009f)
313	return true;	311	return true;
314		312
		313	#ifdef BUILTIN_GLYPHS
315	if (unicode >= 0x2500 && unicode <= 0x259f &&	314	if (unicode >= 0x2500 && unicode <= 0x259f &&
316	!term->option (Opt_skipBuiltinGlyphs))	315	!term->option (Opt_skipBuiltinGlyphs))
317	return true;	316	return true;
		317	#endif
318		318
319	if (IS_COMPOSE (unicode))	319	if (IS_COMPOSE (unicode))
320	return true;	320	return true;
321		321
322	switch (unicode)	322	switch (unicode)
…		…
358	;	358	;
359		359
360	int width = text - tp;	360	int width = text - tp;
361	int fwidth = term->fwidth * width;	361	int fwidth = term->fwidth * width;
362		362
		363	#ifdef BUILTIN_GLYPHS
363	if (0x2500 <= t && t <= 0x259f)	364	if (0x2500 <= t && t <= 0x259f)
364	{	365	{
		366	# include "table/linedraw.h"
365	uint16_t offs = linedraw_offs[t - 0x2500];	367	uint16_t offs = linedraw_offs[t - 0x2500];
366	uint32_t *a = linedraw_command + (offs >> 4);	368	uint32_t *a = linedraw_command + (offs >> 4);
367	uint32_t *b = a + (offs & 15);	369	uint32_t *b = a + (offs & 15);
368		370
369	int W = fwidth;	371	int W = fwidth;
…		…
407		409
408	case 1: // rectangle, possibly stippled	410	case 1: // rectangle, possibly stippled
409	if (a)	411	if (a)
410	{	412	{
411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	413	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412		414
413	gcv.fill_style = FillStippled;	415	gcv.fill_style = FillStippled;
414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	416	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415	gcv.ts_x_origin = x;	417	gcv.ts_x_origin = x;
416	gcv.ts_y_origin = y;	418	gcv.ts_y_origin = y;
417		419
…		…
436	(a - 1) * 9064, (b - 1) 90*64);	438	(a - 1) * 9064, (b - 1) 90*64);
437	break;	439	break;
438	}	440	}
439	}	441	}
440	}	442	}
		443	#else
		444	if (0)
		445	;
		446	#endif
441	#if ENABLE_COMBINING	447	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	448	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	449	{
		450	min_it (width, 2); // we only support wcwidth up to 2
		451
444	text_t chrs[2];	452	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	453	chrs [1] = NOCHAR;
447		454
448	*chrs = cc->c1;	455	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	456	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	457	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
457	*chrs = cc->c2;	464	*chrs = cc->c2;
458	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	465	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459	? f1	466	? f1
460	: (*fs)[fs->find_font (cc->c2)];	467	: (*fs)[fs->find_font (cc->c2)];
461		468
462	f2->draw (d, x, y, chrs, width, fg, -1);	469	f2->draw (d, x, y, chrs, width, fg, Color_none);
463	}	470	}
464	}	471	}
465	#endif	472	#endif
466	else	473	else
467	switch (t)	474	switch (t)
…		…
487		494
488	void clear ();	495	void clear ();
489		496
490	rxvt_fontprop properties ();	497	rxvt_fontprop properties ();
491		498
492	bool load (const rxvt_fontprop &prop);	499	bool load (const rxvt_fontprop &prop, bool force_prop);
493		500
494	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	501	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495		502
496	void draw (rxvt_drawable &d, int x, int y,	503	void draw (rxvt_drawable &d, int x, int y,
497	const text_t *text, int len,	504	const text_t *text, int len,
498	int fg, int bg);	505	int fg, int bg);
499		506
500	bool slow; // wether this is a proportional font or has other funny characteristics	507	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	508	XFontStruct *f;
502	codeset cs;
503	bool enc2b, encm;	509	bool enc2b, encm;
504		510
505	char get_property (XFontStruct f, const char property, const char repl) const;	511	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);	512	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);	513	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	514	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	515	};
510		516
511	char *	517	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	518	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	519	{
514	unsigned long value;	520	unsigned long value;
515		521
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	522	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	523	return XGetAtomName (term->dpy, value);
518	else	524	else
519	return rxvt_strdup (repl);	525	return repl ? strdup (repl) : 0;
520	}	526	}
521		527
522	rxvt_fontprop	528	rxvt_fontprop
523	rxvt_font_x11::properties ()	529	rxvt_font_x11::properties ()
524	{	530	{
…		…
528	}	534	}
529		535
530	bool	536	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	537	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	538	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	539	p.width = width != rxvt_fontprop::unset ? width
		540	: avgwidth ? (avgwidth + 1) / 10
		541	: (height + 1) / 2;
534	p.height = height;	542	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	543	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	544	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;	545	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		546
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	551	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	552	{
545	unsigned long height;	553	unsigned long height;
546		554
547	#if 0	555	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	556	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549	return false;	557	return false;
550	#else	558	#else
551	height = f->ascent + f->descent;	559	height = f->ascent + f->descent;
552	#endif	560	#endif
553		561
554	unsigned long avgwidth;	562	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	563	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	564	avgwidth = 0;
557		565
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	566	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	567	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		568
561	set_properties (p, height, weight, slant, avgwidth);	569	set_properties (p, height, weight, slant, avgwidth);
562		570
563	free (weight);	571	free (weight);
564	free (slant);	572	free (slant);
…		…
604	return false;	612	return false;
605	}	613	}
606		614
607	// fix the size of scalable fonts	615	// fix the size of scalable fonts
608	static bool	616	static bool
609	replace_field (char buf, const char name, int index, const char old, const char *replace)	617	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
610	{	618	{
611	int slashes = 0;	619	int slashes = 0;
612	const char field, end;	620	const char field, end;
613		621
614	for (const char c = name; c; c++)	622	for (const char c = name; c; c++)
…		…
624	break;	632	break;
625	}	633	}
626		634
627	if (slashes >= 13 && (!old \|\| *field == old))	635	if (slashes >= 13 && (!old \|\| *field == old))
628	{	636	{
629	// TODO: check for overflow in font-name	637	size_t len = field - name;
630	strncpy (buf, name, field - name);	638	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
631	buf += field - name;	639	memcpy (*ptr, name, len);
632	strcpy (buf, replace);	640	strcpy (*ptr + len, replace);
633	strcat (buf, end);	641	strcat (*ptr, end);
634		642
635	return true;	643	return true;
636	}	644	}
637	else	645	else
638	{	646	{
639	strcpy (buf, name);	647	*ptr = strdup (name);
640		648
641	return false;	649	return false;
642	}	650	}
643	}	651	}
644		652
645	bool	653	bool
646	rxvt_font_x11::load (const rxvt_fontprop &prop)	654	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647	{	655	{
648	dTermDisplay;	656	dTermDisplay;
649		657
650	clear ();	658	clear ();
651		659
652	char field_str[64]; // enough for 128 bits	660	char field_str[64]; // enough for 128 bits
653		661
654	// first morph the font if required	662	// first morph the font if required
655	if (prop.weight != rxvt_fontprop::unset	663	if (force_prop)
656	\|\| prop.slant != rxvt_fontprop::unset)
657	{	664	{
658	char fname[1024];	665	char *fname;
659		666
660	if (name[0] != '-')	667	if (name[0] != '-')
661	{	668	{
662	f = XLoadQueryFont (disp, name);	669	f = XLoadQueryFont (disp, name);
663		670
664	if (!f)	671	if (!f)
665	return false;	672	return false;
666		673
667	char *new_name = get_property (f, "FONT", name);	674	char *new_name = get_property (f, XA_FONT, name);
668		675
669	if (new_name)	676	if (new_name)
670	set_name (new_name);	677	set_name (new_name);
671	else	678	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	679	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
675	f = 0;	682	f = 0;
676	}	683	}
677		684
678	if (prop.weight != rxvt_fontprop::unset)	685	if (prop.weight != rxvt_fontprop::unset)
679	{	686	{
680	replace_field (fname, name, 2, 0,	687	replace_field (&fname, name, 2, 0,
681	prop.weight < rxvt_fontprop::bold	688	prop.weight < rxvt_fontprop::bold
682	? "medium" : "bold");	689	? "medium" : "bold");
683	set_name (strdup (fname));	690	set_name (fname);
684	}	691	}
685		692
686	if (prop.slant != rxvt_fontprop::unset)	693	if (prop.slant != rxvt_fontprop::unset)
687	{	694	{
688	replace_field (fname, name, 3, 0,	695	replace_field (&fname, name, 3, 0,
689	prop.slant < rxvt_fontprop::italic	696	prop.slant < rxvt_fontprop::italic
690	? "r" : "i"); // TODO: handle "o"blique, too	697	? "r" : "i"); // TODO: handle "o"blique, too
691	set_name (strdup (fname));	698	set_name (fname);
692	}	699	}
693	}	700	}
694		701
695	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	702	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
696	? 0 : prop.height);	703	? 0 : prop.height);
…		…
721	font_weight *fonts = new font_weight[count];	728	font_weight *fonts = new font_weight[count];
722		729
723	for (int i = 0; i < count; i++)	730	for (int i = 0; i < count; i++)
724	{	731	{
725	rxvt_fontprop p;	732	rxvt_fontprop p;
726	char fname[1024];	733	char *fname;
727		734
728	int diff = 0;	735	int diff = 0;
729		736
730	if (replace_field (fname, list[i], 6, '0', field_str))	737	if (replace_field (&fname, list[i], 6, '0', field_str))
731	diff += 10; // slightly penalize scalable fonts	738	diff += 10; // slightly penalize scalable fonts
		739	else
		740	{
		741	free (fname);
732	else if (replace_field (fname, list[i], 11, '0', "0"))	742	if (replace_field (&fname, list[i], 11, '0', "0"))
733	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	743	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		744	}
734		745
735	if (!set_properties (p, fname))	746	if (!set_properties (p, fname))
736	continue;	747	continue;
737		748
738	if (prop.height != rxvt_fontprop::unset	749	if (prop.height != rxvt_fontprop::unset
…		…
742	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	753	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
743	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	754	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
744	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	755	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
745	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	756	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
746		757
747	fonts[i].name = strdup (fname);	758	fonts[i].name = fname;
748	fonts[i].diff = diff;	759	fonts[i].diff = diff;
749	}	760	}
750		761
751	XFreeFontNames (list);	762	XFreeFontNames (list);
752		763
…		…
781	delete [] fonts;	792	delete [] fonts;
782		793
783	if (!f)	794	if (!f)
784	return false;	795	return false;
785		796
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	797	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	798	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		799
789	if (registry && encoding)	800	if (registry && encoding)
790	{	801	{
791	char charset[64];	802	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	803	snprintf (charset, 64, "%s-%s", registry, encoding);
793		804
794	cs = codeset_from_name (charset);	805	cs = codeset_from_name (charset);
795	}	806	}
796	else	807	else
797	{	808	{
798	const char *charset = get_property (f, "FONT", 0);	809	const char *charset = get_property (f, XA_FONT, 0);
799		810
800	if (!charset)	811	if (!charset)
801	charset = name;	812	charset = name;
802		813
803	int count = 13;	814	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	829	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		830
820	slow = false;	831	slow = false;
821		832
822	#if 1 // only used for slow detection, TODO optimize	833	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	834	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;	835	width = f->max_bounds.width;
827	else	836	else
828	{	837	{
829	slow = true;	838	slow = true;
830		839
831	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	840	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832		841
833	if (encm)	842	if (encm)
834	N += (f->max_byte1 - f->min_byte1)	843	N += (f->max_byte1 - f->min_byte1)
835	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	844	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836		845
837	while (N)	846	while (N)
838	{	847	{
839	if (f->per_char[N].width > width)	848	if (f->per_char[N].width > width)
840	width = f->per_char[N].width;	849	width = f->per_char[N].width;
841		850
…		…
846		855
847	width = 1;	856	width = 1;
848		857
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	858	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	859	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	860	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	861	continue;
855		862
856	// ignore characters we wouldn't use anyways	863	// ignore characters we wouldn't use anyways
857	bool careful;	864	bool careful;
858	if (!has_char (*t, &prop, careful))	865	if (!has_char (*t, &prop, careful))
…		…
862		869
863	XCharStruct g;	870	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	871	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	872	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		873
		874	int wcw = WCWIDTH (*t);
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	875	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		876
869	if (width < g.width) width = g.width;	877	if (width < g.width) width = g.width;
870	}	878	}
871		879
872	if (cs == CS_UNKNOWN)	880	if (cs == CS_UNKNOWN)
873	{	881	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	882	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	899	void
892	rxvt_font_x11::clear ()	900	rxvt_font_x11::clear ()
893	{	901	{
894	if (f)	902	if (f)
895	{	903	{
896	XFreeFont (term->display->display, f);	904	XFreeFont (term->dpy, f);
897	f = 0;	905	f = 0;
898	}	906	}
899	}	907	}
900		908
901	bool	909	bool
…		…
944	return false;	952	return false;
945		953
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	954	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	955	return true;
948		956
949	// check character against base font bounding box	957	// check wether character overlaps previous/next character
950	int w = xcs->width;	958	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	959	int wcw = max (WCWIDTH (unicode), 1);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		960
954	careful = w > prop->width;	961	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	962
		963	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	964	return false;
957		965
958	return true;	966	return true;
959	}	967	}
960		968
…		…
994	else	1002	else
995	{	1003	{
996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1004	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997		1005
998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1006	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
999		1007
1000	if (slow)	1008	if (slow)
1001	{	1009	{
1002	do	1010	do
1003	{	1011	{
1004	if (xc->byte1 \|\| xc->byte2)	1012	if (xc->byte1 \|\| xc->byte2)
…		…
1026	else	1034	else
1027	{	1035	{
1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1036	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029		1037
1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1038	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1031		1039
1032	if (slow)	1040	if (slow)
1033	{	1041	{
1034	do	1042	do
1035	{	1043	{
1036	if (*xc)	1044	if (*xc)
…		…
1056		1064
1057	void clear ();	1065	void clear ();
1058		1066
1059	rxvt_fontprop properties ();	1067	rxvt_fontprop properties ();
1060		1068
1061	bool load (const rxvt_fontprop &prop);	1069	bool load (const rxvt_fontprop &prop, bool force_prop);
1062		1070
1063	void draw (rxvt_drawable &d, int x, int y,	1071	void draw (rxvt_drawable &d, int x, int y,
1064	const text_t *text, int len,	1072	const text_t *text, int len,
1065	int fg, int bg);	1073	int fg, int bg);
1066		1074
1067	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1075	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068		1076
1069	protected:	1077	protected:
1070	XftFont *f;	1078	XftFont *f;
1071	};	1079	};
1072		1080
1073	void	1081	void
1074	rxvt_font_xft::clear ()	1082	rxvt_font_xft::clear ()
1075	{	1083	{
1076	if (f)	1084	if (f)
1077	{	1085	{
1078	XftFontClose (term->display->display, f);	1086	XftFontClose (term->dpy, f);
1079	f = 0;	1087	f = 0;
1080	}	1088	}
1081	}	1089	}
1082		1090
1083	rxvt_fontprop	1091	rxvt_fontprop
…		…
1099		1107
1100	return p;	1108	return p;
1101	}	1109	}
1102		1110
1103	bool	1111	bool
1104	rxvt_font_xft::load (const rxvt_fontprop &prop)	1112	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105	{	1113	{
1106	dTermDisplay;	1114	dTermDisplay;
1107		1115
1108	clear ();	1116	clear ();
1109		1117
…		…
1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1126	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1127	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1128	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121		1129
1122	if (prop.weight != rxvt_fontprop::unset	1130	if (prop.weight != rxvt_fontprop::unset
1123	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1131	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1132	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125		1133
1126	if (prop.slant != rxvt_fontprop::unset	1134	if (prop.slant != rxvt_fontprop::unset
1127	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1135	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1136	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129		1137
1130	#if 0 // clipping unfortunately destroys our precious double-width-characters	1138	#if 0 // clipping unfortunately destroys our precious double-width-characters
1131	// clip width, we can't do better, or can we?	1139	// clip width, we can't do better, or can we?
1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1140	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1190	XGlyphInfo g;	1198	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1199	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1200
1193	g.width -= g.x;	1201	g.width -= g.x;
1194		1202
1195	int wcw = wcwidth (ch);	1203	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1204	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1205
1198	if (width < g.width ) width = g.width;	1206	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1207	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1208	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1258	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1259	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1260	{
1253	careful = false;	1261	careful = false;
1254		1262
1255	if (!XftCharExists (term->display->display, f, unicode))	1263	if (!XftCharExists (term->dpy, f, unicode))
1256	return false;	1264	return false;
1257		1265
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1266	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1267	return true;
1260		1268
1261	// check character against base font bounding box	1269	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1270	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1271	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1272	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265		1273
1266	int w = g.width - g.x;	1274	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1275	int wcw = max (WCWIDTH (unicode), 1);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1276
1270	careful = w > prop->width;	1277	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1278
		1279	if (careful && !OVERLAP_OK (w, wcw, prop))
		1280	return false;
		1281
		1282	// this weeds out _totally_ broken fonts, or glyphs
		1283	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1284	return false;
1273		1285
1274	return true;	1286	return true;
1275	}	1287	}
1276		1288
1277	void	1289	void
1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1290	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279	const text_t *text, int len,	1291	const text_t *text, int len,
1280	int fg, int bg)	1292	int fg, int bg)
1281	{	1293	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284	XGlyphInfo extents;	1294	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1295	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1296	XftGlyphSpec *ep = enc;
1287		1297
1288	dTermDisplay;	1298	dTermDisplay;
1289	dTermGC;	1299	dTermGC;
		1300
		1301	int w = term->fwidth * len;
		1302	int h = term->fheight;
		1303
		1304	/*
		1305	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1306	* good idea from the perspective of packaging for wide variety of user configs.
		1307	*/
		1308	bool buffered = bg >= Color_transparent;
		1309	#ifdef FORCE_UNBUFFERED_XFT
		1310	buffered = false;
		1311	#endif
1290		1312
1291	// cut trailing spaces	1313	// cut trailing spaces
1292	while (len && text [len - 1] == ' ')	1314	while (len && text [len - 1] == ' ')
1293	len--;	1315	len--;
1294		1316
		1317	int x_ = buffered ? 0 : x;
		1318	int y_ = buffered ? 0 : y;
		1319
1295	while (len)	1320	while (len)
1296	{	1321	{
1297	int cwidth = term->fwidth;	1322	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1323	FcChar32 fc = *text++; len--;
1299		1324
1300	while (len && *text == NOCHAR)	1325	while (len && *text == NOCHAR)
1301	text++, len--, cwidth += term->fwidth;	1326	text++, len--, cwidth += term->fwidth;
1302		1327
1303	if (fc != ' ') // skip spaces	1328	if (fc != ' ') // skip spaces
1304	{	1329	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1330	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1331	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1332
1308	ep->glyph = glyph;	1333	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1334	ep->x = x_ + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1335	ep->y = y_ + ascent;
		1336
		1337	if (extents.xOff == 0)
		1338	ep->x = x_ + cwidth;
		1339
1311	ep++;	1340	ep++;
1312	}	1341	}
1313		1342
1314	x += cwidth;	1343	x_ += cwidth;
		1344	}
		1345
		1346	if (buffered)
1315	}	1347	{
1316
1317	if (ep != enc)	1348	if (ep != enc)
		1349	{
		1350	bool back_rendered = false;
		1351	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1352
		1353	#ifdef HAVE_BG_PIXMAP
		1354	if (term->bgPixmap.pixmap)
		1355	{
		1356	Picture dst = 0;
		1357
		1358	if (bg >= 0 && term->pix_colors[bg].is_opaque ())
		1359	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1360	else
		1361	dst = XftDrawPicture (d2);
		1362
		1363	if (dst)
		1364	{
		1365	int src_x = x, src_y = y;
		1366
		1367	if (term->bgPixmap.is_parentOrigin ())
		1368	{
		1369	src_x += term->window_vt_x;
		1370	src_y += term->window_vt_y;
		1371	}
		1372
		1373	if (term->bgPixmap.pmap_width >= src_x+w
		1374	&& term->bgPixmap.pmap_height >= src_y+h)
		1375	{
		1376	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1377	src_x, src_y, w, h, 0, 0);
		1378	}
		1379	else
		1380	{
		1381	XGCValues gcv;
		1382
		1383	gcv.fill_style = FillTiled;
		1384	gcv.tile = term->bgPixmap.pixmap;
		1385	gcv.ts_x_origin = -src_x;
		1386	gcv.ts_y_origin = -src_y;
		1387
		1388	XChangeGC (disp, gc,
		1389	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1390	&gcv);
		1391
		1392	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1393
		1394	gcv.fill_style = FillSolid;
		1395	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1396	}
		1397
		1398	if (bg >= 0)
		1399	{
		1400	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1401	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1402	}
		1403
		1404	back_rendered = true;
		1405	}
		1406	}
		1407	#endif
		1408
		1409	if (!back_rendered)
		1410	XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
		1411
		1412	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1413	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1414	}
		1415	else
		1416	clear_rect (d, x, y, w, h, bg);
		1417	}
		1418	else
		1419	{
		1420	clear_rect (d, x, y, w, h, bg);
1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1421	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1422	}
1319	}	1423	}
		1424
1320	#endif	1425	#endif
1321		1426
1322	/////////////////////////////////////////////////////////////////////////////	1427	/////////////////////////////////////////////////////////////////////////////
1323		1428
1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1429	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1335	void	1440	void
1336	rxvt_fontset::clear ()	1441	rxvt_fontset::clear ()
1337	{	1442	{
1338	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1443	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339	= rxvt_fontprop::unset;	1444	= rxvt_fontprop::unset;
		1445	force_prop = false;
1340		1446
1341	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1447	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342	FONT_UNREF (*i);	1448	FONT_UNREF (*i);
1343		1449
1344	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1450	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1353		1459
1354	rxvt_font *	1460	rxvt_font *
1355	rxvt_fontset::new_font (const char *name, codeset cs)	1461	rxvt_fontset::new_font (const char *name, codeset cs)
1356	{	1462	{
1357	rxvt_font *f;	1463	rxvt_font *f;
1358		1464
1359	if (!name \|\| !*name)	1465	if (!name \|\| !*name)
1360	{	1466	{
1361	name = "";	1467	name = "";
1362	f = new rxvt_font_default (this);	1468	f = new rxvt_font_default (this);
1363	}	1469	}
…		…
1431	if (!end)	1537	if (!end)
1432	end = desc + strlen (desc);	1538	end = desc + strlen (desc);
1433		1539
1434	if (end - desc < 511)	1540	if (end - desc < 511)
1435	{	1541	{
1436	strncpy (buf, desc, end - desc);	1542	memcpy (buf, desc, end - desc);
1437	buf[end - desc] = 0;	1543	buf[end - desc] = 0;
1438		1544
1439	fonts.push_back (new_font (buf, cs));	1545	fonts.push_back (new_font (buf, cs));
1440	}	1546	}
1441	else	1547	else
…		…
1456	if (fonts[i]->loaded)	1562	if (fonts[i]->loaded)
1457	return true;	1563	return true;
1458		1564
1459	fonts[i]->loaded = true;	1565	fonts[i]->loaded = true;
1460		1566
1461	if (!fonts[i]->load (prop))	1567	if (!fonts[i]->load (prop, force_prop))
1462	{	1568	{
1463	fonts[i]->cs = CS_UNKNOWN;	1569	fonts[i]->cs = CS_UNKNOWN;
1464	return false;	1570	return false;
1465	}	1571	}
1466		1572
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1673	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1674	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1675	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1676
1571	XftResult result;	1677	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1678	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573		1679
1574	FcPatternDestroy (p);	1680	FcPatternDestroy (p);
1575		1681
1576	if (match)	1682	if (match)
1577	{	1683	{
…		…
1582	if (find_font (font) < 0)	1688	if (find_font (font) < 0)
1583	{	1689	{
1584	char fontname[4096];	1690	char fontname[4096];
1585	sprintf (fontname, "xft:%-.4090s", font);	1691	sprintf (fontname, "xft:%-.4090s", font);
1586		1692
1587	fonts.push_back (new_font (fontname, CS_UNICODE));	1693	fonts.push_back (new_font (fontname, CS_UNICODE));
1588	}	1694	}
1589		1695
1590	free (font);	1696	free (font);
1591	}	1697	}
1592	#endif	1698	#endif

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.133 by root, Wed Jan 23 06:49:30 2008 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.133 by root, Wed Jan 23 06:49:30 2008 UTC