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.4 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC

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

Diff Legend

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