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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.66 by root, Fri Feb 11 05:51:14 2005 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-2004 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	* GNU General Public License for more details.	15	* GNU General Public License for more details.
16	*	16	*
17	* You should have received a copy of the GNU General Public License	17	* You should have received a copy of the GNU General Public License
18	* along with this program; if not, write to the Free Software	18	* along with this program; if not, write to the Free Software
19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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"
24	#include "rxvtutil.h"	25	#include "rxvtutil.h"
25	#include "rxvtfont.h"	26	#include "rxvtfont.h"
26		27
27	#include <cstdlib>	28	#include <cstdlib>
28	#include <wchar.h>	29
29	#include <inttypes.h>	30	#include <inttypes.h>
30		31
31	#define DISPLAY r->display->display
32	#define TGC r->TermWin.gc
33
34	#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	))
35		40
36	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
37	codeset cs;	42	codeset cs;
38	const char *name;	43	const char *name;
39	} fallback_fonts[] = {	44	} fallback_fonts[] = {
40	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
41	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
42	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
43		48
44	#if ENCODING_EU	49	#if ENCODING_EU
45	// cyrillic	50	// cyrillic
46	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
47	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
48		53
49	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
50	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
51	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
52	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
53	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
59	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
60	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
61	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
62		67
63	# if XFT	68	# if XFT
64	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	69	{ CS_KOI8_U, "xft::lang=ru" },
65		70
66	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
67	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
68	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	73	{ CS_ISO8859_7, "xft::lang=el" },
69	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	74	{ CS_ISO8859_8, "xft::lang=he" },
70	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
71	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	76	{ CS_ISO8859_10, "xft::lang=se" },
72	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	77	{ CS_ISO8859_11, "xft::lang=th" },
73	# endif	78	# endif
74	#endif	79	#endif
75		80
76	// japanese	81	// japanese
77	#if ENCODING_JP \|\| ENCODING_JP_EXT	82	#if ENCODING_JP \|\| ENCODING_JP_EXT
78	# if XFT	83	# if XFT
79	// prefer xft for complex scripts	84	// prefer xft for complex scripts
80	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84	# endif	89	# endif
85	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
86	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
87	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
88	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
92		97
93	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
94	# if XFT	99	# if XFT
95	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
96	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
97	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	102	{ CS_GBK_0, "xft::lang=zh" },
98	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	107	{ CS_GB2312_1980_0, "xft::lang=zh" },
103	# endif	108	# endif
104	{ CS_GBK_0, "-----------c--gbk-0" },	109	{ CS_GBK_0, "-----------c--gbk-0" },
105	{ CS_BIG5, "-----------c-*-big5-0" },	110	{ CS_BIG5, "-----------c-*-big5-0" },
106	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
107	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
120	#if ENCODING_KR	125	#if ENCODING_KR
121	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
122	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
123	# if XFT	128	# if XFT
124	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126	# endif	131	# endif
127	#endif	132	#endif
128		133
129	// generic font fallback
130	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
131	{ 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.
132	{ CS_UNICODE, "----r-------c--iso10646-1" },
133	{ CS_UNICODE, "----r-------m--iso10646-1" },
134	#if XFT	136	#if XFT
135	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},	137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137	{ CS_UNICODE, "xft:Andale Mono:antialias=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139		141
140	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
141	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
142	#endif	144	#endif
143		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" },
144	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
145	};	151	};
146		152
147	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
148	// 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.
…		…
152	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
153	};	159	};
154		160
155	#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]))
156		162
		163	#define dTermDisplay Display *disp = term->dpy
		164	#define dTermGC GC gc = term->gc
		165
157	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
158
159	#if XFT
160	rxvt_drawable::~rxvt_drawable ()
161	{
162	if (xftdrawable)
163	XftDrawDestroy (xftdrawable);
164	}
165
166	rxvt_drawable::operator XftDraw *()
167	{
168	if (!xftdrawable)
169	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
170
171	return xftdrawable;
172	}
173	#endif
174
175	/////////////////////////////////////////////////////////////////////////////
176
177	static void *enc_buf;
178	static uint32_t enc_len;
179
180	static inline void *
181	get_enc_buf (uint32_t len)
182	{
183	if (len > enc_len)
184	{
185	free (enc_buf);
186	enc_buf = malloc (len);
187	enc_len = len;
188	}
189
190	return enc_buf;
191	}
192		167
193	static const char *	168	static const char *
194	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)
195	{	170	{
196	uint8_t buf = (uint8_t )get_enc_buf (len);	171	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		172	uint8_t *res = buf;
197		173
198	while (len--)	174	while (len--)
199	{	175	{
200	uint32_t c = FROM_UNICODE (cs, *text++);	176	uint32_t c = FROM_UNICODE (cs, *text++);
201		177
…		…
206	}	182	}
207		183
208	*buf++ = c;	184	*buf++ = c;
209	}	185	}
210		186
211	return (const char *)enc_buf;	187	return (const char *)res;
212	}	188	}
213		189
214	static const XChar2b *	190	static const XChar2b *
215	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)
216	{	192	{
217	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	193	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		194	XChar2b *res = buf;
218		195
219	while (len--)	196	while (len--)
220	{	197	{
221	uint32_t c = FROM_UNICODE (cs, *text++);	198	uint32_t c = FROM_UNICODE (cs, *text++);
222		199
…		…
229	buf->byte1 = c >> 8;	206	buf->byte1 = c >> 8;
230	buf->byte2 = c;	207	buf->byte2 = c;
231	buf++;	208	buf++;
232	}	209	}
233		210
234	return (XChar2b *)enc_buf;	211	return res;
235	}	212	}
236		213
237	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
238		220
239	void	221	void
240	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
241	{	223	{
242	if (this->name == name)	224	if (this->name == name)
…		…
245	if (this->name) free (this->name); // let the compiler optimize	227	if (this->name) free (this->name); // let the compiler optimize
246	this->name = name;	228	this->name = name;
247	}	229	}
248		230
249	void	231	void
250	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)	232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251	{	233	{
252	if (color == Color_bg)	234	dTermDisplay;
253	XClearArea (d.display->display, d, x, y, w, h, FALSE);	235	dTermGC;
		236
		237	if (color == Color_bg \|\| color == Color_transparent)
		238	XClearArea (disp, d, x, y, w, h, false);
254	else if (color >= 0)	239	else if (color >= 0)
255	{	240	{
256	#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)
257	XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258	#else	258	#else
259	XSetForeground (d.display->display, TGC, r->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
260	XFillRectangle (d.display->display, d, TGC, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
261	#endif	261	#endif
262	}	262	}
263	}	263	}
264		264
265	#include "table/linedraw.h"	265	/////////////////////////////////////////////////////////////////////////////
266		266
267	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
268	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
269		269
270	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
276	rxvt_fontprop properties ()	276	rxvt_fontprop properties ()
277	{	277	{
278	rxvt_fontprop p;	278	rxvt_fontprop p;
279		279
280	p.width = p.height = 1;	280	p.width = p.height = 1;
		281	p.ascent = rxvt_fontprop::unset;
281	p.weight = rxvt_fontprop::medium;	282	p.weight = rxvt_fontprop::medium;
282	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
283		284
284	return p;	285	return p;
285	}	286	}
286		287
287	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
288	{	289	{
289	width = 1; height = 1;	290	width = 1; height = 1;
290	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
291		292
292	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
293		294
294	return true;	295	return true;
295	}	296	}
296		297
297	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	298	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298	{	299	{
299	careful = false;	300	careful = false;
300		301
301	if (unicode <= 0x001f)	302	if (unicode <= 0x001f)
302	return true;	303	return true;
…		…
305	return false;	306	return false;
306		307
307	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
308	return true;	309	return true;
309		310
		311	#ifdef BUILTIN_GLYPHS
310	if (unicode >= 0x2500 && unicode <= 0x259f)	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
		313	!term->option (Opt_skipBuiltinGlyphs))
311	return true;	314	return true;
		315	#endif
312		316
313	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
314	return true;	318	return true;
315		319
316	switch (unicode)	320	switch (unicode)
…		…
331	void	335	void
332	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	336	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333	const text_t *text, int len,	337	const text_t *text, int len,
334	int fg, int bg)	338	int fg, int bg)
335	{	339	{
336	Display *disp = d.display->display;	340	dTermDisplay;
		341	dTermGC;
337		342
338	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	343	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339		344
340	XSetForeground (disp, TGC, r->pix_colors[fg]);	345	XSetForeground (disp, gc, term->pix_colors[fg]);
341		346
342	while (len)	347	while (len)
343	{	348	{
344	#if ENABLE_COMBINING	349	#if ENABLE_COMBINING
345	compose_char *cc;	350	compose_char *cc;
…		…
349		354
350	while (++text, --len && *text == NOCHAR)	355	while (++text, --len && *text == NOCHAR)
351	;	356	;
352		357
353	int width = text - tp;	358	int width = text - tp;
354	int fwidth = r->TermWin.fwidth * width;	359	int fwidth = term->fwidth * width;
355		360
		361	#ifdef BUILTIN_GLYPHS
356	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
357	{	363	{
		364	# include "table/linedraw.h"
358	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
359	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
360	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
361		368
362	int W = fwidth;	369	int W = fwidth;
363	int H = r->TermWin.fheight;	370	int H = term->fheight;
364		371
365	int x_[16];	372	int x_[16];
366	int y_[16];	373	int y_[16];
367		374
368	for (int i = 0; i <= 8; i++)	375	for (int i = 0; i <= 8; i++)
…		…
376		383
377	XGCValues gcv;	384	XGCValues gcv;
378		385
379	gcv.cap_style = CapButt;	386	gcv.cap_style = CapButt;
380	gcv.line_width = 0;	387	gcv.line_width = 0;
381	XChangeGC (disp, TGC, GCLineWidth \| GCCapStyle, &gcv);	388	XChangeGC (disp, gc, GCLineWidth \| GCCapStyle, &gcv);
382		389
383	while (a < b)	390	while (a < b)
384	{	391	{
385	uint32_t command = *a++;	392	uint32_t command = *a++;
386		393
…		…
393	int y2 = y_[(command >> 0) & 15];	400	int y2 = y_[(command >> 0) & 15];
394		401
395	switch (op)	402	switch (op)
396	{	403	{
397	case 0: // line	404	case 0: // line
398	XDrawLine (disp, d, TGC, x1, y1, x2, y2);	405	XDrawLine (disp, d, gc, x1, y1, x2, y2);
399	break;	406	break;
400		407
401	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
402	if (a)	409	if (a)
403	{	410	{
404	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405		412
406	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
407	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
409	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
410		417
411	XChangeGC (disp, TGC,	418	XChangeGC (disp, gc,
412	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	419	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
413	&gcv);	420	&gcv);
414	}	421	}
415		422
416	XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	423	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417		424
418	if (a)	425	if (a)
419	{	426	{
420	XFreePixmap (disp, gcv.stipple);	427	XFreePixmap (disp, gcv.stipple);
421	gcv.stipple = 0;	428	gcv.stipple = 0;
422	gcv.fill_style = FillSolid;	429	gcv.fill_style = FillSolid;
423	XChangeGC (disp, TGC, GCFillStyle, &gcv);	430	XChangeGC (disp, gc, GCFillStyle, &gcv);
424	}	431	}
425	break;	432	break;
426	case 2: // arc	433	case 2: // arc
427	XDrawArc (disp, d, TGC,	434	XDrawArc (disp, d, gc,
428	x1 - W/2, y1 - H/2, W-1, H-1,	435	x1 - W/2, y1 - H/2, W-1, H-1,
429	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
430	break;	437	break;
431	}	438	}
432	}	439	}
433	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
434	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
435	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436	{	447	{
		448	min_it (width, 2); // we only support wcwidth up to 2
		449
437	text_t chrs[2];	450	text_t chrs[2];
438	width = min (2, width);
439	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
440		452
441	*chrs = cc->c1;	453	*chrs = cc->c1;
442	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
443	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
450	*chrs = cc->c2;	462	*chrs = cc->c2;
451	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452	? f1	464	? f1
453	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
454		466
455	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
456	}	468	}
457	}	469	}
458	#endif	470	#endif
459	else	471	else
460	switch (t)	472	switch (t)
…		…
463	case ZERO_WIDTH_CHAR:	475	case ZERO_WIDTH_CHAR:
464	case NOCHAR:	476	case NOCHAR:
465	break;	477	break;
466		478
467	default:	479	default:
468	XDrawRectangle (disp, d, TGC, x + 2, y + 2,	480	XDrawRectangle (disp, d, gc, x + 2, y + 2,
469	fwidth - 4, r->TermWin.fheight - 4);	481	fwidth - 4, term->fheight - 4);
470	}	482	}
471		483
472	x += fwidth;	484	x += fwidth;
473	}	485	}
474	}	486	}
…		…
480		492
481	void clear ();	493	void clear ();
482		494
483	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
484		496
485	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
486		498
487	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);	499	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488		500
489	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
490	const text_t *text, int len,	502	const text_t *text, int len,
491	int fg, int bg);	503	int fg, int bg);
492		504
493	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
494	XFontStruct *f;	506	XFontStruct *f;
495	codeset cs;
496	bool enc2b, encm;	507	bool enc2b, encm;
497		508
498	char get_property (XFontStruct f, const char property, const char repl) const;	509	char get_property (XFontStruct f, Atom property, const char *repl) const;
499	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);
500	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501	bool set_properties (rxvt_fontprop &p, const char *name);	512	bool set_properties (rxvt_fontprop &p, const char *name);
502	};	513	};
503		514
504	char *	515	char *
505	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
506	{	517	{
507	unsigned long value;	518	unsigned long value;
508		519
509	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	520	if (XGetFontProperty (f, property, &value))
510	return XGetAtomName (DISPLAY, value);	521	return XGetAtomName (term->dpy, value);
511	else	522	else
512	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
513	}	524	}
514		525
515	rxvt_fontprop	526	rxvt_fontprop
516	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
517	{	528	{
…		…
521	}	532	}
522		533
523	bool	534	bool
524	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)
525	{	536	{
526	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;
527	p.height = height;	540	p.height = height;
		541	p.ascent = rxvt_fontprop::unset;
528	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;
529	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;
530		544
531	return true;	545	return true;
532	}	546	}
…		…
535	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536	{	550	{
537	unsigned long height;	551	unsigned long height;
538		552
539	#if 0	553	#if 0
540	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541	return false;	555	return false;
542	#else	556	#else
543	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
544	#endif	558	#endif
545		559
546	unsigned long avgwidth;	560	unsigned long avgwidth;
547	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	561	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548	avgwidth = 0;	562	avgwidth = 0;
549		563
550	char *weight = get_property (f, "WEIGHT_NAME", "medium");	564	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551	char *slant = get_property (f, "SLANT", "r");	565	char *slant = get_property (f, term->xa [XA_SLANT], "r");
552		566
553	set_properties (p, height, weight, slant, avgwidth);	567	set_properties (p, height, weight, slant, avgwidth);
554		568
555	free (weight);	569	free (weight);
556	free (slant);	570	free (slant);
557		571
		572	p.ascent = f->ascent;
		573
558	return true;	574	return true;
559	}	575	}
560		576
561	bool	577	bool
562	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	578	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563	{	579	{
		580	dTermDisplay;
564	int slashes = 0;	581	int slashes = 0;
565	const char *comp[13];	582	const char *comp[13];
566		583
567	for (const char c = name; c; c++)	584	for (const char c = name; c; c++)
568	if (*c == '-')	585	if (*c == '-')
…		…
576	if (slashes >= 13	593	if (slashes >= 13
577	&& (comp[ 6] >= '1' && comp[ 6] <= '9')	594	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
578	&& (comp[11] >= '0' && comp[11] <= '9'))	595	&& (comp[11] >= '0' && comp[11] <= '9'))
579	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));	596	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580		597
581	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	598	XFontStruct *f = XLoadQueryFont (disp, name);
582		599
583	if (f)	600	if (f)
584	{	601	{
585	// the font should really exist now. if not, we have a problem	602	// the font should really exist now. if not, we have a problem
586	// (e.g. if the user did xset fp rehash just when we were searching fonts).	603	// (e.g. if the user did xset fp rehash just when we were searching fonts).
587	// in that case, just return garbage.	604	// in that case, just return garbage.
588	bool ret = set_properties (p, f);	605	bool ret = set_properties (p, f);
589	XFreeFont (DISPLAY, f);	606	XFreeFont (disp, f);
590	return ret;	607	return ret;
591	}	608	}
592	else	609	else
593	return false;	610	return false;
594	}	611	}
…		…
630	return false;	647	return false;
631	}	648	}
632	}	649	}
633		650
634	bool	651	bool
635	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636	{	653	{
637	Display *disp = DISPLAY;	654	dTermDisplay;
638		655
639	clear ();	656	clear ();
640		657
641	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
642		659
643	// first morph the font if required	660	// first morph the font if required
644	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
645	\|\| prop.slant != rxvt_fontprop::unset)
646	{	662	{
647	char fname[1024];	663	char fname[1024];
648		664
649	if (name[0] != '-')	665	if (name[0] != '-')
650	{	666	{
651	f = XLoadQueryFont (disp, name);	667	f = XLoadQueryFont (disp, name);
652		668
653	if (!f)	669	if (!f)
654	return false;	670	return false;
655		671
656	char *new_name = get_property (f, "FONT", name);	672	char *new_name = get_property (f, XA_FONT, name);
657		673
658	if (new_name)	674	if (new_name)
659	set_name (new_name);	675	set_name (new_name);
660	else	676	else
661	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	677	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
664	f = 0;	680	f = 0;
665	}	681	}
666		682
667	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
668	{	684	{
669	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
670	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
671	? "medium" : "bold");	687	? "medium" : "bold");
672	set_name (strdup (fname));	688	set_name (strdup (fname));
673	}	689	}
674		690
…		…
716		732
717	int diff = 0;	733	int diff = 0;
718		734
719	if (replace_field (fname, list[i], 6, '0', field_str))	735	if (replace_field (fname, list[i], 6, '0', field_str))
720	diff += 10; // slightly penalize scalable fonts	736	diff += 10; // slightly penalize scalable fonts
		737	else if (replace_field (fname, list[i], 11, '0', "0"))
		738	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
721		739
722	if (!set_properties (p, fname))	740	if (!set_properties (p, fname))
723	continue;	741	continue;
724		742
725	if (prop.height != rxvt_fontprop::unset	743	if (prop.height != rxvt_fontprop::unset
…		…
741	for (;;)	759	for (;;)
742	{	760	{
743	font_weight *best = fonts + count - 1;	761	font_weight *best = fonts + count - 1;
744		762
745	for (font_weight *w = best; w-- > fonts; )	763	for (font_weight *w = best; w-- > fonts; )
746	if (w->diff < best->diff)	764	if (w->diff <= best->diff)
747	best = w;	765	best = w;
748		766
749	if (!best->name	767	if (!best->name
750	\|\| !(f = XLoadQueryFont (disp, best->name)))	768	\|\| !(f = XLoadQueryFont (disp, best->name)))
751	break;	769	break;
…		…
768	delete [] fonts;	786	delete [] fonts;
769		787
770	if (!f)	788	if (!f)
771	return false;	789	return false;
772		790
773	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	791	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
774	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	792	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
775		793
776	if (registry && encoding)	794	if (registry && encoding)
777	{	795	{
778	char charset[64];	796	char charset[64];
779	snprintf (charset, 64, "%s-%s", registry, encoding);	797	snprintf (charset, 64, "%s-%s", registry, encoding);
780		798
781	cs = codeset_from_name (charset);	799	cs = codeset_from_name (charset);
782	}	800	}
783	else	801	else
784	{	802	{
785	const char *charset = get_property (f, "FONT", 0);	803	const char *charset = get_property (f, XA_FONT, 0);
786		804
787	if (!charset)	805	if (!charset)
788	charset = name;	806	charset = name;
789		807
790	int count = 13;	808	int count = 13;
…		…
805	enc2b = encm \|\| f->max_char_or_byte2 > 255;	823	enc2b = encm \|\| f->max_char_or_byte2 > 255;
806		824
807	slow = false;	825	slow = false;
808		826
809	#if 1 // only used for slow detection, TODO optimize	827	#if 1 // only used for slow detection, TODO optimize
810	if (f->min_bounds.width == f->max_bounds.width)	828	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
811	width = f->min_bounds.width;
812	else if (f->per_char == NULL)
813	width = f->max_bounds.width;	829	width = f->max_bounds.width;
814	else	830	else
815	{	831	{
816	slow = true;	832	slow = true;
817		833
818	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;
819		835
820	if (encm)	836	if (encm)
821	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
822	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
823		839
824	while (N)	840	while (N)
825	{	841	{
826	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
827	width = f->per_char[N].width;	843	width = f->per_char[N].width;
828		844
…		…
833		849
834	width = 1;	850	width = 1;
835		851
836	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; )
837	{	853	{
838	if (cs != CS_UNICODE
839	&& *t > 0x100
840	&& FROM_UNICODE (cs, *t) == NOCHAR)	854	if (FROM_UNICODE (cs, *t) == NOCHAR)
841	continue;	855	continue;
842		856
843	// ignore characters we wouldn't use anyways	857	// ignore characters we wouldn't use anyways
844	bool careful;	858	bool careful;
845	if (!has_char (*t, &prop, careful))	859	if (!has_char (*t, &prop, careful))
…		…
849		863
850	XCharStruct g;	864	XCharStruct g;
851	int dir_ret, asc_ret, des_ret;	865	int dir_ret, asc_ret, des_ret;
852	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	866	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853		867
854	int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw;	868	int wcw = WCWIDTH (*t);
		869	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
855		870
856	if (width < g.width) width = g.width;	871	if (width < g.width) width = g.width;
857	}	872	}
858		873
859	if (cs == CS_UNKNOWN)	874	if (cs == CS_UNKNOWN)
860	{	875	{
861	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	876	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
878	void	893	void
879	rxvt_font_x11::clear ()	894	rxvt_font_x11::clear ()
880	{	895	{
881	if (f)	896	if (f)
882	{	897	{
883	XFreeFont (DISPLAY, f);	898	XFreeFont (term->dpy, f);
884	f = 0;	899	f = 0;
885	}	900	}
886	}	901	}
887		902
888	bool	903	bool
889	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	904	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
890	{	905	{
891	uint32_t ch = FROM_UNICODE (cs, unicode);	906	uint32_t ch = FROM_UNICODE (cs, unicode);
892		907
893	if (ch == NOCHAR)	908	if (ch == NOCHAR)
894	return false;	909	return false;
…		…
931	return false;	946	return false;
932		947
933	if (!prop \|\| prop->width == rxvt_fontprop::unset)	948	if (!prop \|\| prop->width == rxvt_fontprop::unset)
934	return true;	949	return true;
935		950
936	// check character against base font bounding box	951	// check wether character overlaps previous/next character
937	int w = xcs->width;	952	int w = xcs->rbearing - xcs->lbearing;
938	int wcw = wcwidth (unicode);	953	int wcw = max (WCWIDTH (unicode), 1);
939	if (wcw > 0) w /= wcw;
940		954
941	careful = w > prop->width;	955	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
942	if (careful && w > prop->width * MAX_OVERLAP >> 2)	956
		957	if (careful && !OVERLAP_OK (w, wcw, prop))
943	return false;	958	return false;
944		959
945	return true;	960	return true;
946	}	961	}
947		962
…		…
953	// this looks like a mess /.	968	// this looks like a mess /.
954	// and it is a mess /.	969	// and it is a mess /.
955	// yet we are trying to be perfect /.	970	// yet we are trying to be perfect /.
956	// but the result still isn't perfect /.	971	// but the result still isn't perfect /.
957		972
		973	dTermDisplay;
		974	dTermGC;
		975
958	bool slow = this->slow	976	bool slow = this->slow
959	\|\| width != r->TermWin.fwidth	977	\|\| width != term->fwidth
960	\|\| height != r->TermWin.fheight;	978	\|\| height != term->fheight;
961		979
962	int base = ascent; // sorry, incorrect: r->TermWin.fbase;	980	int base = ascent; // sorry, incorrect: term->fbase;
963		981
964	XGCValues v;	982	XGCValues v;
965	v.foreground = r->pix_colors[fg];	983	v.foreground = term->pix_colors[fg];
966	v.font = f->fid;	984	v.font = f->fid;
967		985
968	if (enc2b)	986	if (enc2b)
969	{	987	{
970	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	988	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971		989
972	if (bg == Color_bg && !slow)	990	if (bg == Color_bg && !slow)
973	{	991	{
974	v.background = r->pix_colors[bg];	992	v.background = term->pix_colors[bg];
975	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	993	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
976	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	994	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977	}	995	}
978	else	996	else
979	{	997	{
980	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
981		999
982	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
983		1001
984	if (slow)	1002	if (slow)
985	{	1003	{
986	do	1004	do
987	{	1005	{
988	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
989	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1007	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990		1008
991	x += r->TermWin.fwidth;	1009	x += term->fwidth;
992	xc++; len--;	1010	xc++; len--;
993	}	1011	}
994	while (len);	1012	while (len);
995	}	1013	}
996	else	1014	else
997	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1015	XDrawString16 (disp, d, gc, x, y + base, xc, len);
998	}	1016	}
999	}	1017	}
1000	else	1018	else
1001	{	1019	{
1002	const char *xc = enc_char (text, len, cs, slow);	1020	const char *xc = enc_char (text, len, cs, slow);
1003		1021
1004	if (bg == Color_bg && !slow)	1022	if (bg == Color_bg && !slow)
1005	{	1023	{
1006	v.background = r->pix_colors[bg];	1024	v.background = term->pix_colors[bg];
1007	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	1025	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
1008	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1026	XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009	}	1027	}
1010	else	1028	else
1011	{	1029	{
1012	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1013		1031
1014	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1015		1033
1016	if (slow)	1034	if (slow)
1017	{	1035	{
1018	do	1036	do
1019	{	1037	{
1020	if (*xc)	1038	if (*xc)
1021	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1039	XDrawString (disp, d, gc, x, y + base, xc, 1);
1022		1040
1023	x += r->TermWin.fwidth;	1041	x += term->fwidth;
1024	xc++; len--;	1042	xc++; len--;
1025	}	1043	}
1026	while (len);	1044	while (len);
1027	}	1045	}
1028	else	1046	else
1029	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1047	XDrawString (disp, d, gc, x, y + base, xc, len);
1030	}	1048	}
1031	}	1049	}
1032	}	1050	}
1033		1051
1034	/////////////////////////////////////////////////////////////////////////////	1052	/////////////////////////////////////////////////////////////////////////////
…		…
1040		1058
1041	void clear ();	1059	void clear ();
1042		1060
1043	rxvt_fontprop properties ();	1061	rxvt_fontprop properties ();
1044		1062
1045	bool load (const rxvt_fontprop &prop);	1063	bool load (const rxvt_fontprop &prop, bool force_prop);
1046		1064
1047	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1048	const text_t *text, int len,	1066	const text_t *text, int len,
1049	int fg, int bg);	1067	int fg, int bg);
1050		1068
1051	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);	1069	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1052		1070
1053	protected:	1071	protected:
1054	XftFont *f;	1072	XftFont *f;
1055	};	1073	};
1056		1074
1057	void	1075	void
1058	rxvt_font_xft::clear ()	1076	rxvt_font_xft::clear ()
1059	{	1077	{
1060	if (f)	1078	if (f)
1061	{	1079	{
1062	XftFontClose (DISPLAY, f);	1080	XftFontClose (term->dpy, f);
1063	f = 0;	1081	f = 0;
1064	}	1082	}
1065	}	1083	}
1066		1084
1067	rxvt_fontprop	1085	rxvt_fontprop
…		…
1071		1089
1072	FT_Face face = XftLockFace (f);	1090	FT_Face face = XftLockFace (f);
1073		1091
1074	p.width = width;	1092	p.width = width;
1075	p.height = height;	1093	p.height = height;
		1094	p.ascent = ascent;
1076	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD	1095	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077	? rxvt_fontprop::bold : rxvt_fontprop::medium;	1096	? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC	1097	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079	? rxvt_fontprop::italic : rxvt_fontprop::roman;	1098	? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080		1099
…		…
1082		1101
1083	return p;	1102	return p;
1084	}	1103	}
1085		1104
1086	bool	1105	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1106	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1107	{
1089	Display *disp = DISPLAY;	1108	dTermDisplay;
1090		1109
1091	clear ();	1110	clear ();
1092		1111
1093	FcPattern p = FcNameParse ((FcChar8 ) name);	1112	FcPattern p = FcNameParse ((FcChar8 ) name);
1094		1113
…		…
1096	return false;	1115	return false;
1097		1116
1098	FcValue v;	1117	FcValue v;
1099		1118
1100	if (prop.height != rxvt_fontprop::unset	1119	if (prop.height != rxvt_fontprop::unset
1101	\|\| (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1120	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1121	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1122	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1123
1105	if (prop.weight != rxvt_fontprop::unset	1124	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1125	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1126	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1127
1109	if (prop.slant != rxvt_fontprop::unset	1128	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1130	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1131
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1132	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1133	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1134	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1121		1140
1122	// store generated name so iso14755 view gives better results	1141	// store generated name so iso14755 view gives better results
1123	set_name ((char *)FcNameUnparse (p));	1142	set_name ((char *)FcNameUnparse (p));
1124		1143
1125	XftResult result;	1144	XftResult result;
1126	FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);	1145	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127		1146
1128	FcPatternDestroy (p);	1147	FcPatternDestroy (p);
1129		1148
1130	if (!match)	1149	if (!match)
1131	return false;	1150	return false;
…		…
1152		1171
1153	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;	1172	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154		1173
1155	XftUnlockFace (f);	1174	XftUnlockFace (f);
1156		1175
		1176	int glheight = height;
		1177
1157	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1178	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1158	{	1179	{
1159	FcChar16 ch = *t;	1180	FcChar16 ch = *t;
1160		1181
1161	if (cs != CS_UNICODE	1182	if (cs != CS_UNICODE
…		…
1169	continue;	1190	continue;
1170		1191
1171	XGlyphInfo g;	1192	XGlyphInfo g;
1172	XftTextExtents16 (disp, f, &ch, 1, &g);	1193	XftTextExtents16 (disp, f, &ch, 1, &g);
1173		1194
		1195	g.width -= g.x;
		1196
1174	int wcw = wcwidth (ch);	1197	int wcw = WCWIDTH (ch);
1175	if (wcw > 0) g.width = g.width / wcw;	1198	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176		1199
1177	if (width < g.width) width = g.width;	1200	if (width < g.width ) width = g.width;
1178	if (height < g.height) height = g.height;	1201	if (height < g.height ) height = g.height;
		1202	if (glheight < g.height - g.y) glheight = g.height - g.y;
		1203	}
		1204
		1205	if (!width)
		1206	{
		1207	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
		1208
		1209	XftFontClose (disp, f);
		1210	f = 0;
		1211
		1212	success = false;
		1213	break;
1179	}	1214	}
1180		1215
1181	if (prop.height == rxvt_fontprop::unset	1216	if (prop.height == rxvt_fontprop::unset
1182	\|\| height <= prop.height	1217	\|\| (height <= prop.height && glheight <= prop.height)
1183	\|\| height <= 2	1218	\|\| height <= 2
1184	\|\| !scalable)	1219	\|\| !scalable)
1185	break;	1220	break;
1186		1221
1187	if (ftheight)	1222	if (ftheight)
…		…
1194	ftheight -= height - prop.height;	1229	ftheight -= height - prop.height;
1195	}	1230	}
1196	else	1231	else
1197	ftheight = prop.height - 1;	1232	ftheight = prop.height - 1;
1198		1233
1199	XftFontClose (disp, f);	1234	XftFontClose (disp, f);
1200	FcPatternDel (match, FC_PIXEL_SIZE);	1235	FcPatternDel (match, FC_PIXEL_SIZE);
1201	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);	1236	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202	}	1237	}
1203		1238
1204	FcPatternDestroy (match);	1239	FcPatternDestroy (match);
1205		1240
1206	#if 0 // do it per-character	1241	#if 0 // do it per-character
…		…
1213		1248
1214	return success;	1249	return success;
1215	}	1250	}
1216		1251
1217	bool	1252	bool
1218	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	1253	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1219	{	1254	{
1220	careful = false;	1255	careful = false;
1221		1256
1222	if (!XftCharExists (DISPLAY, f, unicode))	1257	if (!XftCharExists (term->dpy, f, unicode))
1223	return false;	1258	return false;
1224		1259
1225	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1260	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1226	return true;	1261	return true;
1227		1262
1228	// check character against base font bounding box	1263	// check character against base font bounding box
1229	FcChar32 ch = unicode;	1264	FcChar32 ch = unicode;
1230	XGlyphInfo g;	1265	XGlyphInfo g;
1231	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);	1266	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1232		1267
1233	int w = g.width;	1268	int w = g.width - g.x;
1234	int wcw = wcwidth (unicode);	1269	int wcw = max (WCWIDTH (unicode), 1);
1235	if (wcw > 0) w /= wcw;
1236		1270
1237	careful = w > prop->width;	1271	careful = g.x > 0 \|\| w > prop->width * wcw;
1238	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))
1239	return false;	1278	return false;
1240		1279
1241	return true;	1280	return true;
1242	}	1281	}
1243		1282
1244	void	1283	void
1245	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1284	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246	const text_t *text, int len,	1285	const text_t *text, int len,
1247	int fg, int bg)	1286	int fg, int bg)
1248	{	1287	{
1249	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1250
1251	int base = ascent; // should be fbase, but that is incorrect
1252
1253	XGlyphInfo extents;	1288	XGlyphInfo extents;
1254	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));	1289	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1255	FcChar32 *ep = enc;	1290	XftGlyphSpec *ep = enc;
1256	int ewidth = 0;	1291
1257	int xoff = 0;	1292	dTermDisplay;
		1293	dTermGC;
		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	;
		1307	// cut trailing spaces
		1308	while (len && text [len - 1] == ' ')
		1309	len--;
		1310
		1311	int x_ = buffered ? 0 : x;
		1312	int y_ = buffered ? 0 : y;
1258		1313
1259	while (len)	1314	while (len)
1260	{	1315	{
1261	int cwidth = r->TermWin.fwidth;	1316	int cwidth = term->fwidth;
1262	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1263	FT_UInt gl;
1264		1318
1265	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1266	text++, len--, cwidth += r->TermWin.fwidth;	1320	text++, len--, cwidth += term->fwidth;
1267
1268	gl = XftCharIndex (d.display->display, f, fc);
1269	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270		1321
1271	if (extents.xOff != cwidth && ep != enc)	1322	if (fc != ' ') // skip spaces
1272	{
1273	if (xoff > ewidth) xoff = ewidth;
1274	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275	x + (ewidth - xoff >> 1),
1276	y + base, enc, ep - enc);
1277	x += ewidth;
1278
1279	ep = enc;
1280	ewidth = 0;
1281	xoff = 0;
1282	}	1323	{
		1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
		1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283		1326
1284	if (fc == ' ' && ep == enc) // skip leading spaces	1327	ep->glyph = glyph;
		1328	ep->x = x_ + (cwidth - extents.xOff >> 1);
		1329	ep->y = y_ + ascent;
		1330
		1331	if (extents.xOff == 0)
		1332	ep->x = x_ + cwidth;
		1333
		1334	ep++;
1285	{	1335	}
		1336
1286	x += cwidth;	1337	x_ += cwidth;
1287	continue;	1338	}
		1339
		1340	if (buffered)
		1341	{
		1342	bool back_rendered = false;
		1343	if (ep != enc)
1288	}	1344	{
		1345	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1289		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	}
1290	else	1407	else
1291	{	1408	clear_rect (d, x, y, w, h, bg);
1292	*ep++ = gl;
1293	ewidth += cwidth;
1294	xoff += extents.xOff;
1295	}
1296	}
1297
1298	if (ep != enc)
1299	{	1409	}
1300	if (xoff > ewidth) xoff = ewidth;	1410	else
1301	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1302	x + (ewidth - xoff >> 1),
1303	y + base, enc, ep - enc);
1304	}	1411	{
		1412	clear_rect (d, x, y, w, h, bg);
		1413	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1414	}
1305	}	1415	}
		1416
1306	#endif	1417	#endif
1307		1418
1308	/////////////////////////////////////////////////////////////////////////////	1419	/////////////////////////////////////////////////////////////////////////////
1309		1420
1310	rxvt_fontset::rxvt_fontset (rxvt_t r)	1421	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311	: r (r), fontdesc (0)	1422	: fontdesc (0), term (term)
1312	{	1423	{
1313	clear ();	1424	clear ();
1314	}	1425	}
1315		1426
1316	rxvt_fontset::~rxvt_fontset ()	1427	rxvt_fontset::~rxvt_fontset ()
…		…
1319	}	1430	}
1320		1431
1321	void	1432	void
1322	rxvt_fontset::clear ()	1433	rxvt_fontset::clear ()
1323	{	1434	{
1324	prop.width = prop.height = prop.weight = prop.slant	1435	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325	= rxvt_fontprop::unset;	1436	= rxvt_fontprop::unset;
		1437	force_prop = false;
1326		1438
1327	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1439	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328	FONT_UNREF (*i);	1440	FONT_UNREF (*i);
1329		1441
1330	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1442	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1339		1451
1340	rxvt_font *	1452	rxvt_font *
1341	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1342	{	1454	{
1343	rxvt_font *f;	1455	rxvt_font *f;
1344		1456
1345	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1346	{	1458	{
1347	name = "";	1459	name = "";
1348	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1349	}	1461	}
…		…
1360	f = new rxvt_font_x11;	1472	f = new rxvt_font_x11;
1361	}	1473	}
1362	else	1474	else
1363	f = new rxvt_font_x11;	1475	f = new rxvt_font_x11;
1364		1476
1365	f->set_term (r);	1477	f->set_term (term);
1366	f->set_name (strdup (name));	1478	f->set_name (strdup (name));
1367		1479
1368	f->cs = cs;	1480	f->cs = cs;
1369	f->loaded = false;	1481	f->loaded = false;
1370		1482
…		…
1381	char buf[512];	1493	char buf[512];
1382	const char *end;	1494	const char *end;
1383		1495
1384	do	1496	do
1385	{	1497	{
1386	while (*desc <= ' ') desc++;	1498	while (desc && desc <= ' ')
		1499	desc++;
1387		1500
1388	codeset cs = CS_UNICODE;	1501	codeset cs = CS_UNICODE;
1389		1502
1390	if (*desc == '[')	1503	if (*desc == '[')
1391	{	1504	{
…		…
1441	if (fonts[i]->loaded)	1554	if (fonts[i]->loaded)
1442	return true;	1555	return true;
1443		1556
1444	fonts[i]->loaded = true;	1557	fonts[i]->loaded = true;
1445		1558
1446	if (!fonts[i]->load (prop))	1559	if (!fonts[i]->load (prop, force_prop))
1447	{	1560	{
1448	fonts[i]->cs = CS_UNKNOWN;	1561	fonts[i]->cs = CS_UNKNOWN;
1449	return false;	1562	return false;
1450	}	1563	}
1451		1564
…		…
1501	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1614	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1502	goto next_font;	1615	goto next_font;
1503		1616
1504	if (!realize_font (i))	1617	if (!realize_font (i))
1505	goto next_font;	1618	goto next_font;
		1619
		1620	if (prop.ascent != rxvt_fontprop::unset)
		1621	max_it (f->ascent, prop.ascent);
1506	}	1622	}
1507		1623
1508	if (f->cs == CS_UNKNOWN)	1624	if (f->cs == CS_UNKNOWN)
1509	goto next_font;	1625	goto next_font;
1510		1626
…		…
1549	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1665	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1550	FcPatternAddBool (p, FC_MINSPACE, 1);	1666	FcPatternAddBool (p, FC_MINSPACE, 1);
1551	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1667	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1552		1668
1553	XftResult result;	1669	XftResult result;
1554	FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);	1670	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1555		1671
1556	FcPatternDestroy (p);	1672	FcPatternDestroy (p);
1557		1673
1558	if (match)	1674	if (match)
1559	{	1675	{
…		…
1564	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1565	{	1681	{
1566	char fontname[4096];	1682	char fontname[4096];
1567	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1568		1684
1569	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1570	}	1686	}
1571		1687
1572	free (font);	1688	free (font);
1573	}	1689	}
1574	#endif	1690	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.66 by root, Fri Feb 11 05:51:14 2005 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.66 by root, Fri Feb 11 05:51:14 2005 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC