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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.85 by root, Wed Jan 25 00:42: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 (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	))
33		40
34	const struct rxvt_fallback_font {	41	const struct rxvt_fallback_font {
35	codeset cs;	42	codeset cs;
36	const char *name;	43	const char *name;
37	} fallback_fonts[] = {	44	} fallback_fonts[] = {
38	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
39	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
40	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
41		48
42	#if ENCODING_EU	49	#if ENCODING_EU
43	// cyrillic	50	// cyrillic
44	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
45	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
46		53
47	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
48	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
49	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
50	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
51	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
57	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	64	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
58	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
59	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
60		67
61	# if XFT	68	# if XFT
62	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },	69	{ CS_KOI8_U, "xft::lang=ru" },
63		70
64	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
65	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
66	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },	73	{ CS_ISO8859_7, "xft::lang=el" },
67	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },	74	{ CS_ISO8859_8, "xft::lang=he" },
68	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
69	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },	76	{ CS_ISO8859_10, "xft::lang=se" },
70	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },	77	{ CS_ISO8859_11, "xft::lang=th" },
71	# endif	78	# endif
72	#endif	79	#endif
73		80
74	// japanese	81	// japanese
75	#if ENCODING_JP \|\| ENCODING_JP_EXT	82	#if ENCODING_JP \|\| ENCODING_JP_EXT
76	# if XFT	83	# if XFT
77	// prefer xft for complex scripts	84	// prefer xft for complex scripts
78	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },	88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82	# endif	89	# endif
83	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
84	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
85	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	92	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
86	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	93	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
…		…
90		97
91	#if ENCODING_ZH \|\| ENCODING_ZH_EXT	98	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
92	# if XFT	99	# if XFT
93	{ CS_GBK_0, "xft:AR PL KaitiM GB" },	100	{ CS_GBK_0, "xft:AR PL KaitiM GB" },
94	{ CS_GBK_0, "xft:AR PL SungtiL GB" },	101	{ CS_GBK_0, "xft:AR PL SungtiL GB" },
95	{ CS_GBK_0, "xft::spacing=100:lang=zh" },	102	{ CS_GBK_0, "xft::lang=zh" },
96	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	103	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	104	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	105	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	106	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },	107	{ CS_GB2312_1980_0, "xft::lang=zh" },
101	# endif	108	# endif
102	{ CS_GBK_0, "-----------c--gbk-0" },	109	{ CS_GBK_0, "-----------c--gbk-0" },
103	{ CS_BIG5, "-----------c-*-big5-0" },	110	{ CS_BIG5, "-----------c-*-big5-0" },
104	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	111	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
105	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	112	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
…		…
118	#if ENCODING_KR	125	#if ENCODING_KR
119	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },	126	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
120	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },	127	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
121	# if XFT	128	# if XFT
122	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124	# endif	131	# endif
125	#endif	132	#endif
126		133
127	// generic font fallback
128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
129	{ 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.
130	{ CS_UNICODE, "----r-------c--iso10646-1" },
131	{ CS_UNICODE, "----r-------m--iso10646-1" },
132	#if XFT	136	#if XFT
133	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137		141
138	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
139	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
140	#endif	144	#endif
141		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" },
142	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
143	};	151	};
144		152
145	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
146	// 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.
…		…
150	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
151	};	159	};
152		160
153	#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]))
154		162
155	#define dTermDisplay Display *disp = term->display->display	163	#define dTermDisplay Display *disp = term->dpy
156	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
157
158	/////////////////////////////////////////////////////////////////////////////
159
160	#if XFT
161	rxvt_drawable::~rxvt_drawable ()
162	{
163	if (xftdrawable)
164	XftDrawDestroy (xftdrawable);
165	}
166
167	rxvt_drawable::operator XftDraw *()
168	{
169	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172	return xftdrawable;
173	}
174	#endif
175		165
176	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
177		167
178	static const char *	168	static const char *
179	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)
…		…
221	return res;	211	return res;
222	}	212	}
223		213
224	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
225		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
		220
226	void	221	void
227	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
228	{	223	{
229	if (this->name == name)	224	if (this->name == name)
230	return;	225	return;
…		…
236	void	231	void
237	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
238	{	233	{
239	dTermDisplay;	234	dTermDisplay;
240	dTermGC;	235	dTermGC;
241		236
242	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
243	XClearArea (disp, d, x, y, w, h, FALSE);	238	XClearArea (disp, d, x, y, w, h, false);
244	else if (color >= 0)	239	else if (color >= 0)
245	{	240	{
246	#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)
247	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
248	#else	258	#else
249	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
250	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
251	#endif	261	#endif
252	}	262	}
253	}	263	}
254		264
255	#include "table/linedraw.h"	265	/////////////////////////////////////////////////////////////////////////////
256		266
257	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
258	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
259		269
260	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
273	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
274		284
275	return p;	285	return p;
276	}	286	}
277		287
278	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
279	{	289	{
280	width = 1; height = 1;	290	width = 1; height = 1;
281	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
282		292
283	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
…		…
344	;	354	;
345		355
346	int width = text - tp;	356	int width = text - tp;
347	int fwidth = term->fwidth * width;	357	int fwidth = term->fwidth * width;
348		358
		359	#ifdef BUILTIN_GLYPHS
349	if (0x2500 <= t && t <= 0x259f)	360	if (0x2500 <= t && t <= 0x259f)
350	{	361	{
		362	# include "table/linedraw.h"
351	uint16_t offs = linedraw_offs[t - 0x2500];	363	uint16_t offs = linedraw_offs[t - 0x2500];
352	uint32_t *a = linedraw_command + (offs >> 4);	364	uint32_t *a = linedraw_command + (offs >> 4);
353	uint32_t *b = a + (offs & 15);	365	uint32_t *b = a + (offs & 15);
354		366
355	int W = fwidth;	367	int W = fwidth;
…		…
393		405
394	case 1: // rectangle, possibly stippled	406	case 1: // rectangle, possibly stippled
395	if (a)	407	if (a)
396	{	408	{
397	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	409	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
398		410
399	gcv.fill_style = FillStippled;	411	gcv.fill_style = FillStippled;
400	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	412	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
401	gcv.ts_x_origin = x;	413	gcv.ts_x_origin = x;
402	gcv.ts_y_origin = y;	414	gcv.ts_y_origin = y;
403		415
…		…
422	(a - 1) * 9064, (b - 1) 90*64);	434	(a - 1) * 9064, (b - 1) 90*64);
423	break;	435	break;
424	}	436	}
425	}	437	}
426	}	438	}
		439	#else
		440	if (0)
		441	;
		442	#endif
427	#if ENABLE_COMBINING	443	#if ENABLE_COMBINING
428	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	444	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429	{	445	{
		446	min_it (width, 2); // we only support wcwidth up to 2
		447
430	text_t chrs[2];	448	text_t chrs[2];
431	width = min (2, width);
432	chrs [1] = NOCHAR;	449	chrs [1] = NOCHAR;
433		450
434	*chrs = cc->c1;	451	*chrs = cc->c1;
435	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	452	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
436	f1->draw (d, x, y, chrs, width, fg, bg);	453	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
443	*chrs = cc->c2;	460	*chrs = cc->c2;
444	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	461	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
445	? f1	462	? f1
446	: (*fs)[fs->find_font (cc->c2)];	463	: (*fs)[fs->find_font (cc->c2)];
447		464
448	f2->draw (d, x, y, chrs, width, fg, -1);	465	f2->draw (d, x, y, chrs, width, fg, Color_none);
449	}	466	}
450	}	467	}
451	#endif	468	#endif
452	else	469	else
453	switch (t)	470	switch (t)
…		…
473		490
474	void clear ();	491	void clear ();
475		492
476	rxvt_fontprop properties ();	493	rxvt_fontprop properties ();
477		494
478	bool load (const rxvt_fontprop &prop);	495	bool load (const rxvt_fontprop &prop, bool force_prop);
479		496
480	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;
481		498
482	void draw (rxvt_drawable &d, int x, int y,	499	void draw (rxvt_drawable &d, int x, int y,
483	const text_t *text, int len,	500	const text_t *text, int len,
484	int fg, int bg);	501	int fg, int bg);
485		502
486	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
487	XFontStruct *f;	504	XFontStruct *f;
488	codeset cs;
489	bool enc2b, encm;	505	bool enc2b, encm;
490		506
491	char get_property (XFontStruct f, const char property, const char repl) const;	507	char get_property (XFontStruct f, Atom property, const char *repl) const;
492	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);
493	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494	bool set_properties (rxvt_fontprop &p, const char *name);	510	bool set_properties (rxvt_fontprop &p, const char *name);
495	};	511	};
496		512
497	char *	513	char *
498	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
499	{	515	{
500	unsigned long value;	516	unsigned long value;
501		517
502	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	518	if (XGetFontProperty (f, property, &value))
503	return XGetAtomName (term->display->display, value);	519	return XGetAtomName (term->dpy, value);
504	else	520	else
505	return rxvt_strdup (repl);	521	return repl ? strdup (repl) : 0;
506	}	522	}
507		523
508	rxvt_fontprop	524	rxvt_fontprop
509	rxvt_font_x11::properties ()	525	rxvt_font_x11::properties ()
510	{	526	{
…		…
514	}	530	}
515		531
516	bool	532	bool
517	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)
518	{	534	{
519	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;
520	p.height = height;	538	p.height = height;
521	p.ascent = rxvt_fontprop::unset;	539	p.ascent = rxvt_fontprop::unset;
522	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;
523	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;
524		542
…		…
529	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530	{	548	{
531	unsigned long height;	549	unsigned long height;
532		550
533	#if 0	551	#if 0
534	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	552	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535	return false;	553	return false;
536	#else	554	#else
537	height = f->ascent + f->descent;	555	height = f->ascent + f->descent;
538	#endif	556	#endif
539		557
540	unsigned long avgwidth;	558	unsigned long avgwidth;
541	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	559	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542	avgwidth = 0;	560	avgwidth = 0;
543		561
544	char *weight = get_property (f, "WEIGHT_NAME", "medium");	562	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545	char *slant = get_property (f, "SLANT", "r");	563	char *slant = get_property (f, term->xa [XA_SLANT], "r");
546		564
547	set_properties (p, height, weight, slant, avgwidth);	565	set_properties (p, height, weight, slant, avgwidth);
548		566
549	free (weight);	567	free (weight);
550	free (slant);	568	free (slant);
…		…
627	return false;	645	return false;
628	}	646	}
629	}	647	}
630		648
631	bool	649	bool
632	rxvt_font_x11::load (const rxvt_fontprop &prop)	650	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633	{	651	{
634	dTermDisplay;	652	dTermDisplay;
635		653
636	clear ();	654	clear ();
637		655
638	char field_str[64]; // enough for 128 bits	656	char field_str[64]; // enough for 128 bits
639		657
640	// first morph the font if required	658	// first morph the font if required
641	if (prop.weight != rxvt_fontprop::unset	659	if (force_prop)
642	\|\| prop.slant != rxvt_fontprop::unset)
643	{	660	{
644	char fname[1024];	661	char fname[1024];
645		662
646	if (name[0] != '-')	663	if (name[0] != '-')
647	{	664	{
648	f = XLoadQueryFont (disp, name);	665	f = XLoadQueryFont (disp, name);
649		666
650	if (!f)	667	if (!f)
651	return false;	668	return false;
652		669
653	char *new_name = get_property (f, "FONT", name);	670	char *new_name = get_property (f, XA_FONT, name);
654		671
655	if (new_name)	672	if (new_name)
656	set_name (new_name);	673	set_name (new_name);
657	else	674	else
658	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	675	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
661	f = 0;	678	f = 0;
662	}	679	}
663		680
664	if (prop.weight != rxvt_fontprop::unset)	681	if (prop.weight != rxvt_fontprop::unset)
665	{	682	{
666	replace_field (fname, name, 2, 0,	683	replace_field (fname, name, 2, 0,
667	prop.weight < rxvt_fontprop::bold	684	prop.weight < rxvt_fontprop::bold
668	? "medium" : "bold");	685	? "medium" : "bold");
669	set_name (strdup (fname));	686	set_name (strdup (fname));
670	}	687	}
671		688
…		…
767	delete [] fonts;	784	delete [] fonts;
768		785
769	if (!f)	786	if (!f)
770	return false;	787	return false;
771		788
772	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	789	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	790	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774		791
775	if (registry && encoding)	792	if (registry && encoding)
776	{	793	{
777	char charset[64];	794	char charset[64];
778	snprintf (charset, 64, "%s-%s", registry, encoding);	795	snprintf (charset, 64, "%s-%s", registry, encoding);
779		796
780	cs = codeset_from_name (charset);	797	cs = codeset_from_name (charset);
781	}	798	}
782	else	799	else
783	{	800	{
784	const char *charset = get_property (f, "FONT", 0);	801	const char *charset = get_property (f, XA_FONT, 0);
785		802
786	if (!charset)	803	if (!charset)
787	charset = name;	804	charset = name;
788		805
789	int count = 13;	806	int count = 13;
…		…
804	enc2b = encm \|\| f->max_char_or_byte2 > 255;	821	enc2b = encm \|\| f->max_char_or_byte2 > 255;
805		822
806	slow = false;	823	slow = false;
807		824
808	#if 1 // only used for slow detection, TODO optimize	825	#if 1 // only used for slow detection, TODO optimize
809	if (f->min_bounds.width == f->max_bounds.width)	826	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
810	width = f->min_bounds.width;
811	else if (f->per_char == NULL)
812	width = f->max_bounds.width;	827	width = f->max_bounds.width;
813	else	828	else
814	{	829	{
815	slow = true;	830	slow = true;
816		831
817	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;
818		833
819	if (encm)	834	if (encm)
820	N += (f->max_byte1 - f->min_byte1)	835	N += (f->max_byte1 - f->min_byte1)
821	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
822		837
823	while (N)	838	while (N)
824	{	839	{
825	if (f->per_char[N].width > width)	840	if (f->per_char[N].width > width)
826	width = f->per_char[N].width;	841	width = f->per_char[N].width;
827		842
…		…
832		847
833	width = 1;	848	width = 1;
834		849
835	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; )
836	{	851	{
837	if (cs != CS_UNICODE
838	&& *t > 0x100
839	&& FROM_UNICODE (cs, *t) == NOCHAR)	852	if (FROM_UNICODE (cs, *t) == NOCHAR)
840	continue;	853	continue;
841		854
842	// ignore characters we wouldn't use anyways	855	// ignore characters we wouldn't use anyways
843	bool careful;	856	bool careful;
844	if (!has_char (*t, &prop, careful))	857	if (!has_char (*t, &prop, careful))
…		…
848		861
849	XCharStruct g;	862	XCharStruct g;
850	int dir_ret, asc_ret, des_ret;	863	int dir_ret, asc_ret, des_ret;
851	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	864	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852		865
		866	int wcw = WCWIDTH (*t);
853	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;
854		868
855	if (width < g.width) width = g.width;	869	if (width < g.width) width = g.width;
856	}	870	}
857		871
858	if (cs == CS_UNKNOWN)	872	if (cs == CS_UNKNOWN)
859	{	873	{
860	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
877	void	891	void
878	rxvt_font_x11::clear ()	892	rxvt_font_x11::clear ()
879	{	893	{
880	if (f)	894	if (f)
881	{	895	{
882	XFreeFont (term->display->display, f);	896	XFreeFont (term->dpy, f);
883	f = 0;	897	f = 0;
884	}	898	}
885	}	899	}
886		900
887	bool	901	bool
…		…
930	return false;	944	return false;
931		945
932	if (!prop \|\| prop->width == rxvt_fontprop::unset)	946	if (!prop \|\| prop->width == rxvt_fontprop::unset)
933	return true;	947	return true;
934		948
935	// check character against base font bounding box	949	// check wether character overlaps previous/next character
936	int w = xcs->width;	950	int w = xcs->rbearing - xcs->lbearing;
937	int wcw = wcwidth (unicode);	951	int wcw = max (WCWIDTH (unicode), 1);
938	if (wcw > 0) w = (w + wcw - 1) / wcw;
939		952
940	careful = w > prop->width;	953	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
941	if (careful && w > prop->width * MAX_OVERLAP >> 2)	954
		955	if (careful && !OVERLAP_OK (w, wcw, prop))
942	return false;	956	return false;
943		957
944	return true;	958	return true;
945	}	959	}
946		960
…		…
980	else	994	else
981	{	995	{
982	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983		997
984	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
985		999
986	if (slow)	1000	if (slow)
987	{	1001	{
988	do	1002	do
989	{	1003	{
990	if (xc->byte1 \|\| xc->byte2)	1004	if (xc->byte1 \|\| xc->byte2)
…		…
1012	else	1026	else
1013	{	1027	{
1014	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015		1029
1016	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1017		1031
1018	if (slow)	1032	if (slow)
1019	{	1033	{
1020	do	1034	do
1021	{	1035	{
1022	if (*xc)	1036	if (*xc)
…		…
1042		1056
1043	void clear ();	1057	void clear ();
1044		1058
1045	rxvt_fontprop properties ();	1059	rxvt_fontprop properties ();
1046		1060
1047	bool load (const rxvt_fontprop &prop);	1061	bool load (const rxvt_fontprop &prop, bool force_prop);
1048		1062
1049	void draw (rxvt_drawable &d, int x, int y,	1063	void draw (rxvt_drawable &d, int x, int y,
1050	const text_t *text, int len,	1064	const text_t *text, int len,
1051	int fg, int bg);	1065	int fg, int bg);
1052		1066
1053	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;
1054		1068
1055	protected:	1069	protected:
1056	XftFont *f;	1070	XftFont *f;
1057	};	1071	};
1058		1072
1059	void	1073	void
1060	rxvt_font_xft::clear ()	1074	rxvt_font_xft::clear ()
1061	{	1075	{
1062	if (f)	1076	if (f)
1063	{	1077	{
1064	XftFontClose (term->display->display, f);	1078	XftFontClose (term->dpy, f);
1065	f = 0;	1079	f = 0;
1066	}	1080	}
1067	}	1081	}
1068		1082
1069	rxvt_fontprop	1083	rxvt_fontprop
…		…
1085		1099
1086	return p;	1100	return p;
1087	}	1101	}
1088		1102
1089	bool	1103	bool
1090	rxvt_font_xft::load (const rxvt_fontprop &prop)	1104	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1091	{	1105	{
1092	dTermDisplay;	1106	dTermDisplay;
1093		1107
1094	clear ();	1108	clear ();
1095		1109
…		…
1104	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1105	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1106	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1107		1121
1108	if (prop.weight != rxvt_fontprop::unset	1122	if (prop.weight != rxvt_fontprop::unset
1109	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1123	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1110	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1111		1125
1112	if (prop.slant != rxvt_fontprop::unset	1126	if (prop.slant != rxvt_fontprop::unset
1113	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1127	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1114	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1115		1129
1116	#if 0 // clipping unfortunately destroys our precious double-width-characters	1130	#if 0 // clipping unfortunately destroys our precious double-width-characters
1117	// clip width, we can't do better, or can we?	1131	// clip width, we can't do better, or can we?
1118	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1176	XGlyphInfo g;	1190	XGlyphInfo g;
1177	XftTextExtents16 (disp, f, &ch, 1, &g);	1191	XftTextExtents16 (disp, f, &ch, 1, &g);
1178		1192
1179	g.width -= g.x;	1193	g.width -= g.x;
1180		1194
1181	int wcw = wcwidth (ch);	1195	int wcw = WCWIDTH (ch);
1182	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183		1197
1184	if (width < g.width ) width = g.width;	1198	if (width < g.width ) width = g.width;
1185	if (height < g.height ) height = g.height;	1199	if (height < g.height ) height = g.height;
1186	if (glheight < g.height - g.y) glheight = g.height - g.y;	1200	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1236	bool	1250	bool
1237	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
1238	{	1252	{
1239	careful = false;	1253	careful = false;
1240		1254
1241	if (!XftCharExists (term->display->display, f, unicode))	1255	if (!XftCharExists (term->dpy, f, unicode))
1242	return false;	1256	return false;
1243		1257
1244	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1245	return true;	1259	return true;
1246		1260
1247	// check character against base font bounding box	1261	// check character against base font bounding box
1248	FcChar32 ch = unicode;	1262	FcChar32 ch = unicode;
1249	XGlyphInfo g;	1263	XGlyphInfo g;
1250	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1264	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251		1265
1252	int w = g.width - g.x;	1266	int w = g.width - g.x;
1253	int wcw = wcwidth (unicode);	1267	int wcw = max (WCWIDTH (unicode), 1);
1254	if (wcw > 0) w = (w + wcw - 1) / wcw;
1255		1268
1256	careful = w > prop->width;	1269	careful = g.x > 0 \|\| w > prop->width * wcw;
1257	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1270
		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))
1258	return false;	1276	return false;
1259		1277
1260	return true;	1278	return true;
1261	}	1279	}
1262		1280
1263	void	1281	void
1264	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1282	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265	const text_t *text, int len,	1283	const text_t *text, int len,
1266	int fg, int bg)	1284	int fg, int bg)
1267	{	1285	{
1268	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270	XGlyphInfo extents;	1286	XGlyphInfo extents;
1271	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1287	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1272	XftGlyphSpec *ep = enc;	1288	XftGlyphSpec *ep = enc;
1273		1289
1274	dTermDisplay;	1290	dTermDisplay;
1275	dTermGC;	1291	dTermGC;
1276		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	;
1277	// cut trailing spaces	1305	// cut trailing spaces
1278	while (len && text [len - 1] == ' ')	1306	while (len && text [len - 1] == ' ')
1279	len--;	1307	len--;
1280		1308
		1309	int x_ = buffered ? 0 : x;
		1310	int y_ = buffered ? 0 : y;
		1311
1281	while (len)	1312	while (len)
1282	{	1313	{
1283	int cwidth = term->fwidth;	1314	int cwidth = term->fwidth;
1284	FcChar32 fc = *text++; len--;	1315	FcChar32 fc = *text++; len--;
1285		1316
1286	while (len && *text == NOCHAR)	1317	while (len && *text == NOCHAR)
1287	text++, len--, cwidth += term->fwidth;	1318	text++, len--, cwidth += term->fwidth;
1288		1319
1289	if (fc != ' ') // skip spaces	1320	if (fc != ' ') // skip spaces
1290	{	1321	{
1291	FT_UInt glyph = XftCharIndex (disp, f, fc);	1322	FT_UInt glyph = XftCharIndex (disp, f, fc);
1292	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1323	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293		1324
1294	ep->glyph = glyph;	1325	ep->glyph = glyph;
1295	ep->x = x + (cwidth - extents.xOff >> 1);	1326	ep->x = x_ + (cwidth - extents.xOff >> 1);
1296	ep->y = y + ascent;	1327	ep->y = y_ + ascent;
		1328
		1329	if (extents.xOff == 0)
		1330	ep->x = x_ + cwidth;
		1331
1297	ep++;	1332	ep++;
1298	}	1333	}
1299		1334
1300	x += cwidth;	1335	x_ += cwidth;
		1336	}
		1337
		1338	if (buffered)
1301	}	1339	{
1302		1340	bool back_rendered = false;
1303	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);
1304	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1411	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1412	}
1305	}	1413	}
		1414
1306	#endif	1415	#endif
1307		1416
1308	/////////////////////////////////////////////////////////////////////////////	1417	/////////////////////////////////////////////////////////////////////////////
1309		1418
1310	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1419	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1321	void	1430	void
1322	rxvt_fontset::clear ()	1431	rxvt_fontset::clear ()
1323	{	1432	{
1324	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1433	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325	= rxvt_fontprop::unset;	1434	= rxvt_fontprop::unset;
		1435	force_prop = false;
1326		1436
1327	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1437	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328	FONT_UNREF (*i);	1438	FONT_UNREF (*i);
1329		1439
1330	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1440	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1339		1449
1340	rxvt_font *	1450	rxvt_font *
1341	rxvt_fontset::new_font (const char *name, codeset cs)	1451	rxvt_fontset::new_font (const char *name, codeset cs)
1342	{	1452	{
1343	rxvt_font *f;	1453	rxvt_font *f;
1344		1454
1345	if (!name \|\| !*name)	1455	if (!name \|\| !*name)
1346	{	1456	{
1347	name = "";	1457	name = "";
1348	f = new rxvt_font_default (this);	1458	f = new rxvt_font_default (this);
1349	}	1459	}
…		…
1442	if (fonts[i]->loaded)	1552	if (fonts[i]->loaded)
1443	return true;	1553	return true;
1444		1554
1445	fonts[i]->loaded = true;	1555	fonts[i]->loaded = true;
1446		1556
1447	if (!fonts[i]->load (prop))	1557	if (!fonts[i]->load (prop, force_prop))
1448	{	1558	{
1449	fonts[i]->cs = CS_UNKNOWN;	1559	fonts[i]->cs = CS_UNKNOWN;
1450	return false;	1560	return false;
1451	}	1561	}
1452		1562
…		…
1553	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1663	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554	FcPatternAddBool (p, FC_MINSPACE, 1);	1664	FcPatternAddBool (p, FC_MINSPACE, 1);
1555	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1665	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556		1666
1557	XftResult result;	1667	XftResult result;
1558	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1668	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559		1669
1560	FcPatternDestroy (p);	1670	FcPatternDestroy (p);
1561		1671
1562	if (match)	1672	if (match)
1563	{	1673	{
…		…
1568	if (find_font (font) < 0)	1678	if (find_font (font) < 0)
1569	{	1679	{
1570	char fontname[4096];	1680	char fontname[4096];
1571	sprintf (fontname, "xft:%-.4090s", font);	1681	sprintf (fontname, "xft:%-.4090s", font);
1572		1682
1573	fonts.push_back (new_font (fontname, CS_UNICODE));	1683	fonts.push_back (new_font (fontname, CS_UNICODE));
1574	}	1684	}
1575		1685
1576	free (font);	1686	free (font);
1577	}	1687	}
1578	#endif	1688	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.85 by root, Wed Jan 25 00:42: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.85 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC