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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.88 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 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"));
…		…
351	;	354	;
352		355
353	int width = text - tp;	356	int width = text - tp;
354	int fwidth = term->fwidth * width;	357	int fwidth = term->fwidth * width;
355		358
		359	#ifdef BUILTIN_GLYPHS
356	if (0x2500 <= t && t <= 0x259f)	360	if (0x2500 <= t && t <= 0x259f)
357	{	361	{
		362	# include "table/linedraw.h"
358	uint16_t offs = linedraw_offs[t - 0x2500];	363	uint16_t offs = linedraw_offs[t - 0x2500];
359	uint32_t *a = linedraw_command + (offs >> 4);	364	uint32_t *a = linedraw_command + (offs >> 4);
360	uint32_t *b = a + (offs & 15);	365	uint32_t *b = a + (offs & 15);
361		366
362	int W = fwidth;	367	int W = fwidth;
…		…
400		405
401	case 1: // rectangle, possibly stippled	406	case 1: // rectangle, possibly stippled
402	if (a)	407	if (a)
403	{	408	{
404	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	409	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405		410
406	gcv.fill_style = FillStippled;	411	gcv.fill_style = FillStippled;
407	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	412	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408	gcv.ts_x_origin = x;	413	gcv.ts_x_origin = x;
409	gcv.ts_y_origin = y;	414	gcv.ts_y_origin = y;
410		415
…		…
429	(a - 1) * 9064, (b - 1) 90*64);	434	(a - 1) * 9064, (b - 1) 90*64);
430	break;	435	break;
431	}	436	}
432	}	437	}
433	}	438	}
		439	#else
		440	if (0)
		441	;
		442	#endif
434	#if ENABLE_COMBINING	443	#if ENABLE_COMBINING
435	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	444	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436	{	445	{
		446	min_it (width, 2); // we only support wcwidth up to 2
		447
437	text_t chrs[2];	448	text_t chrs[2];
438	width = min (2, width);
439	chrs [1] = NOCHAR;	449	chrs [1] = NOCHAR;
440		450
441	*chrs = cc->c1;	451	*chrs = cc->c1;
442	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	452	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
443	f1->draw (d, x, y, chrs, width, fg, bg);	453	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
450	*chrs = cc->c2;	460	*chrs = cc->c2;
451	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	461	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
452	? f1	462	? f1
453	: (*fs)[fs->find_font (cc->c2)];	463	: (*fs)[fs->find_font (cc->c2)];
454		464
455	f2->draw (d, x, y, chrs, width, fg, -1);	465	f2->draw (d, x, y, chrs, width, fg, Color_none);
456	}	466	}
457	}	467	}
458	#endif	468	#endif
459	else	469	else
460	switch (t)	470	switch (t)
…		…
480		490
481	void clear ();	491	void clear ();
482		492
483	rxvt_fontprop properties ();	493	rxvt_fontprop properties ();
484		494
485	bool load (const rxvt_fontprop &prop);	495	bool load (const rxvt_fontprop &prop, bool force_prop);
486		496
487	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	497	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488		498
489	void draw (rxvt_drawable &d, int x, int y,	499	void draw (rxvt_drawable &d, int x, int y,
490	const text_t *text, int len,	500	const text_t *text, int len,
491	int fg, int bg);	501	int fg, int bg);
492		502
493	bool slow; // wether this is a proportional font or has other funny characteristics	503	bool slow; // wether this is a proportional font or has other funny characteristics
494	XFontStruct *f;	504	XFontStruct *f;
495	codeset cs;
496	bool enc2b, encm;	505	bool enc2b, encm;
497		506
498	char get_property (XFontStruct f, const char property, const char repl) const;	507	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);	508	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);	509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501	bool set_properties (rxvt_fontprop &p, const char *name);	510	bool set_properties (rxvt_fontprop &p, const char *name);
502	};	511	};
503		512
504	char *	513	char *
505	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
506	{	515	{
507	unsigned long value;	516	unsigned long value;
508		517
509	if (XGetFontProperty (f, XInternAtom (term->xdisp, property, 0), &value))	518	if (XGetFontProperty (f, property, &value))
510	return XGetAtomName (term->xdisp, value);	519	return XGetAtomName (term->dpy, value);
511	else	520	else
512	return rxvt_strdup (repl);	521	return repl ? strdup (repl) : 0;
513	}	522	}
514		523
515	rxvt_fontprop	524	rxvt_fontprop
516	rxvt_font_x11::properties ()	525	rxvt_font_x11::properties ()
517	{	526	{
…		…
521	}	530	}
522		531
523	bool	532	bool
524	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	533	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
525	{	534	{
526	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	535	p.width = width != rxvt_fontprop::unset ? width
		536	: avgwidth ? (avgwidth + 1) / 10
		537	: (height + 1) / 2;
527	p.height = height;	538	p.height = height;
528	p.ascent = rxvt_fontprop::unset;	539	p.ascent = rxvt_fontprop::unset;
529	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	540	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
530	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	541	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
531		542
…		…
536	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
537	{	548	{
538	unsigned long height;	549	unsigned long height;
539		550
540	#if 0	551	#if 0
541	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	552	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
542	return false;	553	return false;
543	#else	554	#else
544	height = f->ascent + f->descent;	555	height = f->ascent + f->descent;
545	#endif	556	#endif
546		557
547	unsigned long avgwidth;	558	unsigned long avgwidth;
548	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "AVERAGE_WIDTH", 0), &avgwidth))	559	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
549	avgwidth = 0;	560	avgwidth = 0;
550		561
551	char *weight = get_property (f, "WEIGHT_NAME", "medium");	562	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
552	char *slant = get_property (f, "SLANT", "r");	563	char *slant = get_property (f, term->xa [XA_SLANT], "r");
553		564
554	set_properties (p, height, weight, slant, avgwidth);	565	set_properties (p, height, weight, slant, avgwidth);
555		566
556	free (weight);	567	free (weight);
557	free (slant);	568	free (slant);
…		…
634	return false;	645	return false;
635	}	646	}
636	}	647	}
637		648
638	bool	649	bool
639	rxvt_font_x11::load (const rxvt_fontprop &prop)	650	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640	{	651	{
641	dTermDisplay;	652	dTermDisplay;
642		653
643	clear ();	654	clear ();
644		655
645	char field_str[64]; // enough for 128 bits	656	char field_str[64]; // enough for 128 bits
646		657
647	// first morph the font if required	658	// first morph the font if required
648	if (prop.weight != rxvt_fontprop::unset	659	if (force_prop)
649	\|\| prop.slant != rxvt_fontprop::unset)
650	{	660	{
651	char fname[1024];	661	char fname[1024];
652		662
653	if (name[0] != '-')	663	if (name[0] != '-')
654	{	664	{
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);
…		…
668	f = 0;	678	f = 0;
669	}	679	}
670		680
671	if (prop.weight != rxvt_fontprop::unset)	681	if (prop.weight != rxvt_fontprop::unset)
672	{	682	{
673	replace_field (fname, name, 2, 0,	683	replace_field (fname, name, 2, 0,
674	prop.weight < rxvt_fontprop::bold	684	prop.weight < rxvt_fontprop::bold
675	? "medium" : "bold");	685	? "medium" : "bold");
676	set_name (strdup (fname));	686	set_name (strdup (fname));
677	}	687	}
678		688
…		…
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
824	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	832	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
825		833
826	if (encm)	834	if (encm)
827	N += (f->max_byte1 - f->min_byte1)	835	N += (f->max_byte1 - f->min_byte1)
828	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829		837
830	while (N)	838	while (N)
831	{	839	{
832	if (f->per_char[N].width > width)	840	if (f->per_char[N].width > width)
833	width = f->per_char[N].width;	841	width = f->per_char[N].width;
834		842
…		…
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
		866	int wcw = WCWIDTH (*t);
860	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	867	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861		868
862	if (width < g.width) width = g.width;	869	if (width < g.width) width = g.width;
863	}	870	}
864		871
865	if (cs == CS_UNKNOWN)	872	if (cs == CS_UNKNOWN)
866	{	873	{
867	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
884	void	891	void
885	rxvt_font_x11::clear ()	892	rxvt_font_x11::clear ()
886	{	893	{
887	if (f)	894	if (f)
888	{	895	{
889	XFreeFont (term->xdisp, f);	896	XFreeFont (term->dpy, f);
890	f = 0;	897	f = 0;
891	}	898	}
892	}	899	}
893		900
894	bool	901	bool
…		…
937	return false;	944	return false;
938		945
939	if (!prop \|\| prop->width == rxvt_fontprop::unset)	946	if (!prop \|\| prop->width == rxvt_fontprop::unset)
940	return true;	947	return true;
941		948
942	// check character against base font bounding box	949	// check wether character overlaps previous/next character
943	int w = xcs->rbearing - xcs->lbearing;	950	int w = xcs->rbearing - xcs->lbearing;
944	int wcw = WCWIDTH (unicode);	951	int wcw = max (WCWIDTH (unicode), 1);
945	if (wcw > 0) w = (w + wcw - 1) / wcw;
946		952
947	careful = w > prop->width;	953	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
		954
948	if (careful && OVERLAP_OK (w, prop))	955	if (careful && !OVERLAP_OK (w, wcw, prop))
949	return false;	956	return false;
950		957
951	return true;	958	return true;
952	}	959	}
953		960
…		…
987	else	994	else
988	{	995	{
989	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990		997
991	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
992		999
993	if (slow)	1000	if (slow)
994	{	1001	{
995	do	1002	do
996	{	1003	{
997	if (xc->byte1 \|\| xc->byte2)	1004	if (xc->byte1 \|\| xc->byte2)
…		…
1019	else	1026	else
1020	{	1027	{
1021	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022		1029
1023	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1024		1031
1025	if (slow)	1032	if (slow)
1026	{	1033	{
1027	do	1034	do
1028	{	1035	{
1029	if (*xc)	1036	if (*xc)
…		…
1049		1056
1050	void clear ();	1057	void clear ();
1051		1058
1052	rxvt_fontprop properties ();	1059	rxvt_fontprop properties ();
1053		1060
1054	bool load (const rxvt_fontprop &prop);	1061	bool load (const rxvt_fontprop &prop, bool force_prop);
1055		1062
1056	void draw (rxvt_drawable &d, int x, int y,	1063	void draw (rxvt_drawable &d, int x, int y,
1057	const text_t *text, int len,	1064	const text_t *text, int len,
1058	int fg, int bg);	1065	int fg, int bg);
1059		1066
1060	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1067	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1061		1068
1062	protected:	1069	protected:
1063	XftFont *f;	1070	XftFont *f;
1064	};	1071	};
1065		1072
1066	void	1073	void
1067	rxvt_font_xft::clear ()	1074	rxvt_font_xft::clear ()
1068	{	1075	{
1069	if (f)	1076	if (f)
1070	{	1077	{
1071	XftFontClose (term->xdisp, f);	1078	XftFontClose (term->dpy, f);
1072	f = 0;	1079	f = 0;
1073	}	1080	}
1074	}	1081	}
1075		1082
1076	rxvt_fontprop	1083	rxvt_fontprop
…		…
1092		1099
1093	return p;	1100	return p;
1094	}	1101	}
1095		1102
1096	bool	1103	bool
1097	rxvt_font_xft::load (const rxvt_fontprop &prop)	1104	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098	{	1105	{
1099	dTermDisplay;	1106	dTermDisplay;
1100		1107
1101	clear ();	1108	clear ();
1102		1109
…		…
1111	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114		1121
1115	if (prop.weight != rxvt_fontprop::unset	1122	if (prop.weight != rxvt_fontprop::unset
1116	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1123	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118		1125
1119	if (prop.slant != rxvt_fontprop::unset	1126	if (prop.slant != rxvt_fontprop::unset
1120	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1127	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122		1129
1123	#if 0 // clipping unfortunately destroys our precious double-width-characters	1130	#if 0 // clipping unfortunately destroys our precious double-width-characters
1124	// clip width, we can't do better, or can we?	1131	// clip width, we can't do better, or can we?
1125	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1243	bool	1250	bool
1244	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245	{	1252	{
1246	careful = false;	1253	careful = false;
1247		1254
1248	if (!XftCharExists (term->xdisp, f, unicode))	1255	if (!XftCharExists (term->dpy, f, unicode))
1249	return false;	1256	return false;
1250		1257
1251	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1252	return true;	1259	return true;
1253		1260
1254	// check character against base font bounding box	1261	// check character against base font bounding box
1255	FcChar32 ch = unicode;	1262	FcChar32 ch = unicode;
1256	XGlyphInfo g;	1263	XGlyphInfo g;
1257	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1264	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258		1265
1259	int w = g.width - g.x;	1266	int w = g.width - g.x;
1260	int wcw = WCWIDTH (unicode);	1267	int wcw = max (WCWIDTH (unicode), 1);
1261	if (wcw > 0) w = (w + wcw - 1) / wcw;
1262		1268
1263	careful = w > prop->width;	1269	careful = g.x > 0 \|\| w > prop->width * wcw;
		1270
1264	if (careful && OVERLAP_OK (w, prop))	1271	if (careful && !OVERLAP_OK (w, wcw, prop))
		1272	return false;
		1273
		1274	// this weeds out _totally_ broken fonts, or glyphs
		1275	if (!OVERLAP_OK (g.xOff, wcw, prop))
1265	return false;	1276	return false;
1266		1277
1267	return true;	1278	return true;
1268	}	1279	}
1269		1280
1270	void	1281	void
1271	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1282	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272	const text_t *text, int len,	1283	const text_t *text, int len,
1273	int fg, int bg)	1284	int fg, int bg)
1274	{	1285	{
1275	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1276
1277	XGlyphInfo extents;	1286	XGlyphInfo extents;
1278	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1287	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1279	XftGlyphSpec *ep = enc;	1288	XftGlyphSpec *ep = enc;
1280		1289
1281	dTermDisplay;	1290	dTermDisplay;
1282	dTermGC;	1291	dTermGC;
1283		1292
		1293	int w = term->fwidth * len;
		1294	int h = term->fheight;
		1295
		1296	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1297	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1298	* good idea from the perspective of packaging for wide variety of user configs.
		1299	*/
		1300	bool buffered = true
		1301	#ifdef FORCE_UNBUFFERED_XFT
		1302	&& bg >= 0
		1303	#endif
		1304	;
1284	// cut trailing spaces	1305	// cut trailing spaces
1285	while (len && text [len - 1] == ' ')	1306	while (len && text [len - 1] == ' ')
1286	len--;	1307	len--;
1287		1308
		1309	int x_ = buffered ? 0 : x;
		1310	int y_ = buffered ? 0 : y;
		1311
1288	while (len)	1312	while (len)
1289	{	1313	{
1290	int cwidth = term->fwidth;	1314	int cwidth = term->fwidth;
1291	FcChar32 fc = *text++; len--;	1315	FcChar32 fc = *text++; len--;
1292		1316
1293	while (len && *text == NOCHAR)	1317	while (len && *text == NOCHAR)
1294	text++, len--, cwidth += term->fwidth;	1318	text++, len--, cwidth += term->fwidth;
1295		1319
1296	if (fc != ' ') // skip spaces	1320	if (fc != ' ') // skip spaces
1297	{	1321	{
1298	FT_UInt glyph = XftCharIndex (disp, f, fc);	1322	FT_UInt glyph = XftCharIndex (disp, f, fc);
1299	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1323	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300		1324
1301	ep->glyph = glyph;	1325	ep->glyph = glyph;
1302	ep->x = x + (cwidth - extents.xOff >> 1);	1326	ep->x = x_ + (cwidth - extents.xOff >> 1);
1303	ep->y = y + ascent;	1327	ep->y = y_ + ascent;
		1328
		1329	if (extents.xOff == 0)
		1330	ep->x = x_ + cwidth;
		1331
1304	ep++;	1332	ep++;
1305	}	1333	}
1306		1334
1307	x += cwidth;	1335	x_ += cwidth;
		1336	}
		1337
		1338	if (buffered)
1308	}	1339	{
1309		1340	bool back_rendered = false;
1310	if (ep != enc)	1341	if (ep != enc)
		1342	{
		1343	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1344
		1345	#ifdef HAVE_BG_PIXMAP
		1346	if (term->bgPixmap.pixmap)
		1347	{
		1348	Picture dst = 0;
		1349
		1350	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1351	dst = XftDrawPicture (d2);
		1352
		1353	if (bg < 0 \|\| dst != 0)
		1354	{
		1355	int src_x = x, src_y = y ;
		1356
		1357	if (term->bgPixmap.is_parentOrigin ())
		1358	{
		1359	src_x += term->window_vt_x;
		1360	src_y += term->window_vt_y;
		1361	}
		1362
		1363	if (term->bgPixmap.pmap_width >= src_x+w
		1364	&& term->bgPixmap.pmap_height >= src_y+h)
		1365	{
		1366	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1367	src_x, src_y, w, h, 0, 0);
		1368	}
		1369	else
		1370	{
		1371	XGCValues gcv;
		1372
		1373	gcv.fill_style = FillTiled;
		1374	gcv.tile = term->bgPixmap.pixmap;
		1375	gcv.ts_x_origin = -src_x;
		1376	gcv.ts_y_origin = -src_y;
		1377
		1378	XChangeGC (disp, gc,
		1379	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1380	&gcv);
		1381
		1382	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1383
		1384	gcv.fill_style = FillSolid;
		1385	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1386	}
		1387
		1388	if (bg >= 0)
		1389	{
		1390	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1391	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1392	}
		1393
		1394	back_rendered = true;
		1395	}
		1396	}
		1397	#endif
		1398
		1399	if (bg >= 0 && !back_rendered)
		1400	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1401
		1402	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1403	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1404	}
		1405	else
		1406	clear_rect (d, x, y, w, h, bg);
		1407	}
		1408	else
		1409	{
		1410	clear_rect (d, x, y, w, h, bg);
1311	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1411	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1412	}
1312	}	1413	}
		1414
1313	#endif	1415	#endif
1314		1416
1315	/////////////////////////////////////////////////////////////////////////////	1417	/////////////////////////////////////////////////////////////////////////////
1316		1418
1317	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1419	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1328	void	1430	void
1329	rxvt_fontset::clear ()	1431	rxvt_fontset::clear ()
1330	{	1432	{
1331	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1433	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1332	= rxvt_fontprop::unset;	1434	= rxvt_fontprop::unset;
		1435	force_prop = false;
1333		1436
1334	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1437	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1335	FONT_UNREF (*i);	1438	FONT_UNREF (*i);
1336		1439
1337	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1440	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1346		1449
1347	rxvt_font *	1450	rxvt_font *
1348	rxvt_fontset::new_font (const char *name, codeset cs)	1451	rxvt_fontset::new_font (const char *name, codeset cs)
1349	{	1452	{
1350	rxvt_font *f;	1453	rxvt_font *f;
1351		1454
1352	if (!name \|\| !*name)	1455	if (!name \|\| !*name)
1353	{	1456	{
1354	name = "";	1457	name = "";
1355	f = new rxvt_font_default (this);	1458	f = new rxvt_font_default (this);
1356	}	1459	}
…		…
1449	if (fonts[i]->loaded)	1552	if (fonts[i]->loaded)
1450	return true;	1553	return true;
1451		1554
1452	fonts[i]->loaded = true;	1555	fonts[i]->loaded = true;
1453		1556
1454	if (!fonts[i]->load (prop))	1557	if (!fonts[i]->load (prop, force_prop))
1455	{	1558	{
1456	fonts[i]->cs = CS_UNKNOWN;	1559	fonts[i]->cs = CS_UNKNOWN;
1457	return false;	1560	return false;
1458	}	1561	}
1459		1562
…		…
1560	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1663	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1561	FcPatternAddBool (p, FC_MINSPACE, 1);	1664	FcPatternAddBool (p, FC_MINSPACE, 1);
1562	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1665	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1563		1666
1564	XftResult result;	1667	XftResult result;
1565	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1668	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1566		1669
1567	FcPatternDestroy (p);	1670	FcPatternDestroy (p);
1568		1671
1569	if (match)	1672	if (match)
1570	{	1673	{
…		…
1575	if (find_font (font) < 0)	1678	if (find_font (font) < 0)
1576	{	1679	{
1577	char fontname[4096];	1680	char fontname[4096];
1578	sprintf (fontname, "xft:%-.4090s", font);	1681	sprintf (fontname, "xft:%-.4090s", font);
1579		1682
1580	fonts.push_back (new_font (fontname, CS_UNICODE));	1683	fonts.push_back (new_font (fontname, CS_UNICODE));
1581	}	1684	}
1582		1685
1583	free (font);	1686	free (font);
1584	}	1687	}
1585	#endif	1688	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.88 by root, Wed Jan 25 21:09:21 2006 UTC vs. Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.88 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC