ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.1 by root, Sun Aug 15 00:37:04 2004 UTC vs.
Revision 1.120 by ayin, Mon Oct 22 07:36:51 2007 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: defaultfont.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"
		25	#include "rxvtutil.h"
24	#include "rxvtfont.h"	26	#include "rxvtfont.h"
25		27
26	#include <cstdlib>	28	#include <cstdlib>
27		29
28	#define DISPLAY r->display->display	30	#include <inttypes.h>
29	#define TGC r->TermWin.gc	31
		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	))
30		40
31	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
32	codeset cs;	42	codeset cs;
33	const char *name;	43	const char *name;
34	} fallback_fonts[] = {	44	} fallback_fonts[] = {
…		…
52	{ CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },	62	{ CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53	{ CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },	63	{ CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54	{ CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },	64	{ CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55	{ CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },	65	{ CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56	{ CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },	66	{ CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
		67
		68	# if XFT
		69	{ CS_KOI8_U, "xft::lang=ru" },
		70
		71	{ CS_ISO8859_5, "xft::lang=ru" },
		72	{ CS_ISO8859_6, "xft::lang=ar" },
		73	{ CS_ISO8859_7, "xft::lang=el" },
		74	{ CS_ISO8859_8, "xft::lang=he" },
		75	{ CS_ISO8859_9, "xft::lang=tr" },
		76	{ CS_ISO8859_10, "xft::lang=se" },
		77	{ CS_ISO8859_11, "xft::lang=th" },
		78	# endif
57	#endif	79	#endif
58		80
59	// japanese	81	// japanese
60	#if ENCODING_JP || ENCODING_JP_EXT	82	#if ENCODING_JP || ENCODING_JP_EXT
61	# if XFT	83	# if XFT
62	// prefer xft for complex scripts	84	// prefer xft for complex scripts
63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
		86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
		87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
		88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
64	# endif	89	# endif
65	{ CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66	{ CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67	{ CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68	{ CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },	93	{ CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69	{ CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },	94	{ CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70	{ CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },	95	{ CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
71	#endif	96	#endif
72		97
73	#if ENCODING_CN || ENCODING_CN_EXT	98	#if ENCODING_ZH || ENCODING_ZH_EXT
74	# if XFT	99	# if XFT
		100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
		101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
		102	{ CS_GBK_0, "xft::lang=zh" },
75	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
		107	{ CS_GB2312_1980_0, "xft::lang=zh" },
79	# endif	108	# endif
		109	{ CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
80	{ CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },	110	{ CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81	{ CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82	{ CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
		113	{ CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
83	{ CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },	114	{ CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
84	{ CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },	115	{ CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
85	{ CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },	116	{ CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
86	{ CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },	117	{ CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
87	{ CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },	118	{ CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
…		…
89	{ CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },	120	{ CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
90	{ CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },	121	{ CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
91	{ CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },	122	{ CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
92	#endif	123	#endif
93		124
		125	#if ENCODING_KR
		126	{ CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
		127	{ CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
		128	# if XFT
		129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
		130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
		131	# endif
		132	#endif
		133
		134	{ CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
		135	//{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
94	#if XFT	136	#if XFT
		137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
		138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
		139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
		140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
		141
		142	// FreeMono is usually uglier than x fonts, so try after the others
95	{ CS_UNICODE, "xft:Andale Mono" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
96	{ CS_UNICODE, "xft:Arial Unicode MS" },
97	#endif	144	#endif
98	{ CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },	145
99	{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },	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
100	{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },	148	//{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
101	{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },	149	//{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
102	#if XFT
103	// FreeMono is usually uglier than x fonts, so try last only.
104	//{ CS_UNICODE, "xft:FreeMono" },
105	#endif
106
107	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
108	};	151	};
109		152
		153	// these characters are used to guess the font height and width
		154	// pango uses a similar algorithm and doesn't trust the font either.
		155	static uint16_t extent_test_chars[] = {
		156	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
		157	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
		158	0x304c, 0x672c, // が本
		159	};
		160
		161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
		162
		163	#define dTermDisplay Display *disp = term->dpy
		164	#define dTermGC GC gc = term->gc
		165
110	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
111
112	#if XFT
113	rxvt_drawable::~rxvt_drawable ()
114	{
115	if (xftdrawable)
116	XftDrawDestroy (xftdrawable);
117	}
118
119	rxvt_drawable::operator XftDraw *()
120	{
121	if (!xftdrawable)
122	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
123
124	return xftdrawable;
125	}
126	#endif
127
128	/////////////////////////////////////////////////////////////////////////////
129
130	static void *enc_buf;
131	static uint32_t enc_len;
132
133	static inline void *
134	get_enc_buf (uint32_t len)
135	{
136	if (len > enc_len)
137	{
138	free (enc_buf);
139	enc_buf = malloc (len);
140	enc_len = len;
141	}
142
143	return enc_buf;
144	}
145		167
146	static const char *	168	static const char *
147	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)
148	{	170	{
149	uint8_t *buf = (uint8_t *)get_enc_buf (len);	171	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		172	uint8_t *res = buf;
150		173
151	while (len--)	174	while (len--)
152	{	175	{
153	uint32_t c = FROM_UNICODE (cs, *text++);	176	uint32_t c = FROM_UNICODE (cs, *text++);
154		177
…		…
159	}	182	}
160		183
161	*buf++ = c;	184	*buf++ = c;
162	}	185	}
163		186
164	return (const char *)enc_buf;	187	return (const char *)res;
165	}	188	}
166		189
167	static const XChar2b *	190	static const XChar2b *
168	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)
169	{	192	{
170	XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));	193	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		194	XChar2b *res = buf;
171		195
172	while (len--)	196	while (len--)
173	{	197	{
174	uint32_t c = FROM_UNICODE (cs, *text++);	198	uint32_t c = FROM_UNICODE (cs, *text++);
175		199
…		…
182	buf->byte1 = c >> 8;	206	buf->byte1 = c >> 8;
183	buf->byte2 = c;	207	buf->byte2 = c;
184	buf++;	208	buf++;
185	}	209	}
186		210
187	return (XChar2b *)enc_buf;	211	return res;
188	}	212	}
189		213
190	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
191		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
		220
192	void	221	void
		222	rxvt_font::set_name (char *name)
		223	{
		224	if (this->name == name)
		225	return;
		226
		227	if (this->name) free (this->name); // let the compiler optimize
		228	this->name = name;
		229	}
		230
		231	void
193	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
194	{	233	{
195	if (color == Color_bg)	234	dTermDisplay;
196	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);
197	else if (color >= 0)	239	else if (color >= 0)
198	{	240	{
199	#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)
200	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
201	#else	258	#else
202	XSetForeground (d.display->display, TGC, r->PixColors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
203	XFillRectangle (d.display->display, d, TGC, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
204	#endif	261	#endif
205	}	262	}
206	}	263	}
207		264
		265	/////////////////////////////////////////////////////////////////////////////
		266
208	#include "table/linedraw.h"	267	#include "table/linedraw.h"
209		268
210	struct rxvt_font_default : rxvt_font {	269	struct rxvt_font_default : rxvt_font {
		270	struct rxvt_fontset *fs;
		271
		272	rxvt_font_default (rxvt_fontset *fs)
		273	: rxvt_font ()
		274	{
		275	this->fs = fs;
		276	}
211		277
212	rxvt_fontprop properties ()	278	rxvt_fontprop properties ()
213	{	279	{
214	rxvt_fontprop p;	280	rxvt_fontprop p;
215		281
216	p.width = p.height = 1;	282	p.width = p.height = 1;
		283	p.ascent = rxvt_fontprop::unset;
217	p.weight = rxvt_fontprop::medium;	284	p.weight = rxvt_fontprop::medium;
218	p.slant = rxvt_fontprop::roman;	285	p.slant = rxvt_fontprop::roman;
219		286
220	return p;	287	return p;
221	}	288	}
222		289
223	bool load (const rxvt_fontprop &prop)	290	bool load (const rxvt_fontprop &prop, bool force_prop)
224	{	291	{
225	width = 1; height = 1;	292	width = 1; height = 1;
226	ascent = 1; descent = 0;	293	ascent = 1; descent = 0;
227		294
228	set_name (strdup ("built-in pseudofont"));	295	set_name (strdup ("built-in support font"));
229		296
230	return true;	297	return true;
231	}	298	}
232		299
233	bool has_codepoint (unicode_t unicode)	300	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
234	{	301	{
		302	careful = false;
		303
235	if (unicode <= 0x001f)	304	if (unicode <= 0x001f)
236	return true;	305	return true;
237		306
238	if (unicode <= 0x007f)	307	if (unicode <= 0x007f)
239	return false;	308	return false;
240		309
241	if (unicode <= 0x009f)	310	if (unicode <= 0x009f)
242	return true;	311	return true;
243		312
244	if (unicode >= 0x2500 && unicode <= 0x259f)	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
		314	!term->option (Opt_skipBuiltinGlyphs))
245	return true;	315	return true;
246		316
247	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
248	return true;	318	return true;
249		319
250	switch (unicode)	320	switch (unicode)
251	{	321	{
252	case ZERO_WIDTH_CHAR:	322	case ZERO_WIDTH_CHAR:
		323	case NOCHAR:
253	return true;	324	return true;
254	}	325	}
255		326
256	return false;	327	return false;
257	}	328	}
…		…
264	void	335	void
265	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	336	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266	const text_t *text, int len,	337	const text_t *text, int len,
267	int fg, int bg)	338	int fg, int bg)
268	{	339	{
		340	dTermDisplay;
		341	dTermGC;
		342
269	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);
270		344
271	XSetForeground (d.display->display, TGC, r->PixColors[fg]);	345	XSetForeground (disp, gc, term->pix_colors[fg]);
272		346
273	while (len--)	347	while (len)
274	{	348	{
275	#if ENABLE_COMBINING	349	#if ENABLE_COMBINING
276	compose_char *cc;	350	compose_char *cc;
277	#endif	351	#endif
		352	const text_t *tp = text;
278	text_t t = *text++;	353	text_t t = *tp;
		354
		355	while (++text, --len && *text == NOCHAR)
		356	;
		357
		358	int width = text - tp;
		359	int fwidth = term->fwidth * width;
279		360
280	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
281	{	362	{
282	uint16_t offs = linedraw_offs[t - 0x2500];	363	uint16_t offs = linedraw_offs[t - 0x2500];
283	uint32_t *a = linedraw_command + (offs >> 4);	364	uint32_t *a = linedraw_command + (offs >> 4);
284	uint32_t *b = a + (offs & 15);	365	uint32_t *b = a + (offs & 15);
285		366
286	int W = r->TermWin.fwidth;	367	int W = fwidth;
287	int H = r->TermWin.fheight;	368	int H = term->fheight;
288		369
289	int x_[16];	370	int x_[16];
290	int y_[16];	371	int y_[16];
291		372
292	for (int i = 0; i <= 8; i++)	373	for (int i = 0; i <= 8; i++)
…		…
300		381
301	XGCValues gcv;	382	XGCValues gcv;
302		383
303	gcv.cap_style = CapButt;	384	gcv.cap_style = CapButt;
304	gcv.line_width = 0;	385	gcv.line_width = 0;
305	XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);	386	XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
306		387
307	while (a < b)	388	while (a < b)
308	{	389	{
309	uint32_t command = *a++;	390	uint32_t command = *a++;
310		391
…		…
317	int y2 = y_[(command >> 0) & 15];	398	int y2 = y_[(command >> 0) & 15];
318		399
319	switch (op)	400	switch (op)
320	{	401	{
321	case 0: // line	402	case 0: // line
322	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);	403	XDrawLine (disp, d, gc, x1, y1, x2, y2);
323	break;	404	break;
324		405
325	case 1: // rectangle, possibly stippled	406	case 1: // rectangle, possibly stippled
326	if (a)	407	if (a)
327	{	408	{
328	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	409	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329		410
330	gcv.fill_style = FillStippled;	411	gcv.fill_style = FillStippled;
331	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);	412	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332	gcv.ts_x_origin = x;	413	gcv.ts_x_origin = x;
333	gcv.ts_y_origin = y;	414	gcv.ts_y_origin = y;
334		415
335	XChangeGC (d.display->display, TGC,	416	XChangeGC (disp, gc,
336	GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,	417	GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337	&gcv);	418	&gcv);
338	}	419	}
339		420
340	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	421	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341		422
342	if (a)	423	if (a)
343	{	424	{
344	XFreePixmap (d.display->display, gcv.stipple);	425	XFreePixmap (disp, gcv.stipple);
345	gcv.stipple = 0;	426	gcv.stipple = 0;
346	gcv.fill_style = FillSolid;	427	gcv.fill_style = FillSolid;
347	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);	428	XChangeGC (disp, gc, GCFillStyle, &gcv);
348	}	429	}
349	break;	430	break;
350	case 2: // arc	431	case 2: // arc
351	XDrawArc (d.display->display, d, TGC,	432	XDrawArc (disp, d, gc,
352	x1 - W/2, y1 - H/2, W-1, H-1,	433	x1 - W/2, y1 - H/2, W-1, H-1,
353	(a - 1) * 90*64, (b - 1) * 90*64);	434	(a - 1) * 90*64, (b - 1) * 90*64);
354	break;	435	break;
355	}	436	}
356	}	437	}
357	}	438	}
358	#if ENABLE_COMBINING	439	#if ENABLE_COMBINING
359	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	440	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360	{	441	{
		442	min_it (width, 2); // we only support wcwidth up to 2
		443
		444	text_t chrs[2];
		445	chrs [1] = NOCHAR;
		446
		447	*chrs = cc->c1;
361	rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];	448	rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);	449	f1->draw (d, x, y, chrs, width, fg, bg);
		450
363	if (cc->c2 != NOCHAR)	451	if (cc->c2 != NOCHAR)
364	{	452	{
		453	bool careful;
		454
365	// prefer font of first character, for no good reasons	455	// prefer font of first character, for no good reasons
366	rxvt_font *f2 = f1->has_codepoint (cc->c2)	456	*chrs = cc->c2;
		457	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367	? f1	458	? f1
368	: (*fs)[fs->find_font (cc->c2)];	459	: (*fs)[fs->find_font (cc->c2)];
369		460
370	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);	461	f2->draw (d, x, y, chrs, width, fg, Color_none);
371	}	462	}
372	}	463	}
373	#endif	464	#endif
374	else	465	else
375	switch (t)	466	switch (t)
376	{	467	{
		468	case '\t':
377	case ZERO_WIDTH_CHAR:	469	case ZERO_WIDTH_CHAR:
		470	case NOCHAR:
378	break;	471	break;
379		472
380	default:	473	default:
381	int w = 0;
382	while (len > 0 && *text == NOCHAR)
383	{
384	++text;
385	--len;
386	w += r->TermWin.fwidth;
387	}
388
389	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,	474	XDrawRectangle (disp, d, gc, x + 2, y + 2,
390	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);	475	fwidth - 4, term->fheight - 4);
391	x += w;
392	}	476	}
393		477
394	x += r->TermWin.fwidth;	478	x += fwidth;
395	}	479	}
396	}	480	}
397		481
398	/////////////////////////////////////////////////////////////////////////////	482	/////////////////////////////////////////////////////////////////////////////
399		483
…		…
402		486
403	void clear ();	487	void clear ();
404		488
405	rxvt_fontprop properties ();	489	rxvt_fontprop properties ();
406		490
407	bool load (const rxvt_fontprop &prop);	491	bool load (const rxvt_fontprop &prop, bool force_prop);
408		492
409	bool has_codepoint (unicode_t unicode);	493	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
410		494
411	void draw (rxvt_drawable &d, int x, int y,	495	void draw (rxvt_drawable &d, int x, int y,
412	const text_t *text, int len,	496	const text_t *text, int len,
413	int fg, int bg);	497	int fg, int bg);
414		498
		499	bool slow; // wether this is a proportional font or has other funny characteristics
415	XFontStruct *f;	500	XFontStruct *f;
416	codeset cs;
417	bool enc2b, encm;	501	bool enc2b, encm;
418		502
419	char *get_property (XFontStruct *f, const char *property, const char *repl) const;	503	char *get_property (XFontStruct *f, Atom property, const char *repl) const;
420	bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);	504	bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
421	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	505	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
422	bool set_properties (rxvt_fontprop &p, const char *name);	506	bool set_properties (rxvt_fontprop &p, const char *name);
423	};	507	};
424		508
425	char *	509	char *
426	rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const	510	rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
427	{	511	{
428	unsigned long value;	512	unsigned long value;
429		513
430	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	514	if (XGetFontProperty (f, property, &value))
431	return XGetAtomName (DISPLAY, value);	515	return XGetAtomName (term->dpy, value);
432	else	516	else
433	return rxvt_strdup (repl);	517	return rxvt_strdup (repl);
434	}	518	}
435		519
436	rxvt_fontprop	520	rxvt_fontprop
…		…
442	}	526	}
443		527
444	bool	528	bool
445	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)	529	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
446	{	530	{
447	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	531	p.width = width != rxvt_fontprop::unset ? width
		532	: avgwidth ? (avgwidth + 1) / 10
		533	: (height + 1) / 2;
448	p.height = height;	534	p.height = height;
		535	p.ascent = rxvt_fontprop::unset;
449	p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	536	p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
450	p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	537	p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451		538
452	return true;	539	return true;
453	}	540	}
454		541
455	bool	542	bool
456	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457	{	544	{
458	unsigned long height;	545	unsigned long height;
		546
		547	#if 0
459	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	548	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
460	return false;	549	return false;
		550	#else
		551	height = f->ascent + f->descent;
		552	#endif
461		553
462	unsigned long avgwidth;	554	unsigned long avgwidth;
463	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	555	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
464	avgwidth = 0;	556	avgwidth = 0;
465		557
466	char *weight = get_property (f, "WEIGHT_NAME", "medium");	558	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
467	char *slant = get_property (f, "SLANT", "r");	559	char *slant = get_property (f, term->xa [XA_SLANT], "r");
468		560
469	set_properties (p, height, weight, slant, avgwidth);	561	set_properties (p, height, weight, slant, avgwidth);
470		562
471	free (weight);	563	free (weight);
472	free (slant);	564	free (slant);
473		565
		566	p.ascent = f->ascent;
		567
474	return true;	568	return true;
475	}	569	}
476		570
477	bool	571	bool
478	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	572	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
479	{	573	{
		574	dTermDisplay;
480	int slashes = 0;	575	int slashes = 0;
481	const char *comp[13];	576	const char *comp[13];
482		577
483	for (const char *c = name; *c; c++)	578	for (const char *c = name; *c; c++)
484	if (*c == '-')	579	if (*c == '-')
…		…
492	if (slashes >= 13	587	if (slashes >= 13
493	&& (*comp[ 6] >= '1' && *comp[ 6] <= '9')	588	&& (*comp[ 6] >= '1' && *comp[ 6] <= '9')
494	&& (*comp[11] >= '0' && *comp[11] <= '9'))	589	&& (*comp[11] >= '0' && *comp[11] <= '9'))
495	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));	590	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
496		591
497	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	592	XFontStruct *f = XLoadQueryFont (disp, name);
498		593
499	if (f)	594	if (f)
500	{	595	{
501	// the font should really exist now. if not, we have a problem	596	// the font should really exist now. if not, we have a problem
502	// (e.g. if the user did xset fp rehash just when we were searching fonts).	597	// (e.g. if the user did xset fp rehash just when we were searching fonts).
503	// in that case, just return garbage.	598	// in that case, just return garbage.
504	bool ret = set_properties (p, f);	599	bool ret = set_properties (p, f);
505	XFreeFont (DISPLAY, f);	600	XFreeFont (disp, f);
506	return ret;	601	return ret;
507	}	602	}
508	else	603	else
509	return false;	604	return false;
510	}	605	}
511		606
512	// fix the size of scalable fonts	607	// fix the size of scalable fonts
513	static void	608	static bool
514	fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop)	609	replace_field (char *buf, const char *name, int index, const char old, const char *replace)
515	{	610	{
516	int slashes = 0;	611	int slashes = 0;
517	const char *size;	612	const char *field, *end;
518		613
519	for (const char *c = name; *c; c++)	614	for (const char *c = name; *c; c++)
520	if (*c == '-')	615	if (*c == '-')
521	{	616	{
522	if (slashes == 6)	617	if (slashes == index)
523	size = c + 1;	618	field = c + 1;
		619
		620	if (slashes == index + 1)
		621	end = c;
524		622
525	if (++slashes >= 13)	623	if (++slashes >= 13)
526	break;	624	break;
527	}	625	}
528		626
529	if (slashes >= 13 && size[0] == '0')	627	if (slashes >= 13 && (!old || *field == old))
530	{	628	{
		629	// TODO: check for overflow in font-name
531	strncpy (buf, name, size - name);	630	strncpy (buf, name, field - name);
532	buf += size - name;	631	buf += field - name;
533	buf += sprintf (buf, "%d", prop.height);
534	strcpy (buf, size + 1);	632	strcpy (buf, replace);
		633	strcat (buf, end);
		634
		635	return true;
535	}	636	}
536	else	637	else
		638	{
537	strcpy (buf, name);	639	strcpy (buf, name);
		640
		641	return false;
		642	}
538	}	643	}
539		644
540	bool	645	bool
541	rxvt_font_x11::load (const rxvt_fontprop &prop)	646	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
542	{	647	{
		648	dTermDisplay;
		649
543	clear ();	650	clear ();
		651
		652	char field_str[64]; // enough for 128 bits
		653
		654	// first morph the font if required
		655	if (force_prop)
		656	{
		657	char fname[1024];
		658
		659	if (name[0] != '-')
		660	{
		661	f = XLoadQueryFont (disp, name);
		662
		663	if (!f)
		664	return false;
		665
		666	char *new_name = get_property (f, XA_FONT, name);
		667
		668	if (new_name)
		669	set_name (new_name);
		670	else
		671	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
		672
		673	XFreeFont (disp, f);
		674	f = 0;
		675	}
		676
		677	if (prop.weight != rxvt_fontprop::unset)
		678	{
		679	replace_field (fname, name, 2, 0,
		680	prop.weight < rxvt_fontprop::bold
		681	? "medium" : "bold");
		682	set_name (strdup (fname));
		683	}
		684
		685	if (prop.slant != rxvt_fontprop::unset)
		686	{
		687	replace_field (fname, name, 3, 0,
		688	prop.slant < rxvt_fontprop::italic
		689	? "r" : "i"); // TODO: handle "o"blique, too
		690	set_name (strdup (fname));
		691	}
		692	}
		693
		694	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
		695	? 0 : prop.height);
		696
		697	struct font_weight {
		698	char *name;
		699	int diff;
		700
		701	void clear ()
		702	{
		703	name = 0;
		704	diff = 0x7fffffff;
		705	}
		706
		707	font_weight () { clear (); }
		708	~font_weight () { free (name); }
		709	};
544		710
545	char **list;	711	char **list;
546	int count;	712	int count;
547	list = XListFonts (DISPLAY, name, 1024, &count);	713	list = XListFonts (disp, name, 4000, &count);
		714
548	set_name (0);	715	set_name (0);
549		716
550	if (!list)	717	if (!list)
551	return false;	718	return false;
552		719
553	int bestdiff = 0x7fffffff;	720	font_weight *fonts = new font_weight[count];
		721
554	for (int i = 0; i < count; i++)	722	for (int i = 0; i < count; i++)
555	{	723	{
556	rxvt_fontprop p;	724	rxvt_fontprop p;
557	char fname[1024];	725	char fname[1024];
558	fix_scalable (fname, list[i], prop);	726
		727	int diff = 0;
		728
		729	if (replace_field (fname, list[i], 6, '0', field_str))
		730	diff += 10; // slightly penalize scalable fonts
		731	else if (replace_field (fname, list[i], 11, '0', "0"))
		732	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
559		733
560	if (!set_properties (p, fname))	734	if (!set_properties (p, fname))
561	continue;	735	continue;
562		736
		737	if (prop.height != rxvt_fontprop::unset
563	if (p.height > prop.height) // weed out too large fonts	738	&& p.height > prop.height) // weed out too large fonts
564	continue;	739	continue;
565		740
566	int diff = (prop.height - p.height) * 32	741	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567	+ abs (prop.weight - p.weight)	742	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568	+ abs (prop.slant - p.slant );	743	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
		744	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569		745
570	if (!name // compare against best found so far	746	fonts[i].name = strdup (fname);
571	|| diff < bestdiff)	747	fonts[i].diff = diff;
572	{
573	set_name (strdup (fname));
574	bestdiff = diff;
575	}
576	}	748	}
577		749
578	XFreeFontNames (list);	750	XFreeFontNames (list);
579		751
580	if (!name)	752	// this loop only iterates when the guessed font-size is too small
581	return false;	753	for (;;)
		754	{
		755	font_weight *best = fonts + count - 1;
582		756
583	f = XLoadQueryFont (DISPLAY, name);	757	for (font_weight *w = best; w-- > fonts; )
		758	if (w->diff <= best->diff)
		759	best = w;
		760
		761	if (!best->name
		762	|| !(f = XLoadQueryFont (disp, best->name)))
		763	break;
		764
		765	set_name (best->name);
		766	best->clear ();
		767
		768	ascent = f->ascent;
		769	descent = f->descent;
		770	height = ascent + descent;
		771
		772	if (prop.height == rxvt_fontprop::unset
		773	|| height <= prop.height)
		774	break; // font is ready for use
		775
		776	// PIXEL_SIZE small enough, but real height too large
		777	clear ();
		778	}
		779
		780	delete [] fonts;
584		781
585	if (!f)	782	if (!f)
586	return false;	783	return false;
587		784
588	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	785	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
589	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	786	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
590		787
591	if (registry && encoding)	788	if (registry && encoding)
592	{	789	{
593	char charset[64];	790	char charset[64];
594	snprintf (charset, 64, "%s-%s", registry, encoding);	791	snprintf (charset, 64, "%s-%s", registry, encoding);
595		792
596	cs = codeset_from_name (charset);	793	cs = codeset_from_name (charset);
597	}	794	}
598	else	795	else
599	{	796	{
600	const char *charset = get_property (f, "FONT", 0);	797	const char *charset = get_property (f, XA_FONT, 0);
601		798
602	if (!charset)	799	if (!charset)
603	charset = name;	800	charset = name;
604		801
605	int count = 13;	802	int count = 13;
…		…
617	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	814	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618		815
619	encm = f->min_byte1 != 0 || f->max_byte1 != 0;	816	encm = f->min_byte1 != 0 || f->max_byte1 != 0;
620	enc2b = encm || f->max_char_or_byte2 > 255;	817	enc2b = encm || f->max_char_or_byte2 > 255;
621		818
622	ascent = f->ascent;
623	descent = f->descent;
624	height = ascent + descent;
625
626	slow = false;	819	slow = false;
627		820
		821	#if 1 // only used for slow detection, TODO optimize
628	if (f->min_bounds.width == f->max_bounds.width)	822	if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
629	width = f->min_bounds.width;
630	else if (f->per_char == NULL)
631	width = f->max_bounds.width;	823	width = f->max_bounds.width;
632	else	824	else
633	{	825	{
634	slow = true;	826	slow = true;
635		827
…		…
645	width = f->per_char[N].width;	837	width = f->per_char[N].width;
646		838
647	--N;	839	--N;
648	}	840	}
649	}	841	}
		842	#endif
		843
		844	width = 1;
		845
		846	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		847	{
		848	if (FROM_UNICODE (cs, *t) == NOCHAR)
		849	continue;
		850
		851	// ignore characters we wouldn't use anyways
		852	bool careful;
		853	if (!has_char (*t, &prop, careful))
		854	continue;
		855
		856	XChar2b ch = { *t >> 8, *t };
		857
		858	XCharStruct g;
		859	int dir_ret, asc_ret, des_ret;
		860	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
		861
		862	int wcw = WCWIDTH (*t);
		863	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
		864
		865	if (width < g.width) width = g.width;
		866	}
650		867
651	if (cs == CS_UNKNOWN)	868	if (cs == CS_UNKNOWN)
652	{	869	{
653	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	870	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654		871
655	clear ();	872	clear ();
656
657	return false;	873	return false;
658	}	874	}
		875
		876	#if 0 // do it per-character
		877	if (prop && width > prop->width)
		878	{
		879	clear ();
		880	return false;
		881	}
		882	#endif
659		883
660	return true;	884	return true;
661	}	885	}
662		886
663	void	887	void
664	rxvt_font_x11::clear ()	888	rxvt_font_x11::clear ()
665	{	889	{
666	if (f)	890	if (f)
667	{	891	{
668	XFreeFont (DISPLAY, f);	892	XFreeFont (term->dpy, f);
669	f = 0;	893	f = 0;
670	}	894	}
671	}	895	}
672		896
673	bool	897	bool
674	rxvt_font_x11::has_codepoint (unicode_t unicode)	898	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
675	{	899	{
676	uint32_t ch = FROM_UNICODE (cs, unicode);	900	uint32_t ch = FROM_UNICODE (cs, unicode);
677		901
678	if (ch == NOCHAR)	902	if (ch == NOCHAR)
679	return false;	903	return false;
…		…
688		912
689	if (byte1 < f->min_byte1 || byte1 > f->max_byte1	913	if (byte1 < f->min_byte1 || byte1 > f->max_byte1
690	|| byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)	914	|| byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
691	return false;	915	return false;
692		916
693	if (!f->per_char)	917	if (f->per_char)
694	return true;	918	{
695
696	int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;	919	int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697	int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;	920	int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698		921
699	xcs = f->per_char + N;	922	xcs = f->per_char + N;
		923	}
		924	else
		925	xcs = &f->max_bounds;
700	}	926	}
701	else	927	else
702	{	928	{
703	if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)	929	if (ch < f->min_char_or_byte2 || ch > f->max_char_or_byte2)
704	return false;	930	return false;
705		931
706	if (!f->per_char)	932	if (f->per_char)
707	return true;
708
709	xcs = f->per_char + (ch - f->min_char_or_byte2);	933	xcs = f->per_char + (ch - f->min_char_or_byte2);
		934	else
		935	xcs = &f->max_bounds;
710	}	936	}
711		937
712	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0	938	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713	&& xcs->ascent == 0 && xcs->descent == 0)	939	&& xcs->ascent == 0 && xcs->descent == 0)
		940	return false;
		941
		942	if (!prop || prop->width == rxvt_fontprop::unset)
		943	return true;
		944
		945	// check wether character overlaps previous/next character
		946	int w = xcs->rbearing - xcs->lbearing;
		947	int wcw = max (WCWIDTH (unicode), 1);
		948
		949	careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
		950
		951	if (careful && !OVERLAP_OK (w, wcw, prop))
714	return false;	952	return false;
715		953
716	return true;	954	return true;
717	}	955	}
718		956
…		…
724	// this looks like a mess /.	962	// this looks like a mess /.
725	// and it is a mess /.	963	// and it is a mess /.
726	// yet we are trying to be perfect /.	964	// yet we are trying to be perfect /.
727	// but the result still isn't perfect /.	965	// but the result still isn't perfect /.
728		966
		967	dTermDisplay;
		968	dTermGC;
		969
729	bool slow = this->slow	970	bool slow = this->slow
730	|| width != r->TermWin.fwidth	971	|| width != term->fwidth
731	|| height != r->TermWin.fheight;	972	|| height != term->fheight;
732		973
733	int base = r->TermWin.fbase;	974	int base = ascent; // sorry, incorrect: term->fbase;
734		975
735	XGCValues v;	976	XGCValues v;
736	v.foreground = r->PixColors[fg];	977	v.foreground = term->pix_colors[fg];
737	v.font = f->fid;	978	v.font = f->fid;
738		979
739	if (enc2b)	980	if (enc2b)
740	{	981	{
741	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	982	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
742		983
743	if (bg == Color_bg && !slow)	984	if (bg == Color_bg && !slow)
744	{	985	{
745	v.background = r->PixColors[bg];	986	v.background = term->pix_colors[bg];
746	XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);	987	XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
747	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	988	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
748	}	989	}
749	else	990	else
750	{	991	{
751	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	992	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
752		993
753	XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);	994	XChangeGC (disp, gc, GCForeground | GCFont, &v);
754		995
755	if (slow)	996	if (slow)
756	{	997	{
757	do	998	do
758	{	999	{
759	if (xc->byte1 || xc->byte2)	1000	if (xc->byte1 || xc->byte2)
760	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1001	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
761		1002
762	x += r->TermWin.fwidth;	1003	x += term->fwidth;
763	xc++; len--;	1004	xc++; len--;
764	}	1005	}
765	while (len);	1006	while (len);
766	}	1007	}
767	else	1008	else
768	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1009	XDrawString16 (disp, d, gc, x, y + base, xc, len);
769	}	1010	}
770	}	1011	}
771	else	1012	else
772	{	1013	{
773	const char *xc = enc_char (text, len, cs, slow);	1014	const char *xc = enc_char (text, len, cs, slow);
774		1015
775	if (bg == Color_bg && !slow)	1016	if (bg == Color_bg && !slow)
776	{	1017	{
777	v.background = r->PixColors[bg];	1018	v.background = term->pix_colors[bg];
778	XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);	1019	XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
779	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1020	XDrawImageString (disp, d, gc, x, y + base, xc, len);
780	}	1021	}
781	else	1022	else
782	{	1023	{
783	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1024	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
784		1025
785	XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);	1026	XChangeGC (disp, gc, GCForeground | GCFont, &v);
786		1027
787	if (slow)	1028	if (slow)
788	{	1029	{
789	do	1030	do
790	{	1031	{
791	if (*xc)	1032	if (*xc)
792	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1033	XDrawString (disp, d, gc, x, y + base, xc, 1);
793		1034
794	x += r->TermWin.fwidth;	1035	x += term->fwidth;
795	xc++; len--;	1036	xc++; len--;
796	}	1037	}
797	while (len);	1038	while (len);
798	}	1039	}
799	else	1040	else
800	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1041	XDrawString (disp, d, gc, x, y + base, xc, len);
801	}	1042	}
802	}	1043	}
803	}	1044	}
804		1045
805	/////////////////////////////////////////////////////////////////////////////	1046	/////////////////////////////////////////////////////////////////////////////
806		1047
807	#if XFT	1048	#if XFT
808	#if 0
809	#define UNIBITS 21
810	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811	#define SWATHBITS 8
812	#endif
813		1049
814	struct rxvt_font_xft : rxvt_font {	1050	struct rxvt_font_xft : rxvt_font {
815	rxvt_font_xft () { f = 0; }	1051	rxvt_font_xft () { f = 0; }
816		1052
817	void clear ();	1053	void clear ();
818		1054
819	rxvt_fontprop properties ();	1055	rxvt_fontprop properties ();
820		1056
821	bool load (const rxvt_fontprop &prop);	1057	bool load (const rxvt_fontprop &prop, bool force_prop);
822		1058
823	void draw (rxvt_drawable &d, int x, int y,	1059	void draw (rxvt_drawable &d, int x, int y,
824	const text_t *text, int len,	1060	const text_t *text, int len,
825	int fg, int bg);	1061	int fg, int bg);
826		1062
827	bool has_codepoint (unicode_t unicode);	1063	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
828		1064
829	protected:	1065	protected:
830	XftFont *f;	1066	XftFont *f;
831	};	1067	};
832		1068
833	void	1069	void
834	rxvt_font_xft::clear ()	1070	rxvt_font_xft::clear ()
835	{	1071	{
836	if (f)	1072	if (f)
837	{	1073	{
838	XftFontClose (DISPLAY, f);	1074	XftFontClose (term->dpy, f);
839	f = 0;	1075	f = 0;
840	}	1076	}
841	}	1077	}
842		1078
843	rxvt_fontprop	1079	rxvt_fontprop
…		…
847		1083
848	FT_Face face = XftLockFace (f);	1084	FT_Face face = XftLockFace (f);
849		1085
850	p.width = width;	1086	p.width = width;
851	p.height = height;	1087	p.height = height;
		1088	p.ascent = ascent;
852	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD	1089	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
853	? rxvt_fontprop::bold : rxvt_fontprop::medium;	1090	? rxvt_fontprop::bold : rxvt_fontprop::medium;
854	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC	1091	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
855	? rxvt_fontprop::italic : rxvt_fontprop::roman;	1092	? rxvt_fontprop::italic : rxvt_fontprop::roman;
856		1093
…		…
858		1095
859	return p;	1096	return p;
860	}	1097	}
861		1098
862	bool	1099	bool
863	rxvt_font_xft::load (const rxvt_fontprop &prop)	1100	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
864	{	1101	{
865	#if 0	1102	dTermDisplay;
866	for (int i = 0; i < SWATHCOUNT; i++)
867	cvr[i] = 0;
868	#endif
869		1103
870	clear ();	1104	clear ();
871		1105
872	FcPattern *p = FcNameParse ((FcChar8 *) name);	1106	FcPattern *p = FcNameParse ((FcChar8 *) name);
873		1107
874	if (!p)	1108	if (!p)
875	return false;	1109	return false;
876		1110
877	FcValue v;	1111	FcValue v;
878		1112
		1113	if (prop.height != rxvt_fontprop::unset
879	if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)	1114	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
		1115	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1116	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881		1117
		1118	if (prop.weight != rxvt_fontprop::unset
882	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1119	&& (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
883	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1120	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884		1121
		1122	if (prop.slant != rxvt_fontprop::unset
885	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1123	&& (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
886	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1124	FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889	FcPatternAddBool (p, FC_MINSPACE, 1);
890		1125
891	#if 0 // clipping unfortunately destroys our precious double-width-characters	1126	#if 0 // clipping unfortunately destroys our precious double-width-characters
892	// clip width, we can't do better, or can we?	1127	// clip width, we can't do better, or can we?
893	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1128	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);	1129	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895	#endif	1130	#endif
896		1131
		1132	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
		1133	FcPatternAddBool (p, FC_MINSPACE, 1);
		1134
		1135	// store generated name so iso14755 view gives better results
		1136	set_name ((char *)FcNameUnparse (p));
		1137
897	XftResult result;	1138	XftResult result;
898	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1139	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
899		1140
900	FcPatternDestroy (p);	1141	FcPatternDestroy (p);
901		1142
902	if (!match)	1143	if (!match)
903	return false;	1144	return false;
904		1145
905	f = XftFontOpenPattern (DISPLAY, match);
906
907	if (!f)
908	{
909	FcPatternDestroy (match);
910	return false;
911	}
912
913	FT_Face face = XftLockFace (f);
914
915	slow = !FT_IS_FIXED_WIDTH (face);
916
917	int ftheight = 0;	1146	int ftheight = 0;
		1147	bool success = true;
918		1148
919	for (;;)	1149	for (;;)
920	{	1150	{
921	XGlyphInfo g1, g2;	1151	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922	FcChar8 c;
923		1152
924	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	1153	if (!f)
925	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	1154	{
		1155	success = false;
		1156	break;
		1157	}
926		1158
927	if (g1.xOff != g2.xOff) // don't simply trust the font	1159	FT_Face face = XftLockFace (f);
928	slow = true;
929		1160
930	width = g2.xOff;
931	ascent = (face->size->metrics.ascender + 63) >> 6;	1161	ascent = (face->size->metrics.ascender + 63) >> 6;
932	descent = (-face->size->metrics.descender + 63) >> 6;	1162	descent = (-face->size->metrics.descender + 63) >> 6;
933	height = ascent + descent;	1163	height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
		1164	width = 0;
934		1165
		1166	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
		1167
		1168	XftUnlockFace (f);
		1169
		1170	int glheight = height;
		1171
		1172	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		1173	{
		1174	FcChar16 ch = *t;
		1175
		1176	if (cs != CS_UNICODE
		1177	&& ch > 0x100
		1178	&& FROM_UNICODE (cs, ch) == NOCHAR)
		1179	continue;
		1180
		1181	// ignore characters we wouldn't use anyways
		1182	bool careful;
		1183	if (!has_char (*t, &prop, careful))
		1184	continue;
		1185
		1186	XGlyphInfo g;
		1187	XftTextExtents16 (disp, f, &ch, 1, &g);
		1188
		1189	g.width -= g.x;
		1190
		1191	int wcw = WCWIDTH (ch);
		1192	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
		1193
		1194	if (width < g.width ) width = g.width;
		1195	if (height < g.height ) height = g.height;
		1196	if (glheight < g.height - g.y) glheight = g.height - g.y;
		1197	}
		1198
		1199	if (!width)
		1200	{
		1201	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
		1202
		1203	XftFontClose (disp, f);
		1204	f = 0;
		1205
		1206	success = false;
		1207	break;
		1208	}
		1209
		1210	if (prop.height == rxvt_fontprop::unset
935	if (height <= prop.height || !prop.height)	1211	|| (height <= prop.height && glheight <= prop.height)
		1212	|| height <= 2
		1213	|| !scalable)
936	break;	1214	break;
937		1215
938	if (ftheight)	1216	if (ftheight)
939	{	1217	{
940	// take smaller steps near the end	1218	// take smaller steps near the end
941	if (height > prop.height + 1) ftheight++;	1219	if (height > prop.height + 1) ftheight++;
942	if (height > prop.height + 2) ftheight++;	1220	if (height > prop.height + 2) ftheight++;
943	if (height > prop.height + 3) ftheight++;	1221	if (height > prop.height + 3) ftheight++;
944		1222
945	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);	1223	ftheight -= height - prop.height;
946	}	1224	}
947	else	1225	else
948	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);	1226	ftheight = prop.height - 1;
		1227
		1228	XftFontClose (disp, f);
		1229	FcPatternDel (match, FC_PIXEL_SIZE);
		1230	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
		1231	}
		1232
		1233	FcPatternDestroy (match);
		1234
		1235	#if 0 // do it per-character
		1236	if (prop.width != rxvt_fontprop::unset && width > prop.width)
949	}	1237	{
		1238	clear ();
		1239	success = false;
		1240	}
		1241	#endif
950		1242
951	XftUnlockFace (f);	1243	return success;
		1244	}
		1245
		1246	bool
		1247	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		1248	{
		1249	careful = false;
		1250
		1251	if (!XftCharExists (term->dpy, f, unicode))
		1252	return false;
		1253
		1254	if (!prop || prop->width == rxvt_fontprop::unset)
		1255	return true;
		1256
		1257	// check character against base font bounding box
		1258	FcChar32 ch = unicode;
		1259	XGlyphInfo g;
		1260	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
		1261
		1262	int w = g.width - g.x;
		1263	int wcw = max (WCWIDTH (unicode), 1);
		1264
		1265	careful = g.x > 0 || w > prop->width * wcw;
		1266
		1267	if (careful && !OVERLAP_OK (w, wcw, prop))
		1268	return false;
		1269
		1270	// this weeds out _totally_ broken fonts, or glyphs
		1271	if (!OVERLAP_OK (g.xOff, wcw, prop))
		1272	return false;
952		1273
953	return true;	1274	return true;
954	}
955
956	bool
957	rxvt_font_xft::has_codepoint (unicode_t unicode)
958	{
959	return XftCharExists (DISPLAY, f, unicode);
960	}	1275	}
961		1276
962	void	1277	void
963	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964	const text_t *text, int len,	1279	const text_t *text, int len,
965	int fg, int bg)	1280	int fg, int bg)
966	{	1281	{
967	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1282	XGlyphInfo extents;
		1283	XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
		1284	XftGlyphSpec *ep = enc;
968		1285
969	if (!slow && width == r->TermWin.fwidth && 0)	1286	dTermDisplay;
970	{	1287	dTermGC;
971	if (sizeof (text_t) == sizeof (FcChar16))	1288
972	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	1289	int w = term->fwidth * len;
973	else	1290	int h = term->fheight;
974	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	1291
975	}	1292	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
976	else	1293	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
977	{	1294	* good idea from the perspective of packaging for wide variety of user configs.
		1295	*/
		1296	bool buffered = true
		1297	#ifdef FORCE_UNBUFFERED_XFT
		1298	&& bg >= 0
		1299	#endif
		1300	;
		1301	// cut trailing spaces
		1302	while (len && text [len - 1] == ' ')
		1303	len--;
		1304
		1305	int x_ = buffered ? 0 : x;
		1306	int y_ = buffered ? 0 : y;
		1307
978	while (len)	1308	while (len)
		1309	{
		1310	int cwidth = term->fwidth;
		1311	FcChar32 fc = *text++; len--;
		1312
		1313	while (len && *text == NOCHAR)
		1314	text++, len--, cwidth += term->fwidth;
		1315
		1316	if (fc != ' ') // skip spaces
		1317	{
		1318	FT_UInt glyph = XftCharIndex (disp, f, fc);
		1319	XftGlyphExtents (disp, f, &glyph, 1, &extents);
		1320
		1321	ep->glyph = glyph;
		1322	ep->x = x_ + (cwidth - extents.xOff >> 1);
		1323	ep->y = y_ + ascent;
		1324
		1325	if (extents.xOff == 0)
		1326	ep->x = x_ + cwidth;
		1327
		1328	ep++;
979	{	1329	}
980	if (*text != NOCHAR && *text != ' ')	1330
		1331	x_ += cwidth;
		1332	}
		1333
		1334	if (buffered)
		1335	{
		1336	bool back_rendered = false;
		1337	if (ep != enc)
		1338	{
		1339	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1340
		1341	#ifdef HAVE_BG_PIXMAP
		1342	if (term->bgPixmap.pixmap)
981	{	1343	{
982	int fwidth = r->TermWin.fwidth;	1344	Picture dst = 0;
983	if (len >= 2 && text[1] == NOCHAR)
984	fwidth *= 2;
985		1345
986	XGlyphInfo extents;	1346	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
987	if (sizeof (text_t) == sizeof (FcChar16))	1347	dst = XftDrawPicture (d2);
		1348
		1349	if (bg < 0 || dst != 0)
988	{	1350	{
989	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);	1351	int src_x = x, src_y = y ;
990	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
991	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
992	}	1352
		1353	if (term->bgPixmap.is_parentOrigin ())
		1354	{
		1355	src_x += term->window_vt_x;
		1356	src_y += term->window_vt_y;
		1357	}
		1358
		1359	if (term->bgPixmap.pmap_width >= src_x+w
		1360	&& term->bgPixmap.pmap_height >= src_y+h)
		1361	{
		1362	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1363	src_x, src_y, w, h, 0, 0);
		1364	}
993	else	1365	else
994	{	1366	{
995	XGlyphInfo extents;	1367	XGCValues gcv;
996	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);	1368
997	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,	1369	gcv.fill_style = FillTiled;
998	y + r->TermWin.fbase, (const FcChar32 *)text, 1);	1370	gcv.tile = term->bgPixmap.pixmap;
		1371	gcv.ts_x_origin = -src_x;
		1372	gcv.ts_y_origin = -src_y;
		1373
		1374	XChangeGC (disp, gc,
		1375	GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
		1376	&gcv);
		1377
		1378	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1379
		1380	gcv.fill_style = FillSolid;
		1381	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1382	}
		1383
		1384	if (bg >= 0)
		1385	{
		1386	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1387	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1388	}
		1389
		1390	back_rendered = true;
999	}	1391	}
1000	}	1392	}
1001
1002	x += r->TermWin.fwidth;
1003	text++;
1004	len--;
1005	}
1006	}
1007	}
1008	#endif	1393	#endif
1009		1394
		1395	if (bg >= 0 && !back_rendered)
		1396	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1397
		1398	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1399	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1400	}
		1401	else
		1402	clear_rect (d, x, y, w, h, bg);
		1403	}
		1404	else
		1405	{
		1406	clear_rect (d, x, y, w, h, bg);
		1407	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1408	}
		1409	}
		1410
		1411	#endif
		1412
1010	/////////////////////////////////////////////////////////////////////////////	1413	/////////////////////////////////////////////////////////////////////////////
1011		1414
1012	rxvt_fontset::rxvt_fontset (rxvt_t r)	1415	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1013	: r (r), fontdesc (0)	1416	: fontdesc (0), term (term)
1014	{	1417	{
1015	clear ();	1418	clear ();
1016	}	1419	}
1017		1420
1018	rxvt_fontset::~rxvt_fontset ()	1421	rxvt_fontset::~rxvt_fontset ()
…		…
1021	}	1424	}
1022		1425
1023	void	1426	void
1024	rxvt_fontset::clear ()	1427	rxvt_fontset::clear ()
1025	{	1428	{
		1429	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
		1430	= rxvt_fontprop::unset;
		1431	force_prop = false;
		1432
1026	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1433	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027	FONT_UNREF (*i);	1434	FONT_UNREF (*i);
1028		1435
		1436	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
		1437	delete *p;
		1438
1029	free (fontdesc); fontdesc = 0;	1439	free (fontdesc); fontdesc = 0;
1030		1440
1031	fonts.clear ();	1441	fonts.clear ();
1032	base_id = 0;
1033	base_prop.height = 0x7fffffff;
1034	base_prop.weight = rxvt_fontprop::medium;
1035	base_prop.slant = rxvt_fontprop::roman;
1036		1442
1037	fallback = fallback_fonts;	1443	fallback = fallback_fonts;
1038	}	1444	}
1039		1445
1040	rxvt_font *	1446	rxvt_font *
…		…
1043	rxvt_font *f;	1449	rxvt_font *f;
1044		1450
1045	if (!name || !*name)	1451	if (!name || !*name)
1046	{	1452	{
1047	name = "";	1453	name = "";
1048	f = new rxvt_font_default;	1454	f = new rxvt_font_default (this);
1049	}	1455	}
1050	#if XFT	1456	#if XFT
1051	else if (!strncmp (name, "xft:", 4))	1457	else if (!strncmp (name, "xft:", 4))
1052	{	1458	{
1053	name += 4;	1459	name += 4;
1054	f = new rxvt_font_xft;	1460	f = new rxvt_font_xft ();
1055	}	1461	}
1056	#endif	1462	#endif
1057	else if (!strncmp (name, "x:", 2))	1463	else if (!strncmp (name, "x:", 2))
1058	{	1464	{
1059	name += 2;	1465	name += 2;
1060	f = new rxvt_font_x11;	1466	f = new rxvt_font_x11;
1061	}	1467	}
1062	else	1468	else
1063	f = new rxvt_font_x11;	1469	f = new rxvt_font_x11;
1064		1470
1065	f->fs = this;
1066	f->set_term (r);	1471	f->set_term (term);
1067	f->set_name (strdup (name));	1472	f->set_name (strdup (name));
1068		1473
1069	f->cs = cs;	1474	f->cs = cs;
1070	f->loaded = false;	1475	f->loaded = false;
1071		1476
…		…
1082	char buf[512];	1487	char buf[512];
1083	const char *end;	1488	const char *end;
1084		1489
1085	do	1490	do
1086	{	1491	{
1087	while (*desc <= ' ') desc++;	1492	while (*desc && *desc <= ' ')
		1493	desc++;
		1494
		1495	codeset cs = CS_UNICODE;
1088		1496
1089	if (*desc == '[')	1497	if (*desc == '[')
1090	{	1498	{
1091	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1499	char spec[256];
1092
1093	//const char *extra = desc++; // not yet used	1500	const char *extra = ++desc; // not yet used
1094		1501
1095	desc = strchr (desc, ']');	1502	desc = strchr (desc, ']');
1096		1503
1097	if (!desc)	1504	if (!desc)
1098	{	1505	{
1099	fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n");	1506	rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100	break;	1507	break;
1101	}	1508	}
		1509
		1510	memcpy (spec, extra, min (desc - extra, 255));
		1511	spec[min (desc - extra, 255)] = 0;
		1512
		1513	if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
		1514	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
		1515	else
		1516	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102		1517
1103	desc++;	1518	desc++;
1104	while (*desc <= ' ') desc++;	1519	while (*desc <= ' ') desc++;
1105	}	1520	}
1106		1521
…		…
1111	if (end - desc < 511)	1526	if (end - desc < 511)
1112	{	1527	{
1113	strncpy (buf, desc, end - desc);	1528	strncpy (buf, desc, end - desc);
1114	buf[end - desc] = 0;	1529	buf[end - desc] = 0;
1115		1530
1116	fonts.push_back (new_font (buf, CS_UNICODE));	1531	fonts.push_back (new_font (buf, cs));
1117	}	1532	}
		1533	else
		1534	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118		1535
1119	desc = end + 1;	1536	desc = end + 1;
1120	}	1537	}
1121	while (*end);	1538	while (*end);
1122	}	1539	}
1123	}	1540	}
1124		1541
1125	bool	1542	bool
1126	rxvt_fontset::realize_font (int i)	1543	rxvt_fontset::realize_font (int i)
1127	{	1544	{
		1545	if (i < 0 || i >= fonts.size ())
		1546	return false;
		1547
1128	if (fonts[i]->loaded)	1548	if (fonts[i]->loaded)
1129	return true;	1549	return true;
1130		1550
1131	fonts[i]->loaded = true;	1551	fonts[i]->loaded = true;
1132		1552
1133	if (!fonts[i]->load (base_prop))	1553	if (!fonts[i]->load (prop, force_prop))
1134	{	1554	{
1135	fonts[i]->cs = CS_UNKNOWN;	1555	fonts[i]->cs = CS_UNKNOWN;
1136	return false;	1556	return false;
1137	}	1557	}
1138		1558
…		…
1148		1568
1149	fonts.push_back (new_font (0, CS_UNICODE));	1569	fonts.push_back (new_font (0, CS_UNICODE));
1150	realize_font (0);	1570	realize_font (0);
1151		1571
1152	add_fonts (desc);	1572	add_fonts (desc);
1153
1154	if (!base_id)
1155	base_id = 1;
1156
1157	// we currently need a base-font, no matter what
1158	if ((int)fonts.size () <= base_id || !realize_font (base_id))
1159	{
1160	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161	add_fonts ("fixed");
1162	base_id = fonts.size () - 1;
1163	}
1164
1165	if ((int)fonts.size () <= base_id || !realize_font (base_id))
1166	return false;
1167
1168	base_prop = fonts[base_id]->properties ();
1169		1573
1170	return true;	1574	return true;
1171	}	1575	}
1172		1576
1173	int	1577	int
…		…
1179		1583
1180	return -1;	1584	return -1;
1181	}	1585	}
1182		1586
1183	int	1587	int
1184	rxvt_fontset::find_font (unicode_t unicode, bool bold)	1588	rxvt_fontset::find_font (unicode_t unicode)
1185	{	1589	{
		1590	if (unicode >= 1<<20)
		1591	return 0;
1186		1592
1187	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii	1593	unicode_t hi = unicode >> 8;
1188	i < fonts.size ();	1594
1189	i++)	1595	if (hi < fmap.size ()
		1596	&& fmap[hi]
		1597	&& (*fmap[hi])[unicode & 0xff] != 0xff)
		1598	return (*fmap[hi])[unicode & 0xff];
		1599
		1600	unsigned int i;
		1601
		1602	for (i = 0; i < fonts.size (); i++)
1190	{	1603	{
1191	rxvt_font *f = fonts[i];	1604	rxvt_font *f = fonts[i];
1192		1605
1193	if (!f->loaded)	1606	if (!f->loaded)
1194	{	1607	{
1195	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1608	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1196	goto next_font;	1609	goto next_font;
1197		1610
1198	if (!realize_font (i))	1611	if (!realize_font (i))
1199	goto next_font;	1612	goto next_font;
		1613
		1614	if (prop.ascent != rxvt_fontprop::unset)
		1615	max_it (f->ascent, prop.ascent);
1200	}	1616	}
1201		1617
1202	if (f->cs == CS_UNKNOWN)	1618	if (f->cs == CS_UNKNOWN)
1203	goto next_font;	1619	goto next_font;
1204		1620
1205	if (bold && f->properties ().weight < rxvt_fontprop::bold)	1621	bool careful;
		1622	if (f->has_char (unicode, &prop, careful))
		1623	{
		1624	if (careful)
		1625	i |= 128;
		1626
1206	goto next_font;	1627	goto found;
1207		1628	}
1208	if (f->has_codepoint (unicode))
1209	return i;
1210		1629
1211	next_font:	1630	next_font:
1212	if (i == fonts.size () - 1)	1631	if (i == fonts.size () - 1)
1213	{	1632	{
1214	if (fallback->name)	1633	if (fallback->name)
…		…
1221	{	1640	{
1222	// try to find a new font.	1641	// try to find a new font.
1223	// only xft currently supported, as there is no	1642	// only xft currently supported, as there is no
1224	// way to configure this and xft is easier to hack in,	1643	// way to configure this and xft is easier to hack in,
1225	// while x11 has more framework in place already.	1644	// while x11 has more framework in place already.
1226	#if XFT	1645	// TODO: this is a real resource hog, xft takes ages(?)
		1646	#if XFT && USE_SLOW_LOOKUP
1227	// grab the first xft font that seems suitable	1647	// grab the first xft font that seems suitable
1228	FcPattern *p = FcPatternCreate ();	1648	FcPattern *p = FcPatternCreate ();
1229		1649
1230	FcCharSet *s = FcCharSetCreate ();	1650	FcCharSet *s = FcCharSetCreate ();
1231	FcCharSetAddChar (s, unicode);	1651	FcCharSetAddChar (s, unicode);
1232	FcPatternAddCharSet (p, FC_CHARSET, s);	1652	FcPatternAddCharSet (p, FC_CHARSET, s);
1233	// charsets don't help that much, as xft might return	1653	// charsets don't help that much, as xft might return
1234	// a non-matching font even if a better font is available :/	1654	// a non-matching font even if a better font is available :/
1235		1655
		1656	x x x x TODO prop might have unset contents
1236	FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);	1657	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237	FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);	1658	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238	FcPatternAddInteger (p, FC_SLANT, base_prop.slant);	1659	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239	FcPatternAddBool (p, FC_MINSPACE, 1);	1660	FcPatternAddBool (p, FC_MINSPACE, 1);
1240	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1661	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241		1662
1242	XftResult result;	1663	XftResult result;
1243	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1664	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1244		1665
1245	FcPatternDestroy (p);	1666	FcPatternDestroy (p);
1246		1667
1247	if (match)	1668	if (match)
1248	{	1669	{
…		…
1263	#endif	1684	#endif
1264	}	1685	}
1265	}	1686	}
1266	}	1687	}
1267		1688
1268	// if no bold font found, use a regular one	1689	/* we must return SOME font */
1269	if (bold)	1690	i = 0;
1270	return find_font (unicode);
1271		1691
1272	return 0; /* we must return SOME font */	1692	found:
1273	}	1693	// found a font, cache it
		1694	if (i < 255)
		1695	{
		1696	while (hi >= fmap.size ())
		1697	fmap.push_back (0);
1274		1698
		1699	if (!fmap[hi])
		1700	{
		1701	fmap[hi] = (pagemap *)new pagemap;
		1702	memset (fmap[hi], 0xff, sizeof (pagemap));
		1703	}
1275		1704
		1705	(*fmap[hi])[unicode & 0xff] = i;
		1706	}
1276		1707
		1708	return i;
		1709	}
		1710
		1711
		1712

Diff Legend

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