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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.76 by root, Tue Jan 3 23:40:58 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.76 by root, Tue Jan 3 23:40:58 2006 UTC vs. Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.76 by root, Tue Jan 3 23:40:58 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC