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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.125 by ayin, Sun Nov 25 11:23:18 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
24	#include "rxvtlib.h"	24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	25	#include "rxvtutil.h"
26	#include "rxvtfont.h"	26	#include "rxvtfont.h"
27		27
28	#include <cstdlib>	28	#include <cstdlib>
29	#include <wchar.h>	29
30	#include <inttypes.h>	30	#include <inttypes.h>
31		31
32	#define DISPLAY r->display->display
33	#define TGC r->gc
34
35	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width	32	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
		33	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
		34
		35	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
		36	(prop)->slant >= rxvt_fontprop::italic \
		37	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
		38	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
		39	))
36		40
37	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
38	codeset cs;	42	codeset cs;
39	const char *name;	43	const char *name;
40	} fallback_fonts[] = {	44	} fallback_fonts[] = {
41	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
42	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
43	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
44		48
45	#if ENCODING_EU	49	#if ENCODING_EU
46	// cyrillic	50	// cyrillic
47	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
48	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
49		53
50	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
51	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
52	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
53	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
54	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
60	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
61	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
62	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
63		67
64	# if XFT	68	# if XFT
65	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	69	{ CS_KOI8_U, "xft::lang=ru" },
66		70
67	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
68	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
69	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	73	{ CS_ISO8859_7, "xft::lang=el" },
70	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	74	{ CS_ISO8859_8, "xft::lang=he" },
71	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
72	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	76	{ CS_ISO8859_10, "xft::lang=se" },
73	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	77	{ CS_ISO8859_11, "xft::lang=th" },
74	# endif	78	# endif
75	#endif	79	#endif
76		80
77	// japanese	81	// japanese
78	#if ENCODING_JP \|\| ENCODING_JP_EXT	82	#if ENCODING_JP \|\| ENCODING_JP_EXT
79	# if XFT	83	# if XFT
80	// prefer xft for complex scripts	84	// prefer xft for complex scripts
81	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
82	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
83	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
84	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
85	# endif	89	# endif
86	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
87	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
88	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
89	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
93		97
94	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
95	# if XFT	99	# if XFT
96	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
97	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
98	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	102	{ CS_GBK_0, "xft::lang=zh" },
99	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
100	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
101	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
102	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
103	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	107	{ CS_GB2312_1980_0, "xft::lang=zh" },
104	# endif	108	# endif
105	{ CS_GBK_0, "-----------c--gbk-0" },	109	{ CS_GBK_0, "-----------c--gbk-0" },
106	{ CS_BIG5, "-----------c-*-big5-0" },	110	{ CS_BIG5, "-----------c-*-big5-0" },
107	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
108	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
121	#if ENCODING_KR	125	#if ENCODING_KR
122	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
123	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
124	# if XFT	128	# if XFT
125	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
126	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
127	# endif	131	# endif
128	#endif	132	#endif
129		133
130	// generic font fallback
131	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
132	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	135	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
133	{ CS_UNICODE, "----r-------c--iso10646-1" },
134	{ CS_UNICODE, "----r-------m--iso10646-1" },
135	#if XFT	136	#if XFT
136	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	137	{ 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:Courier New:antialias=false:autohint=true" },
138	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140		141
141	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
142	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
143	#endif	144	#endif
144		145
		146	// generic font fallback, put this last, as many iso10646 fonts have extents
		147	// specified for all glyphs in the range they cover, but most are simply empty
		148	//{ CS_UNICODE, "----r-------c--iso10646-1" },
		149	//{ CS_UNICODE, "----r-------m--iso10646-1" },
145	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
146	};	151	};
147		152
148	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
149	// pango uses a similar algorithm and doesn't trust the font either.	154	// pango uses a similar algorithm and doesn't trust the font either.
…		…
153	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
154	};	159	};
155		160
156	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
157		162
		163	#define dTermDisplay Display *disp = term->dpy
		164	#define dTermGC GC gc = term->gc
		165
158	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
159
160	#if XFT
161	rxvt_drawable::~rxvt_drawable ()
162	{
163	if (xftdrawable)
164	XftDrawDestroy (xftdrawable);
165	}
166
167	rxvt_drawable::operator XftDraw *()
168	{
169	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172	return xftdrawable;
173	}
174	#endif
175
176	/////////////////////////////////////////////////////////////////////////////
177
178	static void *enc_buf;
179	static uint32_t enc_len;
180
181	static inline void *
182	get_enc_buf (uint32_t len)
183	{
184	if (len > enc_len)
185	{
186	free (enc_buf);
187	enc_buf = malloc (len);
188	enc_len = len;
189	}
190
191	return enc_buf;
192	}
193		167
194	static const char *	168	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	169	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	170	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	171	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		172	uint8_t *res = buf;
198		173
199	while (len--)	174	while (len--)
200	{	175	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	176	uint32_t c = FROM_UNICODE (cs, *text++);
202		177
…		…
207	}	182	}
208		183
209	*buf++ = c;	184	*buf++ = c;
210	}	185	}
211		186
212	return (const char *)enc_buf;	187	return (const char *)res;
213	}	188	}
214		189
215	static const XChar2b *	190	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	191	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	192	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	193	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		194	XChar2b *res = buf;
219		195
220	while (len--)	196	while (len--)
221	{	197	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	198	uint32_t c = FROM_UNICODE (cs, *text++);
223		199
…		…
230	buf->byte1 = c >> 8;	206	buf->byte1 = c >> 8;
231	buf->byte2 = c;	207	buf->byte2 = c;
232	buf++;	208	buf++;
233	}	209	}
234		210
235	return (XChar2b *)enc_buf;	211	return res;
236	}	212	}
237		213
238	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
239		220
240	void	221	void
241	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
242	{	223	{
243	if (this->name == name)	224	if (this->name == name)
…		…
246	if (this->name) free (this->name); // let the compiler optimize	227	if (this->name) free (this->name); // let the compiler optimize
247	this->name = name;	228	this->name = name;
248	}	229	}
249		230
250	void	231	void
251	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
252	{	233	{
253	if (color == Color_bg)	234	dTermDisplay;
254	XClearArea (d.display->display, d, x, y, w, h, FALSE);	235	dTermGC;
		236
		237	if (color == Color_bg \|\| color == Color_transparent)
		238	XClearArea (disp, d, x, y, w, h, false);
255	else if (color >= 0)	239	else if (color >= 0)
256	{	240	{
257	#if XFT	241	#if XFT
		242	bool done = false;
		243	#ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
		245	{
		246	Picture dst = XftDrawPicture (d);
		247	if (dst != 0)
		248	{
		249	XClearArea (disp, d, x, y, w, h, false);
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	done = true;
		253	}
		254	}
		255	#endif
		256	if (!done)
258	XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259	#else	258	#else
260	XSetForeground (d.display->display, TGC, r->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
261	XFillRectangle (d.display->display, d, TGC, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
262	#endif	261	#endif
263	}	262	}
264	}	263	}
265		264
266	#include "table/linedraw.h"	265	/////////////////////////////////////////////////////////////////////////////
267		266
268	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
269	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
270		269
271	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
284	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
285		284
286	return p;	285	return p;
287	}	286	}
288		287
289	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
290	{	289	{
291	width = 1; height = 1;	290	width = 1; height = 1;
292	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
293		292
294	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
295		294
296	return true;	295	return true;
297	}	296	}
298		297
299	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	298	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300	{	299	{
301	careful = false;	300	careful = false;
302		301
303	if (unicode <= 0x001f)	302	if (unicode <= 0x001f)
304	return true;	303	return true;
…		…
307	return false;	306	return false;
308		307
309	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
310	return true;	309	return true;
311		310
		311	#ifdef BUILTIN_GLYPHS
312	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
313	! OPTION_R (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
314	return true;	314	return true;
		315	#endif
315		316
316	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
317	return true;	318	return true;
318		319
319	switch (unicode)	320	switch (unicode)
…		…
334	void	335	void
335	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	336	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336	const text_t *text, int len,	337	const text_t *text, int len,
337	int fg, int bg)	338	int fg, int bg)
338	{	339	{
339	Display *disp = d.display->display;	340	dTermDisplay;
		341	dTermGC;
340		342
341	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	343	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342		344
343	XSetForeground (disp, TGC, r->pix_colors[fg]);	345	XSetForeground (disp, gc, term->pix_colors[fg]);
344		346
345	while (len)	347	while (len)
346	{	348	{
347	#if ENABLE_COMBINING	349	#if ENABLE_COMBINING
348	compose_char *cc;	350	compose_char *cc;
…		…
352		354
353	while (++text, --len && *text == NOCHAR)	355	while (++text, --len && *text == NOCHAR)
354	;	356	;
355		357
356	int width = text - tp;	358	int width = text - tp;
357	int fwidth = r->fwidth * width;	359	int fwidth = term->fwidth * width;
358		360
		361	#ifdef BUILTIN_GLYPHS
359	if (0x2500 <= t && t <= 0x259f &&	362	if (0x2500 <= t && t <= 0x259f)
360	! OPTION_R (Opt_skipBuiltinGlyphs))
361	{	363	{
		364	# include "table/linedraw.h"
362	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
363	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
364	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
365		368
366	int W = fwidth;	369	int W = fwidth;
367	int H = r->fheight;	370	int H = term->fheight;
368		371
369	int x_[16];	372	int x_[16];
370	int y_[16];	373	int y_[16];
371		374
372	for (int i = 0; i <= 8; i++)	375	for (int i = 0; i <= 8; i++)
…		…
380		383
381	XGCValues gcv;	384	XGCValues gcv;
382		385
383	gcv.cap_style = CapButt;	386	gcv.cap_style = CapButt;
384	gcv.line_width = 0;	387	gcv.line_width = 0;
385	XChangeGC (disp, TGC, GCLineWidth \| GCCapStyle, &gcv);	388	XChangeGC (disp, gc, GCLineWidth \| GCCapStyle, &gcv);
386		389
387	while (a < b)	390	while (a < b)
388	{	391	{
389	uint32_t command = *a++;	392	uint32_t command = *a++;
390		393
…		…
397	int y2 = y_[(command >> 0) & 15];	400	int y2 = y_[(command >> 0) & 15];
398		401
399	switch (op)	402	switch (op)
400	{	403	{
401	case 0: // line	404	case 0: // line
402	XDrawLine (disp, d, TGC, x1, y1, x2, y2);	405	XDrawLine (disp, d, gc, x1, y1, x2, y2);
403	break;	406	break;
404		407
405	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
406	if (a)	409	if (a)
407	{	410	{
408	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
409		412
410	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
411	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
412	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
413	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
414		417
415	XChangeGC (disp, TGC,	418	XChangeGC (disp, gc,
416	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	419	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
417	&gcv);	420	&gcv);
418	}	421	}
419		422
420	XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	423	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
421		424
422	if (a)	425	if (a)
423	{	426	{
424	XFreePixmap (disp, gcv.stipple);	427	XFreePixmap (disp, gcv.stipple);
425	gcv.stipple = 0;	428	gcv.stipple = 0;
426	gcv.fill_style = FillSolid;	429	gcv.fill_style = FillSolid;
427	XChangeGC (disp, TGC, GCFillStyle, &gcv);	430	XChangeGC (disp, gc, GCFillStyle, &gcv);
428	}	431	}
429	break;	432	break;
430	case 2: // arc	433	case 2: // arc
431	XDrawArc (disp, d, TGC,	434	XDrawArc (disp, d, gc,
432	x1 - W/2, y1 - H/2, W-1, H-1,	435	x1 - W/2, y1 - H/2, W-1, H-1,
433	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
434	break;	437	break;
435	}	438	}
436	}	439	}
437	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
438	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
439	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
440	{	447	{
		448	min_it (width, 2); // we only support wcwidth up to 2
		449
441	text_t chrs[2];	450	text_t chrs[2];
442	width = min (2, width);
443	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
444		452
445	*chrs = cc->c1;	453	*chrs = cc->c1;
446	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
447	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
454	*chrs = cc->c2;	462	*chrs = cc->c2;
455	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
456	? f1	464	? f1
457	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
458		466
459	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
460	}	468	}
461	}	469	}
462	#endif	470	#endif
463	else	471	else
464	switch (t)	472	switch (t)
…		…
467	case ZERO_WIDTH_CHAR:	475	case ZERO_WIDTH_CHAR:
468	case NOCHAR:	476	case NOCHAR:
469	break;	477	break;
470		478
471	default:	479	default:
472	XDrawRectangle (disp, d, TGC, x + 2, y + 2,	480	XDrawRectangle (disp, d, gc, x + 2, y + 2,
473	fwidth - 4, r->fheight - 4);	481	fwidth - 4, term->fheight - 4);
474	}	482	}
475		483
476	x += fwidth;	484	x += fwidth;
477	}	485	}
478	}	486	}
…		…
484		492
485	void clear ();	493	void clear ();
486		494
487	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
488		496
489	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
490		498
491	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);	499	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
492		500
493	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
494	const text_t *text, int len,	502	const text_t *text, int len,
495	int fg, int bg);	503	int fg, int bg);
496		504
497	bool slow; // wether this is a proportional font or has other funny characteristics	505	bool slow; // wether this is a proportional font or has other funny characteristics
498	XFontStruct *f;	506	XFontStruct *f;
499	codeset cs;
500	bool enc2b, encm;	507	bool enc2b, encm;
501		508
502	char get_property (XFontStruct f, const char property, const char repl) const;	509	char get_property (XFontStruct f, Atom property, const char *repl) const;
503	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	510	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
504	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
505	bool set_properties (rxvt_fontprop &p, const char *name);	512	bool set_properties (rxvt_fontprop &p, const char *name);
506	};	513	};
507		514
508	char *	515	char *
509	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	516	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
510	{	517	{
511	unsigned long value;	518	unsigned long value;
512		519
513	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	520	if (XGetFontProperty (f, property, &value))
514	return XGetAtomName (DISPLAY, value);	521	return XGetAtomName (term->dpy, value);
515	else	522	else
516	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
517	}	524	}
518		525
519	rxvt_fontprop	526	rxvt_fontprop
520	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
521	{	528	{
…		…
525	}	532	}
526		533
527	bool	534	bool
528	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	535	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
529	{	536	{
530	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	537	p.width = width != rxvt_fontprop::unset ? width
		538	: avgwidth ? (avgwidth + 1) / 10
		539	: (height + 1) / 2;
531	p.height = height;	540	p.height = height;
532	p.ascent = rxvt_fontprop::unset;	541	p.ascent = rxvt_fontprop::unset;
533	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	542	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
534	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	543	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
535		544
…		…
540	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
541	{	550	{
542	unsigned long height;	551	unsigned long height;
543		552
544	#if 0	553	#if 0
545	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
546	return false;	555	return false;
547	#else	556	#else
548	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
549	#endif	558	#endif
550		559
551	unsigned long avgwidth;	560	unsigned long avgwidth;
552	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	561	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
553	avgwidth = 0;	562	avgwidth = 0;
554		563
555	char *weight = get_property (f, "WEIGHT_NAME", "medium");	564	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
556	char *slant = get_property (f, "SLANT", "r");	565	char *slant = get_property (f, term->xa [XA_SLANT], "r");
557		566
558	set_properties (p, height, weight, slant, avgwidth);	567	set_properties (p, height, weight, slant, avgwidth);
559		568
560	free (weight);	569	free (weight);
561	free (slant);	570	free (slant);
…		…
566	}	575	}
567		576
568	bool	577	bool
569	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	578	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
570	{	579	{
		580	dTermDisplay;
571	int slashes = 0;	581	int slashes = 0;
572	const char *comp[13];	582	const char *comp[13];
573		583
574	for (const char c = name; c; c++)	584	for (const char c = name; c; c++)
575	if (*c == '-')	585	if (*c == '-')
…		…
583	if (slashes >= 13	593	if (slashes >= 13
584	&& (comp[ 6] >= '1' && comp[ 6] <= '9')	594	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
585	&& (comp[11] >= '0' && comp[11] <= '9'))	595	&& (comp[11] >= '0' && comp[11] <= '9'))
586	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));	596	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
587		597
588	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	598	XFontStruct *f = XLoadQueryFont (disp, name);
589		599
590	if (f)	600	if (f)
591	{	601	{
592	// the font should really exist now. if not, we have a problem	602	// the font should really exist now. if not, we have a problem
593	// (e.g. if the user did xset fp rehash just when we were searching fonts).	603	// (e.g. if the user did xset fp rehash just when we were searching fonts).
594	// in that case, just return garbage.	604	// in that case, just return garbage.
595	bool ret = set_properties (p, f);	605	bool ret = set_properties (p, f);
596	XFreeFont (DISPLAY, f);	606	XFreeFont (disp, f);
597	return ret;	607	return ret;
598	}	608	}
599	else	609	else
600	return false;	610	return false;
601	}	611	}
602		612
603	// fix the size of scalable fonts	613	// fix the size of scalable fonts
604	static bool	614	static bool
605	replace_field (char buf, const char name, int index, const char old, const char *replace)	615	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
606	{	616	{
607	int slashes = 0;	617	int slashes = 0;
608	const char field, end;	618	const char field, end;
609		619
610	for (const char c = name; c; c++)	620	for (const char c = name; c; c++)
…		…
620	break;	630	break;
621	}	631	}
622		632
623	if (slashes >= 13 && (!old \|\| *field == old))	633	if (slashes >= 13 && (!old \|\| *field == old))
624	{	634	{
625	// TODO: check for overflow in font-name	635	size_t len = field - name;
		636	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
626	strncpy (buf, name, field - name);	637	strncpy (*ptr, name, len);
627	buf += field - name;
628	strcpy (buf, replace);	638	strcpy (*ptr + len, replace);
629	strcat (buf, end);	639	strcat (*ptr, end);
630		640
631	return true;	641	return true;
632	}	642	}
633	else	643	else
634	{	644	{
635	strcpy (buf, name);	645	*ptr = strdup (name);
636		646
637	return false;	647	return false;
638	}	648	}
639	}	649	}
640		650
641	bool	651	bool
642	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
643	{	653	{
644	Display *disp = DISPLAY;	654	dTermDisplay;
645		655
646	clear ();	656	clear ();
647		657
648	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
649		659
650	// first morph the font if required	660	// first morph the font if required
651	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
652	\|\| prop.slant != rxvt_fontprop::unset)
653	{	662	{
654	char fname[1024];	663	char *fname;
655		664
656	if (name[0] != '-')	665	if (name[0] != '-')
657	{	666	{
658	f = XLoadQueryFont (disp, name);	667	f = XLoadQueryFont (disp, name);
659		668
660	if (!f)	669	if (!f)
661	return false;	670	return false;
662		671
663	char *new_name = get_property (f, "FONT", name);	672	char *new_name = get_property (f, XA_FONT, name);
664		673
665	if (new_name)	674	if (new_name)
666	set_name (new_name);	675	set_name (new_name);
667	else	676	else
668	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	677	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
671	f = 0;	680	f = 0;
672	}	681	}
673		682
674	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
675	{	684	{
676	replace_field (fname, name, 2, 0,	685	replace_field (&fname, name, 2, 0,
677	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
678	? "medium" : "bold");	687	? "medium" : "bold");
679	set_name (strdup (fname));	688	set_name (fname);
680	}	689	}
681		690
682	if (prop.slant != rxvt_fontprop::unset)	691	if (prop.slant != rxvt_fontprop::unset)
683	{	692	{
684	replace_field (fname, name, 3, 0,	693	replace_field (&fname, name, 3, 0,
685	prop.slant < rxvt_fontprop::italic	694	prop.slant < rxvt_fontprop::italic
686	? "r" : "i"); // TODO: handle "o"blique, too	695	? "r" : "i"); // TODO: handle "o"blique, too
687	set_name (strdup (fname));	696	set_name (fname);
688	}	697	}
689	}	698	}
690		699
691	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	700	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
692	? 0 : prop.height);	701	? 0 : prop.height);
…		…
717	font_weight *fonts = new font_weight[count];	726	font_weight *fonts = new font_weight[count];
718		727
719	for (int i = 0; i < count; i++)	728	for (int i = 0; i < count; i++)
720	{	729	{
721	rxvt_fontprop p;	730	rxvt_fontprop p;
722	char fname[1024];	731	char *fname;
723		732
724	int diff = 0;	733	int diff = 0;
725		734
726	if (replace_field (fname, list[i], 6, '0', field_str))	735	if (replace_field (&fname, list[i], 6, '0', field_str))
727	diff += 10; // slightly penalize scalable fonts	736	diff += 10; // slightly penalize scalable fonts
		737	else
		738	{
		739	free (fname);
728	else if (replace_field (fname, list[i], 11, '0', "0"))	740	if (replace_field (&fname, list[i], 11, '0', "0"))
729	diff += 300; // more heavily penalize what looks like scaled bitmap fotns	741	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		742	}
730		743
731	if (!set_properties (p, fname))	744	if (!set_properties (p, fname))
732	continue;	745	continue;
733		746
734	if (prop.height != rxvt_fontprop::unset	747	if (prop.height != rxvt_fontprop::unset
…		…
738	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	751	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
739	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	752	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
740	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	753	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);	754	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
742		755
743	fonts[i].name = strdup (fname);	756	fonts[i].name = fname;
744	fonts[i].diff = diff;	757	fonts[i].diff = diff;
745	}	758	}
746		759
747	XFreeFontNames (list);	760	XFreeFontNames (list);
748		761
…		…
777	delete [] fonts;	790	delete [] fonts;
778		791
779	if (!f)	792	if (!f)
780	return false;	793	return false;
781		794
782	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	795	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
783	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	796	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
784		797
785	if (registry && encoding)	798	if (registry && encoding)
786	{	799	{
787	char charset[64];	800	char charset[64];
788	snprintf (charset, 64, "%s-%s", registry, encoding);	801	snprintf (charset, 64, "%s-%s", registry, encoding);
789		802
790	cs = codeset_from_name (charset);	803	cs = codeset_from_name (charset);
791	}	804	}
792	else	805	else
793	{	806	{
794	const char *charset = get_property (f, "FONT", 0);	807	const char *charset = get_property (f, XA_FONT, 0);
795		808
796	if (!charset)	809	if (!charset)
797	charset = name;	810	charset = name;
798		811
799	int count = 13;	812	int count = 13;
…		…
814	enc2b = encm \|\| f->max_char_or_byte2 > 255;	827	enc2b = encm \|\| f->max_char_or_byte2 > 255;
815		828
816	slow = false;	829	slow = false;
817		830
818	#if 1 // only used for slow detection, TODO optimize	831	#if 1 // only used for slow detection, TODO optimize
819	if (f->min_bounds.width == f->max_bounds.width)	832	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
820	width = f->min_bounds.width;
821	else if (f->per_char == NULL)
822	width = f->max_bounds.width;	833	width = f->max_bounds.width;
823	else	834	else
824	{	835	{
825	slow = true;	836	slow = true;
826		837
827	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	838	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
828		839
829	if (encm)	840	if (encm)
830	N += (f->max_byte1 - f->min_byte1)	841	N += (f->max_byte1 - f->min_byte1)
831	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	842	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
832		843
833	while (N)	844	while (N)
834	{	845	{
835	if (f->per_char[N].width > width)	846	if (f->per_char[N].width > width)
836	width = f->per_char[N].width;	847	width = f->per_char[N].width;
837		848
…		…
842		853
843	width = 1;	854	width = 1;
844		855
845	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	856	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
846	{	857	{
847	if (cs != CS_UNICODE
848	&& *t > 0x100
849	&& FROM_UNICODE (cs, *t) == NOCHAR)	858	if (FROM_UNICODE (cs, *t) == NOCHAR)
850	continue;	859	continue;
851		860
852	// ignore characters we wouldn't use anyways	861	// ignore characters we wouldn't use anyways
853	bool careful;	862	bool careful;
854	if (!has_char (*t, &prop, careful))	863	if (!has_char (*t, &prop, careful))
…		…
858		867
859	XCharStruct g;	868	XCharStruct g;
860	int dir_ret, asc_ret, des_ret;	869	int dir_ret, asc_ret, des_ret;
861	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	870	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
862		871
		872	int wcw = WCWIDTH (*t);
863	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	873	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864		874
865	if (width < g.width) width = g.width;	875	if (width < g.width) width = g.width;
866	}	876	}
867		877
868	if (cs == CS_UNKNOWN)	878	if (cs == CS_UNKNOWN)
869	{	879	{
870	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	880	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
887	void	897	void
888	rxvt_font_x11::clear ()	898	rxvt_font_x11::clear ()
889	{	899	{
890	if (f)	900	if (f)
891	{	901	{
892	XFreeFont (DISPLAY, f);	902	XFreeFont (term->dpy, f);
893	f = 0;	903	f = 0;
894	}	904	}
895	}	905	}
896		906
897	bool	907	bool
898	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	908	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899	{	909	{
900	uint32_t ch = FROM_UNICODE (cs, unicode);	910	uint32_t ch = FROM_UNICODE (cs, unicode);
901		911
902	if (ch == NOCHAR)	912	if (ch == NOCHAR)
903	return false;	913	return false;
…		…
940	return false;	950	return false;
941		951
942	if (!prop \|\| prop->width == rxvt_fontprop::unset)	952	if (!prop \|\| prop->width == rxvt_fontprop::unset)
943	return true;	953	return true;
944		954
945	// check character against base font bounding box	955	// check wether character overlaps previous/next character
946	int w = xcs->width;	956	int w = xcs->rbearing - xcs->lbearing;
947	int wcw = wcwidth (unicode);	957	int wcw = max (WCWIDTH (unicode), 1);
948	if (wcw > 0) w = (w + wcw - 1) / wcw;
949		958
950	careful = w > prop->width;	959	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
951	if (careful && w > prop->width * MAX_OVERLAP >> 2)	960
		961	if (careful && !OVERLAP_OK (w, wcw, prop))
952	return false;	962	return false;
953		963
954	return true;	964	return true;
955	}	965	}
956		966
…		…
962	// this looks like a mess /.	972	// this looks like a mess /.
963	// and it is a mess /.	973	// and it is a mess /.
964	// yet we are trying to be perfect /.	974	// yet we are trying to be perfect /.
965	// but the result still isn't perfect /.	975	// but the result still isn't perfect /.
966		976
		977	dTermDisplay;
		978	dTermGC;
		979
967	bool slow = this->slow	980	bool slow = this->slow
968	\|\| width != r->fwidth	981	\|\| width != term->fwidth
969	\|\| height != r->fheight;	982	\|\| height != term->fheight;
970		983
971	int base = ascent; // sorry, incorrect: r->fbase;	984	int base = ascent; // sorry, incorrect: term->fbase;
972		985
973	XGCValues v;	986	XGCValues v;
974	v.foreground = r->pix_colors[fg];	987	v.foreground = term->pix_colors[fg];
975	v.font = f->fid;	988	v.font = f->fid;
976		989
977	if (enc2b)	990	if (enc2b)
978	{	991	{
979	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	992	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
980		993
981	if (bg == Color_bg && !slow)	994	if (bg == Color_bg && !slow)
982	{	995	{
983	v.background = r->pix_colors[bg];	996	v.background = term->pix_colors[bg];
984	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	997	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
985	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	998	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
986	}	999	}
987	else	1000	else
988	{	1001	{
989	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	1002	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990		1003
991	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1004	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
992		1005
993	if (slow)	1006	if (slow)
994	{	1007	{
995	do	1008	do
996	{	1009	{
997	if (xc->byte1 \|\| xc->byte2)	1010	if (xc->byte1 \|\| xc->byte2)
998	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1011	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
999		1012
1000	x += r->fwidth;	1013	x += term->fwidth;
1001	xc++; len--;	1014	xc++; len--;
1002	}	1015	}
1003	while (len);	1016	while (len);
1004	}	1017	}
1005	else	1018	else
1006	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1019	XDrawString16 (disp, d, gc, x, y + base, xc, len);
1007	}	1020	}
1008	}	1021	}
1009	else	1022	else
1010	{	1023	{
1011	const char *xc = enc_char (text, len, cs, slow);	1024	const char *xc = enc_char (text, len, cs, slow);
1012		1025
1013	if (bg == Color_bg && !slow)	1026	if (bg == Color_bg && !slow)
1014	{	1027	{
1015	v.background = r->pix_colors[bg];	1028	v.background = term->pix_colors[bg];
1016	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	1029	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
1017	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1030	XDrawImageString (disp, d, gc, x, y + base, xc, len);
1018	}	1031	}
1019	else	1032	else
1020	{	1033	{
1021	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	1034	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022		1035
1023	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1036	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1024		1037
1025	if (slow)	1038	if (slow)
1026	{	1039	{
1027	do	1040	do
1028	{	1041	{
1029	if (*xc)	1042	if (*xc)
1030	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1043	XDrawString (disp, d, gc, x, y + base, xc, 1);
1031		1044
1032	x += r->fwidth;	1045	x += term->fwidth;
1033	xc++; len--;	1046	xc++; len--;
1034	}	1047	}
1035	while (len);	1048	while (len);
1036	}	1049	}
1037	else	1050	else
1038	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1051	XDrawString (disp, d, gc, x, y + base, xc, len);
1039	}	1052	}
1040	}	1053	}
1041	}	1054	}
1042		1055
1043	/////////////////////////////////////////////////////////////////////////////	1056	/////////////////////////////////////////////////////////////////////////////
…		…
1049		1062
1050	void clear ();	1063	void clear ();
1051		1064
1052	rxvt_fontprop properties ();	1065	rxvt_fontprop properties ();
1053		1066
1054	bool load (const rxvt_fontprop &prop);	1067	bool load (const rxvt_fontprop &prop, bool force_prop);
1055		1068
1056	void draw (rxvt_drawable &d, int x, int y,	1069	void draw (rxvt_drawable &d, int x, int y,
1057	const text_t *text, int len,	1070	const text_t *text, int len,
1058	int fg, int bg);	1071	int fg, int bg);
1059		1072
1060	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);	1073	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061		1074
1062	protected:	1075	protected:
1063	XftFont *f;	1076	XftFont *f;
1064	};	1077	};
1065		1078
1066	void	1079	void
1067	rxvt_font_xft::clear ()	1080	rxvt_font_xft::clear ()
1068	{	1081	{
1069	if (f)	1082	if (f)
1070	{	1083	{
1071	XftFontClose (DISPLAY, f);	1084	XftFontClose (term->dpy, f);
1072	f = 0;	1085	f = 0;
1073	}	1086	}
1074	}	1087	}
1075		1088
1076	rxvt_fontprop	1089	rxvt_fontprop
…		…
1092		1105
1093	return p;	1106	return p;
1094	}	1107	}
1095		1108
1096	bool	1109	bool
1097	rxvt_font_xft::load (const rxvt_fontprop &prop)	1110	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098	{	1111	{
1099	Display *disp = DISPLAY;	1112	dTermDisplay;
1100		1113
1101	clear ();	1114	clear ();
1102		1115
1103	FcPattern p = FcNameParse ((FcChar8 ) name);	1116	FcPattern p = FcNameParse ((FcChar8 ) name);
1104		1117
…		…
1111	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1124	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1125	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1126	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114		1127
1115	if (prop.weight != rxvt_fontprop::unset	1128	if (prop.weight != rxvt_fontprop::unset
1116	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1130	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118		1131
1119	if (prop.slant != rxvt_fontprop::unset	1132	if (prop.slant != rxvt_fontprop::unset
1120	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1133	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1134	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122		1135
1123	#if 0 // clipping unfortunately destroys our precious double-width-characters	1136	#if 0 // clipping unfortunately destroys our precious double-width-characters
1124	// clip width, we can't do better, or can we?	1137	// clip width, we can't do better, or can we?
1125	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1138	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1131		1144
1132	// store generated name so iso14755 view gives better results	1145	// store generated name so iso14755 view gives better results
1133	set_name ((char *)FcNameUnparse (p));	1146	set_name ((char *)FcNameUnparse (p));
1134		1147
1135	XftResult result;	1148	XftResult result;
1136	FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);	1149	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1137		1150
1138	FcPatternDestroy (p);	1151	FcPatternDestroy (p);
1139		1152
1140	if (!match)	1153	if (!match)
1141	return false;	1154	return false;
…		…
1183	XGlyphInfo g;	1196	XGlyphInfo g;
1184	XftTextExtents16 (disp, f, &ch, 1, &g);	1197	XftTextExtents16 (disp, f, &ch, 1, &g);
1185		1198
1186	g.width -= g.x;	1199	g.width -= g.x;
1187		1200
1188	int wcw = wcwidth (ch);	1201	int wcw = WCWIDTH (ch);
1189	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1202	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1190		1203
1191	if (width < g.width ) width = g.width;	1204	if (width < g.width ) width = g.width;
1192	if (height < g.height ) height = g.height;	1205	if (height < g.height ) height = g.height;
1193	if (glheight < g.height - g.y) glheight = g.height - g.y;	1206	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1239		1252
1240	return success;	1253	return success;
1241	}	1254	}
1242		1255
1243	bool	1256	bool
1244	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	1257	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245	{	1258	{
1246	careful = false;	1259	careful = false;
1247		1260
1248	if (!XftCharExists (DISPLAY, f, unicode))	1261	if (!XftCharExists (term->dpy, f, unicode))
1249	return false;	1262	return false;
1250		1263
1251	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1264	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1252	return true;	1265	return true;
1253		1266
1254	// check character against base font bounding box	1267	// check character against base font bounding box
1255	FcChar32 ch = unicode;	1268	FcChar32 ch = unicode;
1256	XGlyphInfo g;	1269	XGlyphInfo g;
1257	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);	1270	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258		1271
1259	int w = g.width - g.x;	1272	int w = g.width - g.x;
1260	int wcw = wcwidth (unicode);	1273	int wcw = max (WCWIDTH (unicode), 1);
1261	if (wcw > 0) w = (w + wcw - 1) / wcw;
1262		1274
1263	careful = w > prop->width;	1275	careful = g.x > 0 \|\| w > prop->width * wcw;
1264	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1276
		1277	if (careful && !OVERLAP_OK (w, wcw, prop))
		1278	return false;
		1279
		1280	// this weeds out _totally_ broken fonts, or glyphs
		1281	if (!OVERLAP_OK (g.xOff, wcw, prop))
1265	return false;	1282	return false;
1266		1283
1267	return true;	1284	return true;
1268	}	1285	}
1269		1286
1270	void	1287	void
1271	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1288	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272	const text_t *text, int len,	1289	const text_t *text, int len,
1273	int fg, int bg)	1290	int fg, int bg)
1274	{	1291	{
1275	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1276
1277	int base = ascent; // should be fbase, but that is incorrect
1278
1279	XGlyphInfo extents;	1292	XGlyphInfo extents;
1280	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));	1293	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1281	FcChar32 *ep = enc;	1294	XftGlyphSpec *ep = enc;
1282	int ewidth = 0;	1295
		1296	dTermDisplay;
		1297	dTermGC;
		1298
		1299	int w = term->fwidth * len;
		1300	int h = term->fheight;
		1301
		1302	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1303	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1304	* good idea from the perspective of packaging for wide variety of user configs.
		1305	*/
		1306	bool buffered = true
		1307	#ifdef FORCE_UNBUFFERED_XFT
		1308	&& bg >= 0
		1309	#endif
		1310	;
		1311	// cut trailing spaces
		1312	while (len && text [len - 1] == ' ')
		1313	len--;
		1314
		1315	int x_ = buffered ? 0 : x;
		1316	int y_ = buffered ? 0 : y;
1283		1317
1284	while (len)	1318	while (len)
1285	{	1319	{
1286	int cwidth = r->fwidth;	1320	int cwidth = term->fwidth;
1287	FcChar32 fc = *text++; len--;	1321	FcChar32 fc = *text++; len--;
1288		1322
1289	while (len && *text == NOCHAR)	1323	while (len && *text == NOCHAR)
1290	text++, len--, cwidth += r->fwidth;	1324	text++, len--, cwidth += term->fwidth;
		1325
		1326	if (fc != ' ') // skip spaces
1291		1327	{
1292	if (fc == ' ' && ep == enc) // skip leading spaces	1328	FT_UInt glyph = XftCharIndex (disp, f, fc);
		1329	XftGlyphExtents (disp, f, &glyph, 1, &extents);
		1330
		1331	ep->glyph = glyph;
		1332	ep->x = x_ + (cwidth - extents.xOff >> 1);
		1333	ep->y = y_ + ascent;
		1334
		1335	if (extents.xOff == 0)
		1336	ep->x = x_ + cwidth;
		1337
		1338	ep++;
		1339	}
		1340
1293	x += cwidth;	1341	x_ += cwidth;
		1342	}
		1343
		1344	if (buffered)
		1345	{
		1346	bool back_rendered = false;
		1347	if (ep != enc)
		1348	{
		1349	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1350
		1351	#ifdef HAVE_BG_PIXMAP
		1352	if (term->bgPixmap.pixmap)
		1353	{
		1354	Picture dst = 0;
		1355
		1356	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1357	dst = XftDrawPicture (d2);
		1358
		1359	if (bg < 0 \|\| dst != 0)
		1360	{
		1361	int src_x = x, src_y = y ;
		1362
		1363	if (term->bgPixmap.is_parentOrigin ())
		1364	{
		1365	src_x += term->window_vt_x;
		1366	src_y += term->window_vt_y;
		1367	}
		1368
		1369	if (term->bgPixmap.pmap_width >= src_x+w
		1370	&& term->bgPixmap.pmap_height >= src_y+h)
		1371	{
		1372	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1373	src_x, src_y, w, h, 0, 0);
		1374	}
		1375	else
		1376	{
		1377	XGCValues gcv;
		1378
		1379	gcv.fill_style = FillTiled;
		1380	gcv.tile = term->bgPixmap.pixmap;
		1381	gcv.ts_x_origin = -src_x;
		1382	gcv.ts_y_origin = -src_y;
		1383
		1384	XChangeGC (disp, gc,
		1385	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1386	&gcv);
		1387
		1388	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1389
		1390	gcv.fill_style = FillSolid;
		1391	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1392	}
		1393
		1394	if (bg >= 0)
		1395	{
		1396	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1397	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1398	}
		1399
		1400	back_rendered = true;
		1401	}
		1402	}
		1403	#endif
		1404
		1405	if (bg >= 0 && !back_rendered)
		1406	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1407
		1408	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1409	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1410	}
1294	else	1411	else
1295	{	1412	clear_rect (d, x, y, w, h, bg);
1296	FT_UInt gl = XftCharIndex (d.display->display, f, fc);	1413	}
1297	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);	1414	else
1298
1299	if (extents.xOff != cwidth)
1300	{
1301	if (ewidth)
1302	{
1303	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304	x, y + base, enc, ep - enc);
1305	x += ewidth;
1306
1307	ep = enc;
1308	ewidth = 0;
1309	}
1310
1311	if (extents.xOff > cwidth)
1312	extents.xOff = cwidth;
1313
1314	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1315	x + (cwidth - extents.xOff >> 1),
1316	y + base, &gl, 1);
1317	x += cwidth;
1318	}
1319	else
1320	{
1321	*ep++ = gl;
1322	ewidth += cwidth;
1323	}
1324	}
1325	}	1415	{
1326		1416	clear_rect (d, x, y, w, h, bg);
1327	if (ep != enc)
1328	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,	1417	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1329	x, y + base, enc, ep - enc);	1418	}
1330	}	1419	}
		1420
1331	#endif	1421	#endif
1332		1422
1333	/////////////////////////////////////////////////////////////////////////////	1423	/////////////////////////////////////////////////////////////////////////////
1334		1424
1335	rxvt_fontset::rxvt_fontset (rxvt_t r)	1425	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1336	: fontdesc (0), r (r)	1426	: fontdesc (0), term (term)
1337	{	1427	{
1338	clear ();	1428	clear ();
1339	}	1429	}
1340		1430
1341	rxvt_fontset::~rxvt_fontset ()	1431	rxvt_fontset::~rxvt_fontset ()
…		…
1346	void	1436	void
1347	rxvt_fontset::clear ()	1437	rxvt_fontset::clear ()
1348	{	1438	{
1349	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1439	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1350	= rxvt_fontprop::unset;	1440	= rxvt_fontprop::unset;
		1441	force_prop = false;
1351		1442
1352	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1443	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1353	FONT_UNREF (*i);	1444	FONT_UNREF (*i);
1354		1445
1355	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1446	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1364		1455
1365	rxvt_font *	1456	rxvt_font *
1366	rxvt_fontset::new_font (const char *name, codeset cs)	1457	rxvt_fontset::new_font (const char *name, codeset cs)
1367	{	1458	{
1368	rxvt_font *f;	1459	rxvt_font *f;
1369		1460
1370	if (!name \|\| !*name)	1461	if (!name \|\| !*name)
1371	{	1462	{
1372	name = "";	1463	name = "";
1373	f = new rxvt_font_default (this);	1464	f = new rxvt_font_default (this);
1374	}	1465	}
…		…
1385	f = new rxvt_font_x11;	1476	f = new rxvt_font_x11;
1386	}	1477	}
1387	else	1478	else
1388	f = new rxvt_font_x11;	1479	f = new rxvt_font_x11;
1389		1480
1390	f->set_term (r);	1481	f->set_term (term);
1391	f->set_name (strdup (name));	1482	f->set_name (strdup (name));
1392		1483
1393	f->cs = cs;	1484	f->cs = cs;
1394	f->loaded = false;	1485	f->loaded = false;
1395		1486
…		…
1467	if (fonts[i]->loaded)	1558	if (fonts[i]->loaded)
1468	return true;	1559	return true;
1469		1560
1470	fonts[i]->loaded = true;	1561	fonts[i]->loaded = true;
1471		1562
1472	if (!fonts[i]->load (prop))	1563	if (!fonts[i]->load (prop, force_prop))
1473	{	1564	{
1474	fonts[i]->cs = CS_UNKNOWN;	1565	fonts[i]->cs = CS_UNKNOWN;
1475	return false;	1566	return false;
1476	}	1567	}
1477		1568
…		…
1578	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1669	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1579	FcPatternAddBool (p, FC_MINSPACE, 1);	1670	FcPatternAddBool (p, FC_MINSPACE, 1);
1580	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1671	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1581		1672
1582	XftResult result;	1673	XftResult result;
1583	FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);	1674	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1584		1675
1585	FcPatternDestroy (p);	1676	FcPatternDestroy (p);
1586		1677
1587	if (match)	1678	if (match)
1588	{	1679	{
…		…
1593	if (find_font (font) < 0)	1684	if (find_font (font) < 0)
1594	{	1685	{
1595	char fontname[4096];	1686	char fontname[4096];
1596	sprintf (fontname, "xft:%-.4090s", font);	1687	sprintf (fontname, "xft:%-.4090s", font);
1597		1688
1598	fonts.push_back (new_font (fontname, CS_UNICODE));	1689	fonts.push_back (new_font (fontname, CS_UNICODE));
1599	}	1690	}
1600		1691
1601	free (font);	1692	free (font);
1602	}	1693	}
1603	#endif	1694	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC vs. Revision 1.125 by ayin, Sun Nov 25 11:23:18 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.78 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.125 by ayin, Sun Nov 25 11:23:18 2007 UTC