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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.90 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
24	#include "rxvtlib.h"	24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	25	#include "rxvtutil.h"
26	#include "rxvtfont.h"	26	#include "rxvtfont.h"
27		27
28	#include <cstdlib>	28	#include <cstdlib>
29	#include <wchar.h>	29
30	#include <inttypes.h>	30	#include <inttypes.h>
31		31
32	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths 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	33	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34		34
35	#define OVERLAP_OK(w,prop) (w) > ( \	35	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36	prop->slant >= rxvt_fontprop::italic \	36	(prop)->slant >= rxvt_fontprop::italic \
37	? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \	37	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38	: (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \	38	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39	)	39	))
40		40
41	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
42	codeset cs;	42	codeset cs;
43	const char *name;	43	const char *name;
44	} fallback_fonts[] = {	44	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		48
49	#if ENCODING_EU	49	#if ENCODING_EU
50	// cyrillic	50	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		53
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		67
68	# if XFT	68	# if XFT
69	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	69	{ CS_KOI8_U, "xft::lang=ru" },
70		70
71	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	73	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	74	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
76	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	76	{ CS_ISO8859_10, "xft::lang=se" },
77	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	77	{ CS_ISO8859_11, "xft::lang=th" },
78	# endif	78	# endif
79	#endif	79	#endif
80		80
81	// japanese	81	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	82	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	83	# if XFT
84	// prefer xft for complex scripts	84	// prefer xft for complex scripts
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	89	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
97		97
98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
99	# if XFT	99	# if XFT
100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
102	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	102	{ CS_GBK_0, "xft::lang=zh" },
103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
107	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	107	{ CS_GB2312_1980_0, "xft::lang=zh" },
108	# endif	108	# endif
109	{ CS_GBK_0, "-----------c--gbk-0" },	109	{ CS_GBK_0, "-----------c--gbk-0" },
110	{ CS_BIG5, "-----------c-*-big5-0" },	110	{ CS_BIG5, "-----------c-*-big5-0" },
111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
125	#if ENCODING_KR	125	#if ENCODING_KR
126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
128	# if XFT	128	# if XFT
129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131	# endif	131	# endif
132	#endif	132	#endif
133		133
134	// generic font fallback
135	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
136	{ 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.
137	{ CS_UNICODE, "----r-------c--iso10646-1" },
138	{ CS_UNICODE, "----r-------m--iso10646-1" },
139	#if XFT	136	#if XFT
140	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144		141
145	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
146	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
147	#endif	144	#endif
148		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" },
149	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
150	};	151	};
151		152
152	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
153	// 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.
…		…
157	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
158	};	159	};
159		160
160	#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]))
161		162
162	#define dTermDisplay Display *disp = term->xdisp	163	#define dTermDisplay Display *disp = term->dpy
163	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
164
165	/////////////////////////////////////////////////////////////////////////////
166
167	#if XFT
168	rxvt_drawable::~rxvt_drawable ()
169	{
170	if (xftdrawable)
171	XftDrawDestroy (xftdrawable);
172	}
173
174	rxvt_drawable::operator XftDraw *()
175	{
176	if (!xftdrawable)
177	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179	return xftdrawable;
180	}
181	#endif
182		165
183	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
184		167
185	static const char *	168	static const char *
186	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	169	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
…		…
228	return res;	211	return res;
229	}	212	}
230		213
231	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
232		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
		220
233	void	221	void
234	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
235	{	223	{
236	if (this->name == name)	224	if (this->name == name)
237	return;	225	return;
…		…
243	void	231	void
244	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
245	{	233	{
246	dTermDisplay;	234	dTermDisplay;
247	dTermGC;	235	dTermGC;
248		236
249	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
250	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
251	else if (color >= 0)	239	else if (color >= 0)
252	{	240	{
253	#if XFT	241	#if XFT
		242	bool done = false;
		243	#ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
		245	{
		246	Picture dst = XftDrawPicture (d);
		247	if (dst != 0)
		248	{
		249	XClearArea (disp, d, x, y, w, h, false);
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	done = true;
		253	}
		254	}
		255	#endif
		256	if (!done)
254	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
255	#else	258	#else
256	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
257	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
258	#endif	261	#endif
259	}	262	}
260	}	263	}
261		264
262	#include "table/linedraw.h"	265	/////////////////////////////////////////////////////////////////////////////
263		266
264	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
265	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
266		269
267	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
280	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
281		284
282	return p;	285	return p;
283	}	286	}
284		287
285	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
286	{	289	{
287	width = 1; height = 1;	290	width = 1; height = 1;
288	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
289		292
290	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
…		…
303	return false;	306	return false;
304		307
305	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
306	return true;	309	return true;
307		310
		311	#ifdef BUILTIN_GLYPHS
308	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
309	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
310	return true;	314	return true;
		315	#endif
311		316
312	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
313	return true;	318	return true;
314		319
315	switch (unicode)	320	switch (unicode)
…		…
351	;	356	;
352		357
353	int width = text - tp;	358	int width = text - tp;
354	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
355		360
		361	#ifdef BUILTIN_GLYPHS
356	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
357	{	363	{
		364	# include "table/linedraw.h"
358	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
359	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
360	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
361		368
362	int W = fwidth;	369	int W = fwidth;
…		…
400		407
401	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
402	if (a)	409	if (a)
403	{	410	{
404	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405		412
406	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
407	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
409	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
410		417
…		…
429	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
430	break;	437	break;
431	}	438	}
432	}	439	}
433	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
434	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
435	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436	{	447	{
		448	min_it (width, 2); // we only support wcwidth up to 2
		449
437	text_t chrs[2];	450	text_t chrs[2];
438	width = min (2, width);
439	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
440		452
441	*chrs = cc->c1;	453	*chrs = cc->c1;
442	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
443	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
450	*chrs = cc->c2;	462	*chrs = cc->c2;
451	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452	? f1	464	? f1
453	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
454		466
455	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
456	}	468	}
457	}	469	}
458	#endif	470	#endif
459	else	471	else
460	switch (t)	472	switch (t)
…		…
480		492
481	void clear ();	493	void clear ();
482		494
483	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
484		496
485	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
486		498
487	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	499	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488		500
489	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
490	const text_t *text, int len,	502	const text_t *text, int len,
491	int fg, int bg);	503	int fg, int bg);
492		504
493	bool slow; // wether this is a proportional font or has other funny characteristics	505	bool slow; // wether this is a proportional font or has other funny characteristics
494	XFontStruct *f;	506	XFontStruct *f;
495	codeset cs;
496	bool enc2b, encm;	507	bool enc2b, encm;
497		508
498	char get_property (XFontStruct f, Atom property, const char *repl) const;	509	char get_property (XFontStruct f, Atom property, const char *repl) const;
499	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	510	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
500	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
505	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	516	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
506	{	517	{
507	unsigned long value;	518	unsigned long value;
508		519
509	if (XGetFontProperty (f, property, &value))	520	if (XGetFontProperty (f, property, &value))
510	return XGetAtomName (term->xdisp, value);	521	return XGetAtomName (term->dpy, value);
511	else	522	else
512	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
513	}	524	}
514		525
515	rxvt_fontprop	526	rxvt_fontprop
516	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
517	{	528	{
…		…
521	}	532	}
522		533
523	bool	534	bool
524	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	535	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
525	{	536	{
526	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	537	p.width = width != rxvt_fontprop::unset ? width
		538	: avgwidth ? (avgwidth + 1) / 10
		539	: (height + 1) / 2;
527	p.height = height;	540	p.height = height;
528	p.ascent = rxvt_fontprop::unset;	541	p.ascent = rxvt_fontprop::unset;
529	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	542	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
530	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	543	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531		544
…		…
536	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537	{	550	{
538	unsigned long height;	551	unsigned long height;
539		552
540	#if 0	553	#if 0
541	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542	return false;	555	return false;
543	#else	556	#else
544	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
545	#endif	558	#endif
546		559
…		…
634	return false;	647	return false;
635	}	648	}
636	}	649	}
637		650
638	bool	651	bool
639	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640	{	653	{
641	dTermDisplay;	654	dTermDisplay;
642		655
643	clear ();	656	clear ();
644		657
645	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
646		659
647	// first morph the font if required	660	// first morph the font if required
648	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
649	\|\| prop.slant != rxvt_fontprop::unset)
650	{	662	{
651	char fname[1024];	663	char fname[1024];
652		664
653	if (name[0] != '-')	665	if (name[0] != '-')
654	{	666	{
…		…
668	f = 0;	680	f = 0;
669	}	681	}
670		682
671	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
672	{	684	{
673	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
674	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
675	? "medium" : "bold");	687	? "medium" : "bold");
676	set_name (strdup (fname));	688	set_name (strdup (fname));
677	}	689	}
678		690
…		…
811	enc2b = encm \|\| f->max_char_or_byte2 > 255;	823	enc2b = encm \|\| f->max_char_or_byte2 > 255;
812		824
813	slow = false;	825	slow = false;
814		826
815	#if 1 // only used for slow detection, TODO optimize	827	#if 1 // only used for slow detection, TODO optimize
816	if (f->min_bounds.width == f->max_bounds.width)	828	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;	829	width = f->max_bounds.width;
820	else	830	else
821	{	831	{
822	slow = true;	832	slow = true;
823		833
824	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	834	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
825		835
826	if (encm)	836	if (encm)
827	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
828	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829		839
830	while (N)	840	while (N)
831	{	841	{
832	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
833	width = f->per_char[N].width;	843	width = f->per_char[N].width;
834		844
…		…
839		849
840	width = 1;	850	width = 1;
841		851
842	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	852	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843	{	853	{
844	if (cs != CS_UNICODE
845	&& *t > 0x100
846	&& FROM_UNICODE (cs, *t) == NOCHAR)	854	if (FROM_UNICODE (cs, *t) == NOCHAR)
847	continue;	855	continue;
848		856
849	// ignore characters we wouldn't use anyways	857	// ignore characters we wouldn't use anyways
850	bool careful;	858	bool careful;
851	if (!has_char (*t, &prop, careful))	859	if (!has_char (*t, &prop, careful))
…		…
855		863
856	XCharStruct g;	864	XCharStruct g;
857	int dir_ret, asc_ret, des_ret;	865	int dir_ret, asc_ret, des_ret;
858	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	866	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859		867
		868	int wcw = WCWIDTH (*t);
860	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	869	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861		870
862	if (width < g.width) width = g.width;	871	if (width < g.width) width = g.width;
863	}	872	}
864		873
865	if (cs == CS_UNKNOWN)	874	if (cs == CS_UNKNOWN)
866	{	875	{
867	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	876	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
884	void	893	void
885	rxvt_font_x11::clear ()	894	rxvt_font_x11::clear ()
886	{	895	{
887	if (f)	896	if (f)
888	{	897	{
889	XFreeFont (term->xdisp, f);	898	XFreeFont (term->dpy, f);
890	f = 0;	899	f = 0;
891	}	900	}
892	}	901	}
893		902
894	bool	903	bool
…		…
937	return false;	946	return false;
938		947
939	if (!prop \|\| prop->width == rxvt_fontprop::unset)	948	if (!prop \|\| prop->width == rxvt_fontprop::unset)
940	return true;	949	return true;
941		950
942	// check character against base font bounding box	951	// check wether character overlaps previous/next character
943	int w = xcs->rbearing - xcs->lbearing;	952	int w = xcs->rbearing - xcs->lbearing;
944	int wcw = WCWIDTH (unicode);	953	int wcw = max (WCWIDTH (unicode), 1);
945	if (wcw > 0) w = (w + wcw - 1) / wcw;
946		954
947	careful = w > prop->width;	955	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
		956
948	if (careful && OVERLAP_OK (w, prop))	957	if (careful && !OVERLAP_OK (w, wcw, prop))
949	return false;	958	return false;
950		959
951	return true;	960	return true;
952	}	961	}
953		962
…		…
987	else	996	else
988	{	997	{
989	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990		999
991	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
992		1001
993	if (slow)	1002	if (slow)
994	{	1003	{
995	do	1004	do
996	{	1005	{
997	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
…		…
1019	else	1028	else
1020	{	1029	{
1021	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022		1031
1023	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1024		1033
1025	if (slow)	1034	if (slow)
1026	{	1035	{
1027	do	1036	do
1028	{	1037	{
1029	if (*xc)	1038	if (*xc)
…		…
1049		1058
1050	void clear ();	1059	void clear ();
1051		1060
1052	rxvt_fontprop properties ();	1061	rxvt_fontprop properties ();
1053		1062
1054	bool load (const rxvt_fontprop &prop);	1063	bool load (const rxvt_fontprop &prop, bool force_prop);
1055		1064
1056	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1057	const text_t *text, int len,	1066	const text_t *text, int len,
1058	int fg, int bg);	1067	int fg, int bg);
1059		1068
1060	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1069	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061		1070
1062	protected:	1071	protected:
1063	XftFont *f;	1072	XftFont *f;
1064	};	1073	};
1065		1074
1066	void	1075	void
1067	rxvt_font_xft::clear ()	1076	rxvt_font_xft::clear ()
1068	{	1077	{
1069	if (f)	1078	if (f)
1070	{	1079	{
1071	XftFontClose (term->xdisp, f);	1080	XftFontClose (term->dpy, f);
1072	f = 0;	1081	f = 0;
1073	}	1082	}
1074	}	1083	}
1075		1084
1076	rxvt_fontprop	1085	rxvt_fontprop
…		…
1092		1101
1093	return p;	1102	return p;
1094	}	1103	}
1095		1104
1096	bool	1105	bool
1097	rxvt_font_xft::load (const rxvt_fontprop &prop)	1106	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098	{	1107	{
1099	dTermDisplay;	1108	dTermDisplay;
1100		1109
1101	clear ();	1110	clear ();
1102		1111
…		…
1111	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1120	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1121	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1122	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114		1123
1115	if (prop.weight != rxvt_fontprop::unset	1124	if (prop.weight != rxvt_fontprop::unset
1116	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1125	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1126	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118		1127
1119	if (prop.slant != rxvt_fontprop::unset	1128	if (prop.slant != rxvt_fontprop::unset
1120	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1130	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122		1131
1123	#if 0 // clipping unfortunately destroys our precious double-width-characters	1132	#if 0 // clipping unfortunately destroys our precious double-width-characters
1124	// clip width, we can't do better, or can we?	1133	// clip width, we can't do better, or can we?
1125	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1134	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1243	bool	1252	bool
1244	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1253	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245	{	1254	{
1246	careful = false;	1255	careful = false;
1247		1256
1248	if (!XftCharExists (term->xdisp, f, unicode))	1257	if (!XftCharExists (term->dpy, f, unicode))
1249	return false;	1258	return false;
1250		1259
1251	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1260	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1252	return true;	1261	return true;
1253		1262
1254	// check character against base font bounding box	1263	// check character against base font bounding box
1255	FcChar32 ch = unicode;	1264	FcChar32 ch = unicode;
1256	XGlyphInfo g;	1265	XGlyphInfo g;
1257	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1266	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258		1267
1259	int w = g.width - g.x;	1268	int w = g.width - g.x;
1260	int wcw = WCWIDTH (unicode);	1269	int wcw = max (WCWIDTH (unicode), 1);
1261	if (wcw > 0) w = (w + wcw - 1) / wcw;
1262		1270
1263	careful = w > prop->width;	1271	careful = g.x > 0 \|\| w > prop->width * wcw;
		1272
1264	if (careful && OVERLAP_OK (w, prop))	1273	if (careful && !OVERLAP_OK (w, wcw, prop))
		1274	return false;
		1275
		1276	// this weeds out _totally_ broken fonts, or glyphs
		1277	if (!OVERLAP_OK (g.xOff, wcw, prop))
1265	return false;	1278	return false;
1266		1279
1267	return true;	1280	return true;
1268	}	1281	}
1269		1282
1270	void	1283	void
1271	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1284	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272	const text_t *text, int len,	1285	const text_t *text, int len,
1273	int fg, int bg)	1286	int fg, int bg)
1274	{	1287	{
1275	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1276
1277	XGlyphInfo extents;	1288	XGlyphInfo extents;
1278	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1289	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1279	XftGlyphSpec *ep = enc;	1290	XftGlyphSpec *ep = enc;
1280		1291
1281	dTermDisplay;	1292	dTermDisplay;
1282	dTermGC;	1293	dTermGC;
1283		1294
		1295	int w = term->fwidth * len;
		1296	int h = term->fheight;
		1297
		1298	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1299	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1300	* good idea from the perspective of packaging for wide variety of user configs.
		1301	*/
		1302	bool buffered = true
		1303	#ifdef FORCE_UNBUFFERED_XFT
		1304	&& bg >= 0
		1305	#endif
		1306	;
1284	// cut trailing spaces	1307	// cut trailing spaces
1285	while (len && text [len - 1] == ' ')	1308	while (len && text [len - 1] == ' ')
1286	len--;	1309	len--;
1287		1310
		1311	int x_ = buffered ? 0 : x;
		1312	int y_ = buffered ? 0 : y;
		1313
1288	while (len)	1314	while (len)
1289	{	1315	{
1290	int cwidth = term->fwidth;	1316	int cwidth = term->fwidth;
1291	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1292		1318
1293	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1294	text++, len--, cwidth += term->fwidth;	1320	text++, len--, cwidth += term->fwidth;
1295		1321
1296	if (fc != ' ') // skip spaces	1322	if (fc != ' ') // skip spaces
1297	{	1323	{
1298	FT_UInt glyph = XftCharIndex (disp, f, fc);	1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
1299	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300		1326
1301	ep->glyph = glyph;	1327	ep->glyph = glyph;
1302	ep->x = x + (cwidth - extents.xOff >> 1);	1328	ep->x = x_ + (cwidth - extents.xOff >> 1);
1303	ep->y = y + ascent;	1329	ep->y = y_ + ascent;
		1330
		1331	if (extents.xOff == 0)
		1332	ep->x = x_ + cwidth;
		1333
1304	ep++;	1334	ep++;
1305	}	1335	}
1306		1336
1307	x += cwidth;	1337	x_ += cwidth;
		1338	}
		1339
		1340	if (buffered)
1308	}	1341	{
1309		1342	bool back_rendered = false;
1310	if (ep != enc)	1343	if (ep != enc)
		1344	{
		1345	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1346
		1347	#ifdef HAVE_BG_PIXMAP
		1348	if (term->bgPixmap.pixmap)
		1349	{
		1350	Picture dst = 0;
		1351
		1352	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1353	dst = XftDrawPicture (d2);
		1354
		1355	if (bg < 0 \|\| dst != 0)
		1356	{
		1357	int src_x = x, src_y = y ;
		1358
		1359	if (term->bgPixmap.is_parentOrigin ())
		1360	{
		1361	src_x += term->window_vt_x;
		1362	src_y += term->window_vt_y;
		1363	}
		1364
		1365	if (term->bgPixmap.pmap_width >= src_x+w
		1366	&& term->bgPixmap.pmap_height >= src_y+h)
		1367	{
		1368	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1369	src_x, src_y, w, h, 0, 0);
		1370	}
		1371	else
		1372	{
		1373	XGCValues gcv;
		1374
		1375	gcv.fill_style = FillTiled;
		1376	gcv.tile = term->bgPixmap.pixmap;
		1377	gcv.ts_x_origin = -src_x;
		1378	gcv.ts_y_origin = -src_y;
		1379
		1380	XChangeGC (disp, gc,
		1381	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1382	&gcv);
		1383
		1384	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1385
		1386	gcv.fill_style = FillSolid;
		1387	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1388	}
		1389
		1390	if (bg >= 0)
		1391	{
		1392	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1393	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1394	}
		1395
		1396	back_rendered = true;
		1397	}
		1398	}
		1399	#endif
		1400
		1401	if (bg >= 0 && !back_rendered)
		1402	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1403
		1404	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1405	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1406	}
		1407	else
		1408	clear_rect (d, x, y, w, h, bg);
		1409	}
		1410	else
		1411	{
		1412	clear_rect (d, x, y, w, h, bg);
1311	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1413	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1414	}
1312	}	1415	}
		1416
1313	#endif	1417	#endif
1314		1418
1315	/////////////////////////////////////////////////////////////////////////////	1419	/////////////////////////////////////////////////////////////////////////////
1316		1420
1317	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1421	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1328	void	1432	void
1329	rxvt_fontset::clear ()	1433	rxvt_fontset::clear ()
1330	{	1434	{
1331	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1435	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1332	= rxvt_fontprop::unset;	1436	= rxvt_fontprop::unset;
		1437	force_prop = false;
1333		1438
1334	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1439	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1335	FONT_UNREF (*i);	1440	FONT_UNREF (*i);
1336		1441
1337	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1442	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1346		1451
1347	rxvt_font *	1452	rxvt_font *
1348	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1349	{	1454	{
1350	rxvt_font *f;	1455	rxvt_font *f;
1351		1456
1352	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1353	{	1458	{
1354	name = "";	1459	name = "";
1355	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1356	}	1461	}
…		…
1449	if (fonts[i]->loaded)	1554	if (fonts[i]->loaded)
1450	return true;	1555	return true;
1451		1556
1452	fonts[i]->loaded = true;	1557	fonts[i]->loaded = true;
1453		1558
1454	if (!fonts[i]->load (prop))	1559	if (!fonts[i]->load (prop, force_prop))
1455	{	1560	{
1456	fonts[i]->cs = CS_UNKNOWN;	1561	fonts[i]->cs = CS_UNKNOWN;
1457	return false;	1562	return false;
1458	}	1563	}
1459		1564
…		…
1560	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1665	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561	FcPatternAddBool (p, FC_MINSPACE, 1);	1666	FcPatternAddBool (p, FC_MINSPACE, 1);
1562	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1667	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563		1668
1564	XftResult result;	1669	XftResult result;
1565	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1670	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566		1671
1567	FcPatternDestroy (p);	1672	FcPatternDestroy (p);
1568		1673
1569	if (match)	1674	if (match)
1570	{	1675	{
…		…
1575	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1576	{	1681	{
1577	char fontname[4096];	1682	char fontname[4096];
1578	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1579		1684
1580	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1581	}	1686	}
1582		1687
1583	free (font);	1688	free (font);
1584	}	1689	}
1585	#endif	1690	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.90 by root, Mon Jan 30 02:21:20 2006 UTC vs. Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.90 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC