[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.124 by ayin, Sat Nov 24 11:41:11 2007 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[] = {
38	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
39	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
40	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
41		48
42	#if ENCODING_EU	49	#if ENCODING_EU
43	// cyrillic	50	// cyrillic
44	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
45	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
46		53
47	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
48	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
49	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
50	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
51	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
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)
…		…
250	void	231	void
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 == Color_bg \|\| color == Color_transparent)
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 if (color >= 0)
259	{	240	{
260	#if XFT	241	#if XFT
		242	bool done = false;
		243	#ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
		245	{
		246	Picture dst = XftDrawPicture (d);
		247	if (dst != 0)
		248	{
		249	XClearArea (disp, d, x, y, w, h, false);
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	done = true;
		253	}
		254	}
		255	#endif
		256	if (!done)
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
262	#else	258	#else
263	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
264	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
265	#endif	261	#endif
266	}	262	}
267	}	263	}
268		264
269	#include "table/linedraw.h"	265	/////////////////////////////////////////////////////////////////////////////
270		266
271	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
273		269
274	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
287	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
288		284
289	return p;	285	return p;
290	}	286	}
291		287
292	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
293	{	289	{
294	width = 1; height = 1;	290	width = 1; height = 1;
295	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
296		292
297	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
…		…
310	return false;	306	return false;
311		307
312	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
313	return true;	309	return true;
314		310
		311	#ifdef BUILTIN_GLYPHS
315	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
316	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
317	return true;	314	return true;
		315	#endif
318		316
319	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
320	return true;	318	return true;
321		319
322	switch (unicode)	320	switch (unicode)
…		…
358	;	356	;
359		357
360	int width = text - tp;	358	int width = text - tp;
361	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
362		360
		361	#ifdef BUILTIN_GLYPHS
363	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
364	{	363	{
		364	# include "table/linedraw.h"
365	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
366	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
367	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
368		368
369	int W = fwidth;	369	int W = fwidth;
…		…
407		407
408	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
409	if (a)	409	if (a)
410	{	410	{
411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412		412
413	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
416	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
417		417
…		…
436	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
437	break;	437	break;
438	}	438	}
439	}	439	}
440	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
441	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	447	{
		448	min_it (width, 2); // we only support wcwidth up to 2
		449
444	text_t chrs[2];	450	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
447		452
448	*chrs = cc->c1;	453	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
457	*chrs = cc->c2;	462	*chrs = cc->c2;
458	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459	? f1	464	? f1
460	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
461		466
462	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
463	}	468	}
464	}	469	}
465	#endif	470	#endif
466	else	471	else
467	switch (t)	472	switch (t)
…		…
487		492
488	void clear ();	493	void clear ();
489		494
490	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
491		496
492	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
493		498
494	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	499	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495		500
496	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
497	const text_t *text, int len,	502	const text_t *text, int len,
498	int fg, int bg);	503	int fg, int bg);
499		504
500	bool slow; // wether this is a proportional font or has other funny characteristics	505	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	506	XFontStruct *f;
502	codeset cs;
503	bool enc2b, encm;	507	bool enc2b, encm;
504		508
505	char get_property (XFontStruct f, const char property, const char repl) const;	509	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);	510	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);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	512	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	513	};
510		514
511	char *	515	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	516	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	517	{
514	unsigned long value;	518	unsigned long value;
515		519
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	520	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	521	return XGetAtomName (term->dpy, value);
518	else	522	else
519	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
520	}	524	}
521		525
522	rxvt_fontprop	526	rxvt_fontprop
523	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
524	{	528	{
…		…
528	}	532	}
529		533
530	bool	534	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	535	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	536	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	537	p.width = width != rxvt_fontprop::unset ? width
		538	: avgwidth ? (avgwidth + 1) / 10
		539	: (height + 1) / 2;
534	p.height = height;	540	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	541	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	542	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;	543	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		544
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	550	{
545	unsigned long height;	551	unsigned long height;
546		552
547	#if 0	553	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549	return false;	555	return false;
550	#else	556	#else
551	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
552	#endif	558	#endif
553		559
554	unsigned long avgwidth;	560	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	561	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	562	avgwidth = 0;
557		563
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	564	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	565	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		566
561	set_properties (p, height, weight, slant, avgwidth);	567	set_properties (p, height, weight, slant, avgwidth);
562		568
563	free (weight);	569	free (weight);
564	free (slant);	570	free (slant);
…		…
641	return false;	647	return false;
642	}	648	}
643	}	649	}
644		650
645	bool	651	bool
646	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647	{	653	{
648	dTermDisplay;	654	dTermDisplay;
649		655
650	clear ();	656	clear ();
651		657
652	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
653		659
654	// first morph the font if required	660	// first morph the font if required
655	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
656	\|\| prop.slant != rxvt_fontprop::unset)
657	{	662	{
658	char fname[1024];	663	char fname[1024];
659		664
660	if (name[0] != '-')	665	if (name[0] != '-')
661	{	666	{
662	f = XLoadQueryFont (disp, name);	667	f = XLoadQueryFont (disp, name);
663		668
664	if (!f)	669	if (!f)
665	return false;	670	return false;
666		671
667	char *new_name = get_property (f, "FONT", name);	672	char *new_name = get_property (f, XA_FONT, name);
668		673
669	if (new_name)	674	if (new_name)
670	set_name (new_name);	675	set_name (new_name);
671	else	676	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	677	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
675	f = 0;	680	f = 0;
676	}	681	}
677		682
678	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
679	{	684	{
680	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
681	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
682	? "medium" : "bold");	687	? "medium" : "bold");
683	set_name (strdup (fname));	688	set_name (strdup (fname));
684	}	689	}
685		690
…		…
781	delete [] fonts;	786	delete [] fonts;
782		787
783	if (!f)	788	if (!f)
784	return false;	789	return false;
785		790
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	791	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	792	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		793
789	if (registry && encoding)	794	if (registry && encoding)
790	{	795	{
791	char charset[64];	796	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	797	snprintf (charset, 64, "%s-%s", registry, encoding);
793		798
794	cs = codeset_from_name (charset);	799	cs = codeset_from_name (charset);
795	}	800	}
796	else	801	else
797	{	802	{
798	const char *charset = get_property (f, "FONT", 0);	803	const char *charset = get_property (f, XA_FONT, 0);
799		804
800	if (!charset)	805	if (!charset)
801	charset = name;	806	charset = name;
802		807
803	int count = 13;	808	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	823	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		824
820	slow = false;	825	slow = false;
821		826
822	#if 1 // only used for slow detection, TODO optimize	827	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	828	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;	829	width = f->max_bounds.width;
827	else	830	else
828	{	831	{
829	slow = true;	832	slow = true;
830		833
831	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	834	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832		835
833	if (encm)	836	if (encm)
834	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
835	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836		839
837	while (N)	840	while (N)
838	{	841	{
839	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
840	width = f->per_char[N].width;	843	width = f->per_char[N].width;
841		844
…		…
846		849
847	width = 1;	850	width = 1;
848		851
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	852	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	853	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	854	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	855	continue;
855		856
856	// ignore characters we wouldn't use anyways	857	// ignore characters we wouldn't use anyways
857	bool careful;	858	bool careful;
858	if (!has_char (*t, &prop, careful))	859	if (!has_char (*t, &prop, careful))
…		…
862		863
863	XCharStruct g;	864	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	865	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	866	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		867
		868	int wcw = WCWIDTH (*t);
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	869	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		870
869	if (width < g.width) width = g.width;	871	if (width < g.width) width = g.width;
870	}	872	}
871		873
872	if (cs == CS_UNKNOWN)	874	if (cs == CS_UNKNOWN)
873	{	875	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	876	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	893	void
892	rxvt_font_x11::clear ()	894	rxvt_font_x11::clear ()
893	{	895	{
894	if (f)	896	if (f)
895	{	897	{
896	XFreeFont (term->display->display, f);	898	XFreeFont (term->dpy, f);
897	f = 0;	899	f = 0;
898	}	900	}
899	}	901	}
900		902
901	bool	903	bool
…		…
944	return false;	946	return false;
945		947
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	948	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	949	return true;
948		950
949	// check character against base font bounding box	951	// check wether character overlaps previous/next character
950	int w = xcs->width;	952	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	953	int wcw = max (WCWIDTH (unicode), 1);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		954
954	careful = w > prop->width;	955	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	956
		957	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	958	return false;
957		959
958	return true;	960	return true;
959	}	961	}
960		962
…		…
994	else	996	else
995	{	997	{
996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997		999
998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
999		1001
1000	if (slow)	1002	if (slow)
1001	{	1003	{
1002	do	1004	do
1003	{	1005	{
1004	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
…		…
1026	else	1028	else
1027	{	1029	{
1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029		1031
1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1031		1033
1032	if (slow)	1034	if (slow)
1033	{	1035	{
1034	do	1036	do
1035	{	1037	{
1036	if (*xc)	1038	if (*xc)
…		…
1056		1058
1057	void clear ();	1059	void clear ();
1058		1060
1059	rxvt_fontprop properties ();	1061	rxvt_fontprop properties ();
1060		1062
1061	bool load (const rxvt_fontprop &prop);	1063	bool load (const rxvt_fontprop &prop, bool force_prop);
1062		1064
1063	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1064	const text_t *text, int len,	1066	const text_t *text, int len,
1065	int fg, int bg);	1067	int fg, int bg);
1066		1068
1067	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1069	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068		1070
1069	protected:	1071	protected:
1070	XftFont *f;	1072	XftFont *f;
1071	};	1073	};
1072		1074
1073	void	1075	void
1074	rxvt_font_xft::clear ()	1076	rxvt_font_xft::clear ()
1075	{	1077	{
1076	if (f)	1078	if (f)
1077	{	1079	{
1078	XftFontClose (term->display->display, f);	1080	XftFontClose (term->dpy, f);
1079	f = 0;	1081	f = 0;
1080	}	1082	}
1081	}	1083	}
1082		1084
1083	rxvt_fontprop	1085	rxvt_fontprop
…		…
1099		1101
1100	return p;	1102	return p;
1101	}	1103	}
1102		1104
1103	bool	1105	bool
1104	rxvt_font_xft::load (const rxvt_fontprop &prop)	1106	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105	{	1107	{
1106	dTermDisplay;	1108	dTermDisplay;
1107		1109
1108	clear ();	1110	clear ();
1109		1111
…		…
1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1120	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1121	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1122	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121		1123
1122	if (prop.weight != rxvt_fontprop::unset	1124	if (prop.weight != rxvt_fontprop::unset
1123	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1125	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1126	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125		1127
1126	if (prop.slant != rxvt_fontprop::unset	1128	if (prop.slant != rxvt_fontprop::unset
1127	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1130	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129		1131
1130	#if 0 // clipping unfortunately destroys our precious double-width-characters	1132	#if 0 // clipping unfortunately destroys our precious double-width-characters
1131	// clip width, we can't do better, or can we?	1133	// clip width, we can't do better, or can we?
1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1134	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1190	XGlyphInfo g;	1192	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1193	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1194
1193	g.width -= g.x;	1195	g.width -= g.x;
1194		1196
1195	int wcw = wcwidth (ch);	1197	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1198	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1199
1198	if (width < g.width ) width = g.width;	1200	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1201	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1202	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1252	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1253	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1254	{
1253	careful = false;	1255	careful = false;
1254		1256
1255	if (!XftCharExists (term->display->display, f, unicode))	1257	if (!XftCharExists (term->dpy, f, unicode))
1256	return false;	1258	return false;
1257		1259
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1260	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1261	return true;
1260		1262
1261	// check character against base font bounding box	1263	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1264	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1265	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1266	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265		1267
1266	int w = g.width - g.x;	1268	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1269	int wcw = max (WCWIDTH (unicode), 1);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1270
1270	careful = w > prop->width;	1271	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1272
		1273	if (careful && !OVERLAP_OK (w, wcw, prop))
		1274	return false;
		1275
		1276	// this weeds out _totally_ broken fonts, or glyphs
		1277	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1278	return false;
1273		1279
1274	return true;	1280	return true;
1275	}	1281	}
1276		1282
1277	void	1283	void
1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1284	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279	const text_t *text, int len,	1285	const text_t *text, int len,
1280	int fg, int bg)	1286	int fg, int bg)
1281	{	1287	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284	XGlyphInfo extents;	1288	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1289	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1290	XftGlyphSpec *ep = enc;
1287		1291
1288	dTermDisplay;	1292	dTermDisplay;
1289	dTermGC;	1293	dTermGC;
1290		1294
		1295	int w = term->fwidth * len;
		1296	int h = term->fheight;
		1297
		1298	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1299	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1300	* good idea from the perspective of packaging for wide variety of user configs.
		1301	*/
		1302	bool buffered = true
		1303	#ifdef FORCE_UNBUFFERED_XFT
		1304	&& bg >= 0
		1305	#endif
		1306	;
1291	// cut trailing spaces	1307	// cut trailing spaces
1292	while (len && text [len - 1] == ' ')	1308	while (len && text [len - 1] == ' ')
1293	len--;	1309	len--;
1294		1310
		1311	int x_ = buffered ? 0 : x;
		1312	int y_ = buffered ? 0 : y;
		1313
1295	while (len)	1314	while (len)
1296	{	1315	{
1297	int cwidth = term->fwidth;	1316	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1299		1318
1300	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1301	text++, len--, cwidth += term->fwidth;	1320	text++, len--, cwidth += term->fwidth;
1302		1321
1303	if (fc != ' ') // skip spaces	1322	if (fc != ' ') // skip spaces
1304	{	1323	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1326
1308	ep->glyph = glyph;	1327	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1328	ep->x = x_ + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1329	ep->y = y_ + ascent;
		1330
		1331	if (extents.xOff == 0)
		1332	ep->x = x_ + cwidth;
		1333
1311	ep++;	1334	ep++;
1312	}	1335	}
1313		1336
1314	x += cwidth;	1337	x_ += cwidth;
		1338	}
		1339
		1340	if (buffered)
1315	}	1341	{
1316		1342	bool back_rendered = false;
1317	if (ep != enc)	1343	if (ep != enc)
		1344	{
		1345	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1346
		1347	#ifdef HAVE_BG_PIXMAP
		1348	if (term->bgPixmap.pixmap)
		1349	{
		1350	Picture dst = 0;
		1351
		1352	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1353	dst = XftDrawPicture (d2);
		1354
		1355	if (bg < 0 \|\| dst != 0)
		1356	{
		1357	int src_x = x, src_y = y ;
		1358
		1359	if (term->bgPixmap.is_parentOrigin ())
		1360	{
		1361	src_x += term->window_vt_x;
		1362	src_y += term->window_vt_y;
		1363	}
		1364
		1365	if (term->bgPixmap.pmap_width >= src_x+w
		1366	&& term->bgPixmap.pmap_height >= src_y+h)
		1367	{
		1368	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1369	src_x, src_y, w, h, 0, 0);
		1370	}
		1371	else
		1372	{
		1373	XGCValues gcv;
		1374
		1375	gcv.fill_style = FillTiled;
		1376	gcv.tile = term->bgPixmap.pixmap;
		1377	gcv.ts_x_origin = -src_x;
		1378	gcv.ts_y_origin = -src_y;
		1379
		1380	XChangeGC (disp, gc,
		1381	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1382	&gcv);
		1383
		1384	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1385
		1386	gcv.fill_style = FillSolid;
		1387	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1388	}
		1389
		1390	if (bg >= 0)
		1391	{
		1392	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1393	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1394	}
		1395
		1396	back_rendered = true;
		1397	}
		1398	}
		1399	#endif
		1400
		1401	if (bg >= 0 && !back_rendered)
		1402	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1403
		1404	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1405	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1406	}
		1407	else
		1408	clear_rect (d, x, y, w, h, bg);
		1409	}
		1410	else
		1411	{
		1412	clear_rect (d, x, y, w, h, bg);
1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1413	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1414	}
1319	}	1415	}
		1416
1320	#endif	1417	#endif
1321		1418
1322	/////////////////////////////////////////////////////////////////////////////	1419	/////////////////////////////////////////////////////////////////////////////
1323		1420
1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1421	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1335	void	1432	void
1336	rxvt_fontset::clear ()	1433	rxvt_fontset::clear ()
1337	{	1434	{
1338	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1435	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339	= rxvt_fontprop::unset;	1436	= rxvt_fontprop::unset;
		1437	force_prop = false;
1340		1438
1341	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1439	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342	FONT_UNREF (*i);	1440	FONT_UNREF (*i);
1343		1441
1344	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1442	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1353		1451
1354	rxvt_font *	1452	rxvt_font *
1355	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1356	{	1454	{
1357	rxvt_font *f;	1455	rxvt_font *f;
1358		1456
1359	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1360	{	1458	{
1361	name = "";	1459	name = "";
1362	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1363	}	1461	}
…		…
1456	if (fonts[i]->loaded)	1554	if (fonts[i]->loaded)
1457	return true;	1555	return true;
1458		1556
1459	fonts[i]->loaded = true;	1557	fonts[i]->loaded = true;
1460		1558
1461	if (!fonts[i]->load (prop))	1559	if (!fonts[i]->load (prop, force_prop))
1462	{	1560	{
1463	fonts[i]->cs = CS_UNKNOWN;	1561	fonts[i]->cs = CS_UNKNOWN;
1464	return false;	1562	return false;
1465	}	1563	}
1466		1564
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1665	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1666	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1667	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1668
1571	XftResult result;	1669	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1670	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573		1671
1574	FcPatternDestroy (p);	1672	FcPatternDestroy (p);
1575		1673
1576	if (match)	1674	if (match)
1577	{	1675	{
…		…
1582	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1583	{	1681	{
1584	char fontname[4096];	1682	char fontname[4096];
1585	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1586		1684
1587	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1588	}	1686	}
1589		1687
1590	free (font);	1688	free (font);
1591	}	1689	}
1592	#endif	1690	#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.124 by ayin, Sat Nov 24 11:41:11 2007 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.124 by ayin, Sat Nov 24 11:41:11 2007 UTC