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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.77 by root, Wed Jan 4 20:43:38 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.77 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC