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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.83 by root, Mon Jan 9 07:35:23 2006 UTC vs.
Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC

…		…
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[] = {
…		…
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->xdisp
		164	#define dTermGC GC gc = term->gc
		165
158	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
159		167
160	#if XFT	168	#if XFT
161	rxvt_drawable::~rxvt_drawable ()	169	rxvt_drawable::~rxvt_drawable ()
162	{	170	{
…		…
165	}	173	}
166		174
167	rxvt_drawable::operator XftDraw *()	175	rxvt_drawable::operator XftDraw *()
168	{	176	{
169	if (!xftdrawable)	177	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);	178	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
171		179
172	return xftdrawable;	180	return xftdrawable;
173	}	181	}
174	#endif	182	#endif
175		183
176	/////////////////////////////////////////////////////////////////////////////	184	/////////////////////////////////////////////////////////////////////////////
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		185
194	static const char *	186	static const char *
195	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	187	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196	{	188	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	189	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		190	uint8_t *res = buf;
198		191
199	while (len--)	192	while (len--)
200	{	193	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	194	uint32_t c = FROM_UNICODE (cs, *text++);
202		195
…		…
207	}	200	}
208		201
209	*buf++ = c;	202	*buf++ = c;
210	}	203	}
211		204
212	return (const char *)enc_buf;	205	return (const char *)res;
213	}	206	}
214		207
215	static const XChar2b *	208	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	209	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	210	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	211	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		212	XChar2b *res = buf;
219		213
220	while (len--)	214	while (len--)
221	{	215	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	216	uint32_t c = FROM_UNICODE (cs, *text++);
223		217
…		…
230	buf->byte1 = c >> 8;	224	buf->byte1 = c >> 8;
231	buf->byte2 = c;	225	buf->byte2 = c;
232	buf++;	226	buf++;
233	}	227	}
234		228
235	return (XChar2b *)enc_buf;	229	return res;
236	}	230	}
237		231
238	/////////////////////////////////////////////////////////////////////////////	232	/////////////////////////////////////////////////////////////////////////////
		233
		234	rxvt_font::rxvt_font ()
		235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		236	{
		237	}
239		238
240	void	239	void
241	rxvt_font::set_name (char *name)	240	rxvt_font::set_name (char *name)
242	{	241	{
243	if (this->name == name)	242	if (this->name == name)
…		…
246	if (this->name) free (this->name); // let the compiler optimize	245	if (this->name) free (this->name); // let the compiler optimize
247	this->name = name;	246	this->name = name;
248	}	247	}
249		248
250	void	249	void
251	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)	250	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252	{	251	{
		252	dTermDisplay;
		253	dTermGC;
		254
253	if (color == Color_bg)	255	if (color == Color_bg)
254	XClearArea (d.display->display, d, x, y, w, h, FALSE);	256	XClearArea (disp, d, x, y, w, h, false);
255	else if (color >= 0)	257	else if (color >= 0)
256	{	258	{
257	#if XFT	259	#if XFT
258	XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);	260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259	#else	261	#else
260	XSetForeground (d.display->display, TGC, r->pix_colors[color]);	262	XSetForeground (disp, gc, term->pix_colors[color]);
261	XFillRectangle (d.display->display, d, TGC, x, y, w, h);	263	XFillRectangle (disp, d, gc, x, y, w, h);
262	#endif	264	#endif
263	}	265	}
264	}	266	}
		267
		268	/////////////////////////////////////////////////////////////////////////////
265		269
266	#include "table/linedraw.h"	270	#include "table/linedraw.h"
267		271
268	struct rxvt_font_default : rxvt_font {	272	struct rxvt_font_default : rxvt_font {
269	struct rxvt_fontset *fs;	273	struct rxvt_fontset *fs;
…		…
294	set_name (strdup ("built-in support font"));	298	set_name (strdup ("built-in support font"));
295		299
296	return true;	300	return true;
297	}	301	}
298		302
299	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	303	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300	{	304	{
301	careful = false;	305	careful = false;
302		306
303	if (unicode <= 0x001f)	307	if (unicode <= 0x001f)
304	return true;	308	return true;
…		…
308		312
309	if (unicode <= 0x009f)	313	if (unicode <= 0x009f)
310	return true;	314	return true;
311		315
312	if (unicode >= 0x2500 && unicode <= 0x259f &&	316	if (unicode >= 0x2500 && unicode <= 0x259f &&
313	!r->option (Opt_skipBuiltinGlyphs))	317	!term->option (Opt_skipBuiltinGlyphs))
314	return true;	318	return true;
315		319
316	if (IS_COMPOSE (unicode))	320	if (IS_COMPOSE (unicode))
317	return true;	321	return true;
318		322
…		…
334	void	338	void
335	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	339	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336	const text_t *text, int len,	340	const text_t *text, int len,
337	int fg, int bg)	341	int fg, int bg)
338	{	342	{
339	Display *disp = d.display->display;	343	dTermDisplay;
		344	dTermGC;
340		345
341	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	346	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342		347
343	XSetForeground (disp, TGC, r->pix_colors[fg]);	348	XSetForeground (disp, gc, term->pix_colors[fg]);
344		349
345	while (len)	350	while (len)
346	{	351	{
347	#if ENABLE_COMBINING	352	#if ENABLE_COMBINING
348	compose_char *cc;	353	compose_char *cc;
…		…
352		357
353	while (++text, --len && *text == NOCHAR)	358	while (++text, --len && *text == NOCHAR)
354	;	359	;
355		360
356	int width = text - tp;	361	int width = text - tp;
357	int fwidth = r->fwidth * width;	362	int fwidth = term->fwidth * width;
358		363
359	if (0x2500 <= t && t <= 0x259f)	364	if (0x2500 <= t && t <= 0x259f)
360	{	365	{
361	uint16_t offs = linedraw_offs[t - 0x2500];	366	uint16_t offs = linedraw_offs[t - 0x2500];
362	uint32_t *a = linedraw_command + (offs >> 4);	367	uint32_t *a = linedraw_command + (offs >> 4);
363	uint32_t *b = a + (offs & 15);	368	uint32_t *b = a + (offs & 15);
364		369
365	int W = fwidth;	370	int W = fwidth;
366	int H = r->fheight;	371	int H = term->fheight;
367		372
368	int x_[16];	373	int x_[16];
369	int y_[16];	374	int y_[16];
370		375
371	for (int i = 0; i <= 8; i++)	376	for (int i = 0; i <= 8; i++)
…		…
379		384
380	XGCValues gcv;	385	XGCValues gcv;
381		386
382	gcv.cap_style = CapButt;	387	gcv.cap_style = CapButt;
383	gcv.line_width = 0;	388	gcv.line_width = 0;
384	XChangeGC (disp, TGC, GCLineWidth \| GCCapStyle, &gcv);	389	XChangeGC (disp, gc, GCLineWidth \| GCCapStyle, &gcv);
385		390
386	while (a < b)	391	while (a < b)
387	{	392	{
388	uint32_t command = *a++;	393	uint32_t command = *a++;
389		394
…		…
396	int y2 = y_[(command >> 0) & 15];	401	int y2 = y_[(command >> 0) & 15];
397		402
398	switch (op)	403	switch (op)
399	{	404	{
400	case 0: // line	405	case 0: // line
401	XDrawLine (disp, d, TGC, x1, y1, x2, y2);	406	XDrawLine (disp, d, gc, x1, y1, x2, y2);
402	break;	407	break;
403		408
404	case 1: // rectangle, possibly stippled	409	case 1: // rectangle, possibly stippled
405	if (a)	410	if (a)
406	{	411	{
…		…
409	gcv.fill_style = FillStippled;	414	gcv.fill_style = FillStippled;
410	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
411	gcv.ts_x_origin = x;	416	gcv.ts_x_origin = x;
412	gcv.ts_y_origin = y;	417	gcv.ts_y_origin = y;
413		418
414	XChangeGC (disp, TGC,	419	XChangeGC (disp, gc,
415	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	420	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
416	&gcv);	421	&gcv);
417	}	422	}
418		423
419	XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	424	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
420		425
421	if (a)	426	if (a)
422	{	427	{
423	XFreePixmap (disp, gcv.stipple);	428	XFreePixmap (disp, gcv.stipple);
424	gcv.stipple = 0;	429	gcv.stipple = 0;
425	gcv.fill_style = FillSolid;	430	gcv.fill_style = FillSolid;
426	XChangeGC (disp, TGC, GCFillStyle, &gcv);	431	XChangeGC (disp, gc, GCFillStyle, &gcv);
427	}	432	}
428	break;	433	break;
429	case 2: // arc	434	case 2: // arc
430	XDrawArc (disp, d, TGC,	435	XDrawArc (disp, d, gc,
431	x1 - W/2, y1 - H/2, W-1, H-1,	436	x1 - W/2, y1 - H/2, W-1, H-1,
432	(a - 1) * 9064, (b - 1) 90*64);	437	(a - 1) * 9064, (b - 1) 90*64);
433	break;	438	break;
434	}	439	}
435	}	440	}
436	}	441	}
437	#if ENABLE_COMBINING	442	#if ENABLE_COMBINING
438	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
439	{	444	{
		445	min_it (width, 2); // we only support wcwidth up to 2
		446
440	text_t chrs[2];	447	text_t chrs[2];
441	width = min (2, width);
442	chrs [1] = NOCHAR;	448	chrs [1] = NOCHAR;
443		449
444	*chrs = cc->c1;	450	*chrs = cc->c1;
445	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	451	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
446	f1->draw (d, x, y, chrs, width, fg, bg);	452	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
466	case ZERO_WIDTH_CHAR:	472	case ZERO_WIDTH_CHAR:
467	case NOCHAR:	473	case NOCHAR:
468	break;	474	break;
469		475
470	default:	476	default:
471	XDrawRectangle (disp, d, TGC, x + 2, y + 2,	477	XDrawRectangle (disp, d, gc, x + 2, y + 2,
472	fwidth - 4, r->fheight - 4);	478	fwidth - 4, term->fheight - 4);
473	}	479	}
474		480
475	x += fwidth;	481	x += fwidth;
476	}	482	}
477	}	483	}
…		…
485		491
486	rxvt_fontprop properties ();	492	rxvt_fontprop properties ();
487		493
488	bool load (const rxvt_fontprop &prop);	494	bool load (const rxvt_fontprop &prop);
489		495
490	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);	496	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
491		497
492	void draw (rxvt_drawable &d, int x, int y,	498	void draw (rxvt_drawable &d, int x, int y,
493	const text_t *text, int len,	499	const text_t *text, int len,
494	int fg, int bg);	500	int fg, int bg);
495		501
496	bool slow; // wether this is a proportional font or has other funny characteristics	502	bool slow; // wether this is a proportional font or has other funny characteristics
497	XFontStruct *f;	503	XFontStruct *f;
498	codeset cs;	504	codeset cs;
499	bool enc2b, encm;	505	bool enc2b, encm;
500		506
501	char get_property (XFontStruct f, const char property, const char repl) const;	507	char get_property (XFontStruct f, Atom property, const char *repl) const;
502	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	508	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
503	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
504	bool set_properties (rxvt_fontprop &p, const char *name);	510	bool set_properties (rxvt_fontprop &p, const char *name);
505	};	511	};
506		512
507	char *	513	char *
508	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
509	{	515	{
510	unsigned long value;	516	unsigned long value;
511		517
512	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	518	if (XGetFontProperty (f, property, &value))
513	return XGetAtomName (DISPLAY, value);	519	return XGetAtomName (term->xdisp, value);
514	else	520	else
515	return rxvt_strdup (repl);	521	return rxvt_strdup (repl);
516	}	522	}
517		523
518	rxvt_fontprop	524	rxvt_fontprop
…		…
524	}	530	}
525		531
526	bool	532	bool
527	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	533	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
528	{	534	{
529	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	535	p.width = width != rxvt_fontprop::unset ? width
		536	: avgwidth ? (avgwidth + 1) / 10
		537	: (height + 1) / 2;
530	p.height = height;	538	p.height = height;
531	p.ascent = rxvt_fontprop::unset;	539	p.ascent = rxvt_fontprop::unset;
532	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	540	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
533	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	541	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
534		542
…		…
539	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
540	{	548	{
541	unsigned long height;	549	unsigned long height;
542		550
543	#if 0	551	#if 0
544	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	552	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
545	return false;	553	return false;
546	#else	554	#else
547	height = f->ascent + f->descent;	555	height = f->ascent + f->descent;
548	#endif	556	#endif
549		557
550	unsigned long avgwidth;	558	unsigned long avgwidth;
551	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	559	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
552	avgwidth = 0;	560	avgwidth = 0;
553		561
554	char *weight = get_property (f, "WEIGHT_NAME", "medium");	562	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
555	char *slant = get_property (f, "SLANT", "r");	563	char *slant = get_property (f, term->xa [XA_SLANT], "r");
556		564
557	set_properties (p, height, weight, slant, avgwidth);	565	set_properties (p, height, weight, slant, avgwidth);
558		566
559	free (weight);	567	free (weight);
560	free (slant);	568	free (slant);
…		…
565	}	573	}
566		574
567	bool	575	bool
568	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	576	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
569	{	577	{
		578	dTermDisplay;
570	int slashes = 0;	579	int slashes = 0;
571	const char *comp[13];	580	const char *comp[13];
572		581
573	for (const char c = name; c; c++)	582	for (const char c = name; c; c++)
574	if (*c == '-')	583	if (*c == '-')
…		…
582	if (slashes >= 13	591	if (slashes >= 13
583	&& (comp[ 6] >= '1' && comp[ 6] <= '9')	592	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
584	&& (comp[11] >= '0' && comp[11] <= '9'))	593	&& (comp[11] >= '0' && comp[11] <= '9'))
585	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));	594	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
586		595
587	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	596	XFontStruct *f = XLoadQueryFont (disp, name);
588		597
589	if (f)	598	if (f)
590	{	599	{
591	// the font should really exist now. if not, we have a problem	600	// the font should really exist now. if not, we have a problem
592	// (e.g. if the user did xset fp rehash just when we were searching fonts).	601	// (e.g. if the user did xset fp rehash just when we were searching fonts).
593	// in that case, just return garbage.	602	// in that case, just return garbage.
594	bool ret = set_properties (p, f);	603	bool ret = set_properties (p, f);
595	XFreeFont (DISPLAY, f);	604	XFreeFont (disp, f);
596	return ret;	605	return ret;
597	}	606	}
598	else	607	else
599	return false;	608	return false;
600	}	609	}
…		…
638	}	647	}
639		648
640	bool	649	bool
641	rxvt_font_x11::load (const rxvt_fontprop &prop)	650	rxvt_font_x11::load (const rxvt_fontprop &prop)
642	{	651	{
643	Display *disp = DISPLAY;	652	dTermDisplay;
644		653
645	clear ();	654	clear ();
646		655
647	char field_str[64]; // enough for 128 bits	656	char field_str[64]; // enough for 128 bits
648		657
…		…
657	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
658		667
659	if (!f)	668	if (!f)
660	return false;	669	return false;
661		670
662	char *new_name = get_property (f, "FONT", name);	671	char *new_name = get_property (f, XA_FONT, name);
663		672
664	if (new_name)	673	if (new_name)
665	set_name (new_name);	674	set_name (new_name);
666	else	675	else
667	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	676	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
723	int diff = 0;	732	int diff = 0;
724		733
725	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (fname, list[i], 6, '0', field_str))
726	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
727	else if (replace_field (fname, list[i], 11, '0', "0"))	736	else if (replace_field (fname, list[i], 11, '0', "0"))
728	diff += 300; // more heavily penalize what looks like scaled bitmap fotns	737	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
729		738
730	if (!set_properties (p, fname))	739	if (!set_properties (p, fname))
731	continue;	740	continue;
732		741
733	if (prop.height != rxvt_fontprop::unset	742	if (prop.height != rxvt_fontprop::unset
…		…
776	delete [] fonts;	785	delete [] fonts;
777		786
778	if (!f)	787	if (!f)
779	return false;	788	return false;
780		789
781	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
782	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
783		792
784	if (registry && encoding)	793	if (registry && encoding)
785	{	794	{
786	char charset[64];	795	char charset[64];
787	snprintf (charset, 64, "%s-%s", registry, encoding);	796	snprintf (charset, 64, "%s-%s", registry, encoding);
788		797
789	cs = codeset_from_name (charset);	798	cs = codeset_from_name (charset);
790	}	799	}
791	else	800	else
792	{	801	{
793	const char *charset = get_property (f, "FONT", 0);	802	const char *charset = get_property (f, XA_FONT, 0);
794		803
795	if (!charset)	804	if (!charset)
796	charset = name;	805	charset = name;
797		806
798	int count = 13;	807	int count = 13;
…		…
813	enc2b = encm \|\| f->max_char_or_byte2 > 255;	822	enc2b = encm \|\| f->max_char_or_byte2 > 255;
814		823
815	slow = false;	824	slow = false;
816		825
817	#if 1 // only used for slow detection, TODO optimize	826	#if 1 // only used for slow detection, TODO optimize
818	if (f->min_bounds.width == f->max_bounds.width)	827	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
819	width = f->min_bounds.width;
820	else if (f->per_char == NULL)
821	width = f->max_bounds.width;	828	width = f->max_bounds.width;
822	else	829	else
823	{	830	{
824	slow = true;	831	slow = true;
825		832
…		…
841		848
842	width = 1;	849	width = 1;
843		850
844	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	851	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
845	{	852	{
846	if (cs != CS_UNICODE
847	&& *t > 0x100
848	&& FROM_UNICODE (cs, *t) == NOCHAR)	853	if (FROM_UNICODE (cs, *t) == NOCHAR)
849	continue;	854	continue;
850		855
851	// ignore characters we wouldn't use anyways	856	// ignore characters we wouldn't use anyways
852	bool careful;	857	bool careful;
853	if (!has_char (*t, &prop, careful))	858	if (!has_char (*t, &prop, careful))
…		…
857		862
858	XCharStruct g;	863	XCharStruct g;
859	int dir_ret, asc_ret, des_ret;	864	int dir_ret, asc_ret, des_ret;
860	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
861		866
		867	int wcw = WCWIDTH (*t);
862	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
863		869
864	if (width < g.width) width = g.width;	870	if (width < g.width) width = g.width;
865	}	871	}
866		872
867	if (cs == CS_UNKNOWN)	873	if (cs == CS_UNKNOWN)
868	{	874	{
869	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
886	void	892	void
887	rxvt_font_x11::clear ()	893	rxvt_font_x11::clear ()
888	{	894	{
889	if (f)	895	if (f)
890	{	896	{
891	XFreeFont (DISPLAY, f);	897	XFreeFont (term->xdisp, f);
892	f = 0;	898	f = 0;
893	}	899	}
894	}	900	}
895		901
896	bool	902	bool
897	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	903	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
898	{	904	{
899	uint32_t ch = FROM_UNICODE (cs, unicode);	905	uint32_t ch = FROM_UNICODE (cs, unicode);
900		906
901	if (ch == NOCHAR)	907	if (ch == NOCHAR)
902	return false;	908	return false;
…		…
939	return false;	945	return false;
940		946
941	if (!prop \|\| prop->width == rxvt_fontprop::unset)	947	if (!prop \|\| prop->width == rxvt_fontprop::unset)
942	return true;	948	return true;
943		949
944	// check character against base font bounding box	950	// check wether character overlaps previous/next character
945	int w = xcs->width;	951	int w = xcs->rbearing - xcs->lbearing;
946	int wcw = wcwidth (unicode);	952	int wcw = max (WCWIDTH (unicode), 1);
947	if (wcw > 0) w = (w + wcw - 1) / wcw;
948		953
949	careful = w > prop->width;	954	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
950	if (careful && w > prop->width * MAX_OVERLAP >> 2)	955
		956	if (careful && !OVERLAP_OK (w, wcw, prop))
951	return false;	957	return false;
952		958
953	return true;	959	return true;
954	}	960	}
955		961
…		…
961	// this looks like a mess /.	967	// this looks like a mess /.
962	// and it is a mess /.	968	// and it is a mess /.
963	// yet we are trying to be perfect /.	969	// yet we are trying to be perfect /.
964	// but the result still isn't perfect /.	970	// but the result still isn't perfect /.
965		971
		972	dTermDisplay;
		973	dTermGC;
		974
966	bool slow = this->slow	975	bool slow = this->slow
967	\|\| width != r->fwidth	976	\|\| width != term->fwidth
968	\|\| height != r->fheight;	977	\|\| height != term->fheight;
969		978
970	int base = ascent; // sorry, incorrect: r->fbase;	979	int base = ascent; // sorry, incorrect: term->fbase;
971		980
972	XGCValues v;	981	XGCValues v;
973	v.foreground = r->pix_colors[fg];	982	v.foreground = term->pix_colors[fg];
974	v.font = f->fid;	983	v.font = f->fid;
975		984
976	if (enc2b)	985	if (enc2b)
977	{	986	{
978	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	987	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
979		988
980	if (bg == Color_bg && !slow)	989	if (bg == Color_bg && !slow)
981	{	990	{
982	v.background = r->pix_colors[bg];	991	v.background = term->pix_colors[bg];
983	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	992	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
984	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	993	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
985	}	994	}
986	else	995	else
987	{	996	{
988	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
989		998
990	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
991		1000
992	if (slow)	1001	if (slow)
993	{	1002	{
994	do	1003	do
995	{	1004	{
996	if (xc->byte1 \|\| xc->byte2)	1005	if (xc->byte1 \|\| xc->byte2)
997	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1006	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
998		1007
999	x += r->fwidth;	1008	x += term->fwidth;
1000	xc++; len--;	1009	xc++; len--;
1001	}	1010	}
1002	while (len);	1011	while (len);
1003	}	1012	}
1004	else	1013	else
1005	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1014	XDrawString16 (disp, d, gc, x, y + base, xc, len);
1006	}	1015	}
1007	}	1016	}
1008	else	1017	else
1009	{	1018	{
1010	const char *xc = enc_char (text, len, cs, slow);	1019	const char *xc = enc_char (text, len, cs, slow);
1011		1020
1012	if (bg == Color_bg && !slow)	1021	if (bg == Color_bg && !slow)
1013	{	1022	{
1014	v.background = r->pix_colors[bg];	1023	v.background = term->pix_colors[bg];
1015	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	1024	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
1016	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1025	XDrawImageString (disp, d, gc, x, y + base, xc, len);
1017	}	1026	}
1018	else	1027	else
1019	{	1028	{
1020	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1021		1030
1022	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1023		1032
1024	if (slow)	1033	if (slow)
1025	{	1034	{
1026	do	1035	do
1027	{	1036	{
1028	if (*xc)	1037	if (*xc)
1029	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1038	XDrawString (disp, d, gc, x, y + base, xc, 1);
1030		1039
1031	x += r->fwidth;	1040	x += term->fwidth;
1032	xc++; len--;	1041	xc++; len--;
1033	}	1042	}
1034	while (len);	1043	while (len);
1035	}	1044	}
1036	else	1045	else
1037	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1046	XDrawString (disp, d, gc, x, y + base, xc, len);
1038	}	1047	}
1039	}	1048	}
1040	}	1049	}
1041		1050
1042	/////////////////////////////////////////////////////////////////////////////	1051	/////////////////////////////////////////////////////////////////////////////
…		…
1054		1063
1055	void draw (rxvt_drawable &d, int x, int y,	1064	void draw (rxvt_drawable &d, int x, int y,
1056	const text_t *text, int len,	1065	const text_t *text, int len,
1057	int fg, int bg);	1066	int fg, int bg);
1058		1067
1059	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);	1068	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1060		1069
1061	protected:	1070	protected:
1062	XftFont *f;	1071	XftFont *f;
1063	};	1072	};
1064		1073
1065	void	1074	void
1066	rxvt_font_xft::clear ()	1075	rxvt_font_xft::clear ()
1067	{	1076	{
1068	if (f)	1077	if (f)
1069	{	1078	{
1070	XftFontClose (DISPLAY, f);	1079	XftFontClose (term->xdisp, f);
1071	f = 0;	1080	f = 0;
1072	}	1081	}
1073	}	1082	}
1074		1083
1075	rxvt_fontprop	1084	rxvt_fontprop
…		…
1093	}	1102	}
1094		1103
1095	bool	1104	bool
1096	rxvt_font_xft::load (const rxvt_fontprop &prop)	1105	rxvt_font_xft::load (const rxvt_fontprop &prop)
1097	{	1106	{
1098	Display *disp = DISPLAY;	1107	dTermDisplay;
1099		1108
1100	clear ();	1109	clear ();
1101		1110
1102	FcPattern p = FcNameParse ((FcChar8 ) name);	1111	FcPattern p = FcNameParse ((FcChar8 ) name);
1103		1112
…		…
1130		1139
1131	// store generated name so iso14755 view gives better results	1140	// store generated name so iso14755 view gives better results
1132	set_name ((char *)FcNameUnparse (p));	1141	set_name ((char *)FcNameUnparse (p));
1133		1142
1134	XftResult result;	1143	XftResult result;
1135	FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);	1144	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1136		1145
1137	FcPatternDestroy (p);	1146	FcPatternDestroy (p);
1138		1147
1139	if (!match)	1148	if (!match)
1140	return false;	1149	return false;
…		…
1182	XGlyphInfo g;	1191	XGlyphInfo g;
1183	XftTextExtents16 (disp, f, &ch, 1, &g);	1192	XftTextExtents16 (disp, f, &ch, 1, &g);
1184		1193
1185	g.width -= g.x;	1194	g.width -= g.x;
1186		1195
1187	int wcw = wcwidth (ch);	1196	int wcw = WCWIDTH (ch);
1188	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1197	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1189		1198
1190	if (width < g.width ) width = g.width;	1199	if (width < g.width ) width = g.width;
1191	if (height < g.height ) height = g.height;	1200	if (height < g.height ) height = g.height;
1192	if (glheight < g.height - g.y) glheight = g.height - g.y;	1201	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1238		1247
1239	return success;	1248	return success;
1240	}	1249	}
1241		1250
1242	bool	1251	bool
1243	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	1252	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1244	{	1253	{
1245	careful = false;	1254	careful = false;
1246		1255
1247	if (!XftCharExists (DISPLAY, f, unicode))	1256	if (!XftCharExists (term->xdisp, f, unicode))
1248	return false;	1257	return false;
1249		1258
1250	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1251	return true;	1260	return true;
1252		1261
1253	// check character against base font bounding box	1262	// check character against base font bounding box
1254	FcChar32 ch = unicode;	1263	FcChar32 ch = unicode;
1255	XGlyphInfo g;	1264	XGlyphInfo g;
1256	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);	1265	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1257		1266
1258	int w = g.width - g.x;	1267	int w = g.width - g.x;
1259	int wcw = wcwidth (unicode);	1268	int wcw = max (WCWIDTH (unicode), 1);
1260	if (wcw > 0) w = (w + wcw - 1) / wcw;
1261		1269
1262	careful = w > prop->width;	1270	careful = g.x > 0 \|\| w > prop->width * wcw;
1263	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1271
		1272	if (careful && !OVERLAP_OK (w, wcw, prop))
		1273	return false;
		1274
		1275	// this weeds out _totally_ broken fonts, or glyphs
		1276	if (!OVERLAP_OK (g.xOff, wcw, prop))
1264	return false;	1277	return false;
1265		1278
1266	return true;	1279	return true;
1267	}	1280	}
1268		1281
1269	void	1282	void
1270	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1271	const text_t *text, int len,	1284	const text_t *text, int len,
1272	int fg, int bg)	1285	int fg, int bg)
1273	{	1286	{
		1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
		1288
1274	XGlyphInfo extents;	1289	XGlyphInfo extents;
1275	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1276	XftGlyphSpec *ep = enc;	1291	XftGlyphSpec *ep = enc;
1277		1292
1278	clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);	1293	dTermDisplay;
		1294	dTermGC;
1279		1295
1280	// cut trailing spaces	1296	// cut trailing spaces
1281	while (len && text [len - 1] == ' ')	1297	while (len && text [len - 1] == ' ')
1282	len--;	1298	len--;
1283		1299
1284	while (len)	1300	while (len)
1285	{	1301	{
1286	int cwidth = r->fwidth;	1302	int cwidth = term->fwidth;
1287	FcChar32 fc = *text++; len--;	1303	FcChar32 fc = *text++; len--;
1288		1304
1289	while (len && *text == NOCHAR)	1305	while (len && *text == NOCHAR)
1290	text++, len--, cwidth += r->fwidth;	1306	text++, len--, cwidth += term->fwidth;
1291		1307
1292	if (fc != ' ') // skip spaces	1308	if (fc != ' ') // skip spaces
1293	{	1309	{
1294	FT_UInt glyph = XftCharIndex (d.display->display, f, fc);	1310	FT_UInt glyph = XftCharIndex (disp, f, fc);
1295	XftGlyphExtents (d.display->display, f, &glyph, 1, &extents);	1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);
		1312
1296		1313
1297	ep->glyph = glyph;	1314	ep->glyph = glyph;
1298	ep->x = x + (cwidth - extents.xOff >> 1);	1315	ep->x = x + (cwidth - extents.xOff >> 1);
1299	ep->y = y + ascent;	1316	ep->y = y + ascent;
		1317
		1318	if (extents.xOff == 0)
		1319	ep->x = x + cwidth;
		1320
1300	ep++;	1321	ep++;
1301	}	1322	}
1302		1323
1303	x += cwidth;	1324	x += cwidth;
1304	}	1325	}
1305		1326
1306	if (ep != enc)	1327	if (ep != enc)
1307	XftDrawGlyphSpec (d, &r->pix_colors[fg].c, f, enc, ep - enc);	1328	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1308	}	1329	}
1309	#endif	1330	#endif
1310		1331
1311	/////////////////////////////////////////////////////////////////////////////	1332	/////////////////////////////////////////////////////////////////////////////
1312		1333
1313	rxvt_fontset::rxvt_fontset (rxvt_t r)	1334	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1314	: fontdesc (0), r (r)	1335	: fontdesc (0), term (term)
1315	{	1336	{
1316	clear ();	1337	clear ();
1317	}	1338	}
1318		1339
1319	rxvt_fontset::~rxvt_fontset ()	1340	rxvt_fontset::~rxvt_fontset ()
…		…
1363	f = new rxvt_font_x11;	1384	f = new rxvt_font_x11;
1364	}	1385	}
1365	else	1386	else
1366	f = new rxvt_font_x11;	1387	f = new rxvt_font_x11;
1367		1388
1368	f->set_term (r);	1389	f->set_term (term);
1369	f->set_name (strdup (name));	1390	f->set_name (strdup (name));
1370		1391
1371	f->cs = cs;	1392	f->cs = cs;
1372	f->loaded = false;	1393	f->loaded = false;
1373		1394
…		…
1556	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1577	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1557	FcPatternAddBool (p, FC_MINSPACE, 1);	1578	FcPatternAddBool (p, FC_MINSPACE, 1);
1558	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1579	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1559		1580
1560	XftResult result;	1581	XftResult result;
1561	FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);	1582	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1562		1583
1563	FcPatternDestroy (p);	1584	FcPatternDestroy (p);
1564		1585
1565	if (match)	1586	if (match)
1566	{	1587	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.83 by root, Mon Jan 9 07:35:23 2006 UTC vs. Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.83 by root, Mon Jan 9 07:35:23 2006 UTC vs.
Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC