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

Diff Legend

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