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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.119 by sasha, Thu Sep 20 15:32:34 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[] = {
…		…
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		165
158	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
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
176	/////////////////////////////////////////////////////////////////////////////
177
178	static void *enc_buf;
179	static uint32_t enc_len;
180
181	static inline void *
182	get_enc_buf (uint32_t len)
183	{
184	if (len > enc_len)
185	{
186	free (enc_buf);
187	enc_buf = malloc (len);
188	enc_len = len;
189	}
190
191	return enc_buf;
192	}
193		167
194	static const char *	168	static const char *
195	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)
196	{	170	{
197	uint8_t buf = (uint8_t )get_enc_buf (len);	171	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
		172	uint8_t *res = buf;
198		173
199	while (len--)	174	while (len--)
200	{	175	{
201	uint32_t c = FROM_UNICODE (cs, *text++);	176	uint32_t c = FROM_UNICODE (cs, *text++);
202		177
…		…
207	}	182	}
208		183
209	*buf++ = c;	184	*buf++ = c;
210	}	185	}
211		186
212	return (const char *)enc_buf;	187	return (const char *)res;
213	}	188	}
214		189
215	static const XChar2b *	190	static const XChar2b *
216	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)	191	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217	{	192	{
218	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	193	XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
		194	XChar2b *res = buf;
219		195
220	while (len--)	196	while (len--)
221	{	197	{
222	uint32_t c = FROM_UNICODE (cs, *text++);	198	uint32_t c = FROM_UNICODE (cs, *text++);
223		199
…		…
230	buf->byte1 = c >> 8;	206	buf->byte1 = c >> 8;
231	buf->byte2 = c;	207	buf->byte2 = c;
232	buf++;	208	buf++;
233	}	209	}
234		210
235	return (XChar2b *)enc_buf;	211	return res;
236	}	212	}
237		213
238	/////////////////////////////////////////////////////////////////////////////	214	/////////////////////////////////////////////////////////////////////////////
		215
		216	rxvt_font::rxvt_font ()
		217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		218	{
		219	}
239		220
240	void	221	void
241	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name)
242	{	223	{
243	if (this->name == name)	224	if (this->name == name)
…		…
251	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
252	{	233	{
253	dTermDisplay;	234	dTermDisplay;
254	dTermGC;	235	dTermGC;
255		236
256	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
257	XClearArea (disp, d, x, y, w, h, FALSE);	238	XClearArea (disp, d, x, y, w, h, false);
258	else if (color >= 0)	239	else if (color >= 0)
259	{	240	{
260	#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)
261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
262	#else	258	#else
263	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
264	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
265	#endif	261	#endif
266	}	262	}
267	}	263	}
		264
		265	/////////////////////////////////////////////////////////////////////////////
268		266
269	#include "table/linedraw.h"	267	#include "table/linedraw.h"
270		268
271	struct rxvt_font_default : rxvt_font {	269	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	270	struct rxvt_fontset *fs;
…		…
287	p.slant = rxvt_fontprop::roman;	285	p.slant = rxvt_fontprop::roman;
288		286
289	return p;	287	return p;
290	}	288	}
291		289
292	bool load (const rxvt_fontprop &prop)	290	bool load (const rxvt_fontprop &prop, bool force_prop)
293	{	291	{
294	width = 1; height = 1;	292	width = 1; height = 1;
295	ascent = 1; descent = 0;	293	ascent = 1; descent = 0;
296		294
297	set_name (strdup ("built-in support font"));	295	set_name (strdup ("built-in support font"));
…		…
439	}	437	}
440	}	438	}
441	#if ENABLE_COMBINING	439	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	440	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	441	{
		442	min_it (width, 2); // we only support wcwidth up to 2
		443
444	text_t chrs[2];	444	text_t chrs[2];
445	width = min (2, width);
446	chrs [1] = NOCHAR;	445	chrs [1] = NOCHAR;
447		446
448	*chrs = cc->c1;	447	*chrs = cc->c1;
449	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	448	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
450	f1->draw (d, x, y, chrs, width, fg, bg);	449	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
457	*chrs = cc->c2;	456	*chrs = cc->c2;
458	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	457	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459	? f1	458	? f1
460	: (*fs)[fs->find_font (cc->c2)];	459	: (*fs)[fs->find_font (cc->c2)];
461		460
462	f2->draw (d, x, y, chrs, width, fg, -1);	461	f2->draw (d, x, y, chrs, width, fg, Color_none);
463	}	462	}
464	}	463	}
465	#endif	464	#endif
466	else	465	else
467	switch (t)	466	switch (t)
…		…
487		486
488	void clear ();	487	void clear ();
489		488
490	rxvt_fontprop properties ();	489	rxvt_fontprop properties ();
491		490
492	bool load (const rxvt_fontprop &prop);	491	bool load (const rxvt_fontprop &prop, bool force_prop);
493		492
494	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	493	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495		494
496	void draw (rxvt_drawable &d, int x, int y,	495	void draw (rxvt_drawable &d, int x, int y,
497	const text_t *text, int len,	496	const text_t *text, int len,
498	int fg, int bg);	497	int fg, int bg);
499		498
500	bool slow; // wether this is a proportional font or has other funny characteristics	499	bool slow; // wether this is a proportional font or has other funny characteristics
501	XFontStruct *f;	500	XFontStruct *f;
502	codeset cs;
503	bool enc2b, encm;	501	bool enc2b, encm;
504		502
505	char get_property (XFontStruct f, const char property, const char repl) const;	503	char get_property (XFontStruct f, Atom property, const char *repl) const;
506	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	504	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
507	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	505	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508	bool set_properties (rxvt_fontprop &p, const char *name);	506	bool set_properties (rxvt_fontprop &p, const char *name);
509	};	507	};
510		508
511	char *	509	char *
512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	510	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
513	{	511	{
514	unsigned long value;	512	unsigned long value;
515		513
516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	514	if (XGetFontProperty (f, property, &value))
517	return XGetAtomName (term->display->display, value);	515	return XGetAtomName (term->dpy, value);
518	else	516	else
519	return rxvt_strdup (repl);	517	return rxvt_strdup (repl);
520	}	518	}
521		519
522	rxvt_fontprop	520	rxvt_fontprop
…		…
528	}	526	}
529		527
530	bool	528	bool
531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	529	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
532	{	530	{
533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	531	p.width = width != rxvt_fontprop::unset ? width
		532	: avgwidth ? (avgwidth + 1) / 10
		533	: (height + 1) / 2;
534	p.height = height;	534	p.height = height;
535	p.ascent = rxvt_fontprop::unset;	535	p.ascent = rxvt_fontprop::unset;
536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	537	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538		538
…		…
543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544	{	544	{
545	unsigned long height;	545	unsigned long height;
546		546
547	#if 0	547	#if 0
548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	548	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549	return false;	549	return false;
550	#else	550	#else
551	height = f->ascent + f->descent;	551	height = f->ascent + f->descent;
552	#endif	552	#endif
553		553
554	unsigned long avgwidth;	554	unsigned long avgwidth;
555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	555	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556	avgwidth = 0;	556	avgwidth = 0;
557		557
558	char *weight = get_property (f, "WEIGHT_NAME", "medium");	558	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559	char *slant = get_property (f, "SLANT", "r");	559	char *slant = get_property (f, term->xa [XA_SLANT], "r");
560		560
561	set_properties (p, height, weight, slant, avgwidth);	561	set_properties (p, height, weight, slant, avgwidth);
562		562
563	free (weight);	563	free (weight);
564	free (slant);	564	free (slant);
…		…
641	return false;	641	return false;
642	}	642	}
643	}	643	}
644		644
645	bool	645	bool
646	rxvt_font_x11::load (const rxvt_fontprop &prop)	646	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647	{	647	{
648	dTermDisplay;	648	dTermDisplay;
649		649
650	clear ();	650	clear ();
651		651
652	char field_str[64]; // enough for 128 bits	652	char field_str[64]; // enough for 128 bits
653		653
654	// first morph the font if required	654	// first morph the font if required
655	if (prop.weight != rxvt_fontprop::unset	655	if (force_prop)
656	\|\| prop.slant != rxvt_fontprop::unset)
657	{	656	{
658	char fname[1024];	657	char fname[1024];
659		658
660	if (name[0] != '-')	659	if (name[0] != '-')
661	{	660	{
662	f = XLoadQueryFont (disp, name);	661	f = XLoadQueryFont (disp, name);
663		662
664	if (!f)	663	if (!f)
665	return false;	664	return false;
666		665
667	char *new_name = get_property (f, "FONT", name);	666	char *new_name = get_property (f, XA_FONT, name);
668		667
669	if (new_name)	668	if (new_name)
670	set_name (new_name);	669	set_name (new_name);
671	else	670	else
672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	671	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
781	delete [] fonts;	780	delete [] fonts;
782		781
783	if (!f)	782	if (!f)
784	return false;	783	return false;
785		784
786	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	785	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	786	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
788		787
789	if (registry && encoding)	788	if (registry && encoding)
790	{	789	{
791	char charset[64];	790	char charset[64];
792	snprintf (charset, 64, "%s-%s", registry, encoding);	791	snprintf (charset, 64, "%s-%s", registry, encoding);
793		792
794	cs = codeset_from_name (charset);	793	cs = codeset_from_name (charset);
795	}	794	}
796	else	795	else
797	{	796	{
798	const char *charset = get_property (f, "FONT", 0);	797	const char *charset = get_property (f, XA_FONT, 0);
799		798
800	if (!charset)	799	if (!charset)
801	charset = name;	800	charset = name;
802		801
803	int count = 13;	802	int count = 13;
…		…
818	enc2b = encm \|\| f->max_char_or_byte2 > 255;	817	enc2b = encm \|\| f->max_char_or_byte2 > 255;
819		818
820	slow = false;	819	slow = false;
821		820
822	#if 1 // only used for slow detection, TODO optimize	821	#if 1 // only used for slow detection, TODO optimize
823	if (f->min_bounds.width == f->max_bounds.width)	822	if (f->min_bounds.width == f->max_bounds.width \|\| !f->per_char)
824	width = f->min_bounds.width;
825	else if (f->per_char == NULL)
826	width = f->max_bounds.width;	823	width = f->max_bounds.width;
827	else	824	else
828	{	825	{
829	slow = true;	826	slow = true;
830		827
…		…
846		843
847	width = 1;	844	width = 1;
848		845
849	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	846	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850	{	847	{
851	if (cs != CS_UNICODE
852	&& *t > 0x100
853	&& FROM_UNICODE (cs, *t) == NOCHAR)	848	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	849	continue;
855		850
856	// ignore characters we wouldn't use anyways	851	// ignore characters we wouldn't use anyways
857	bool careful;	852	bool careful;
858	if (!has_char (*t, &prop, careful))	853	if (!has_char (*t, &prop, careful))
…		…
862		857
863	XCharStruct g;	858	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	859	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	860	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		861
		862	int wcw = WCWIDTH (*t);
867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	863	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868		864
869	if (width < g.width) width = g.width;	865	if (width < g.width) width = g.width;
870	}	866	}
871		867
872	if (cs == CS_UNKNOWN)	868	if (cs == CS_UNKNOWN)
873	{	869	{
874	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	870	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
891	void	887	void
892	rxvt_font_x11::clear ()	888	rxvt_font_x11::clear ()
893	{	889	{
894	if (f)	890	if (f)
895	{	891	{
896	XFreeFont (term->display->display, f);	892	XFreeFont (term->dpy, f);
897	f = 0;	893	f = 0;
898	}	894	}
899	}	895	}
900		896
901	bool	897	bool
…		…
944	return false;	940	return false;
945		941
946	if (!prop \|\| prop->width == rxvt_fontprop::unset)	942	if (!prop \|\| prop->width == rxvt_fontprop::unset)
947	return true;	943	return true;
948		944
949	// check character against base font bounding box	945	// check wether character overlaps previous/next character
950	int w = xcs->width;	946	int w = xcs->rbearing - xcs->lbearing;
951	int wcw = wcwidth (unicode);	947	int wcw = max (WCWIDTH (unicode), 1);
952	if (wcw > 0) w = (w + wcw - 1) / wcw;
953		948
954	careful = w > prop->width;	949	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955	if (careful && w > prop->width * MAX_OVERLAP >> 2)	950
		951	if (careful && !OVERLAP_OK (w, wcw, prop))
956	return false;	952	return false;
957		953
958	return true;	954	return true;
959	}	955	}
960		956
…		…
1056		1052
1057	void clear ();	1053	void clear ();
1058		1054
1059	rxvt_fontprop properties ();	1055	rxvt_fontprop properties ();
1060		1056
1061	bool load (const rxvt_fontprop &prop);	1057	bool load (const rxvt_fontprop &prop, bool force_prop);
1062		1058
1063	void draw (rxvt_drawable &d, int x, int y,	1059	void draw (rxvt_drawable &d, int x, int y,
1064	const text_t *text, int len,	1060	const text_t *text, int len,
1065	int fg, int bg);	1061	int fg, int bg);
1066		1062
…		…
1073	void	1069	void
1074	rxvt_font_xft::clear ()	1070	rxvt_font_xft::clear ()
1075	{	1071	{
1076	if (f)	1072	if (f)
1077	{	1073	{
1078	XftFontClose (term->display->display, f);	1074	XftFontClose (term->dpy, f);
1079	f = 0;	1075	f = 0;
1080	}	1076	}
1081	}	1077	}
1082		1078
1083	rxvt_fontprop	1079	rxvt_fontprop
…		…
1099		1095
1100	return p;	1096	return p;
1101	}	1097	}
1102		1098
1103	bool	1099	bool
1104	rxvt_font_xft::load (const rxvt_fontprop &prop)	1100	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105	{	1101	{
1106	dTermDisplay;	1102	dTermDisplay;
1107		1103
1108	clear ();	1104	clear ();
1109		1105
…		…
1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1114	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1115	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1116	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121		1117
1122	if (prop.weight != rxvt_fontprop::unset	1118	if (prop.weight != rxvt_fontprop::unset
1123	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1119	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1120	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125		1121
1126	if (prop.slant != rxvt_fontprop::unset	1122	if (prop.slant != rxvt_fontprop::unset
1127	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1123	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1124	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129		1125
1130	#if 0 // clipping unfortunately destroys our precious double-width-characters	1126	#if 0 // clipping unfortunately destroys our precious double-width-characters
1131	// clip width, we can't do better, or can we?	1127	// clip width, we can't do better, or can we?
1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1128	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1190	XGlyphInfo g;	1186	XGlyphInfo g;
1191	XftTextExtents16 (disp, f, &ch, 1, &g);	1187	XftTextExtents16 (disp, f, &ch, 1, &g);
1192		1188
1193	g.width -= g.x;	1189	g.width -= g.x;
1194		1190
1195	int wcw = wcwidth (ch);	1191	int wcw = WCWIDTH (ch);
1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1192	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197		1193
1198	if (width < g.width ) width = g.width;	1194	if (width < g.width ) width = g.width;
1199	if (height < g.height ) height = g.height;	1195	if (height < g.height ) height = g.height;
1200	if (glheight < g.height - g.y) glheight = g.height - g.y;	1196	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1250	bool	1246	bool
1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1247	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252	{	1248	{
1253	careful = false;	1249	careful = false;
1254		1250
1255	if (!XftCharExists (term->display->display, f, unicode))	1251	if (!XftCharExists (term->dpy, f, unicode))
1256	return false;	1252	return false;
1257		1253
1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1254	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1259	return true;	1255	return true;
1260		1256
1261	// check character against base font bounding box	1257	// check character against base font bounding box
1262	FcChar32 ch = unicode;	1258	FcChar32 ch = unicode;
1263	XGlyphInfo g;	1259	XGlyphInfo g;
1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1260	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265		1261
1266	int w = g.width - g.x;	1262	int w = g.width - g.x;
1267	int wcw = wcwidth (unicode);	1263	int wcw = max (WCWIDTH (unicode), 1);
1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1269		1264
1270	careful = w > prop->width;	1265	careful = g.x > 0 \|\| w > prop->width * wcw;
1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1266
		1267	if (careful && !OVERLAP_OK (w, wcw, prop))
		1268	return false;
		1269
		1270	// this weeds out _totally_ broken fonts, or glyphs
		1271	if (!OVERLAP_OK (g.xOff, wcw, prop))
1272	return false;	1272	return false;
1273		1273
1274	return true;	1274	return true;
1275	}	1275	}
1276		1276
1277	void	1277	void
1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279	const text_t *text, int len,	1279	const text_t *text, int len,
1280	int fg, int bg)	1280	int fg, int bg)
1281	{	1281	{
1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284	XGlyphInfo extents;	1282	XGlyphInfo extents;
1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));	1283	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1286	XftGlyphSpec *ep = enc;	1284	XftGlyphSpec *ep = enc;
1287		1285
1288	dTermDisplay;	1286	dTermDisplay;
1289	dTermGC;	1287	dTermGC;
1290		1288
		1289	int w = term->fwidth * len;
		1290	int h = term->fheight;
		1291
		1292	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1293	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1294	* good idea from the perspective of packaging for wide variety of user configs.
		1295	*/
		1296	bool buffered = true
		1297	#ifdef FORCE_UNBUFFERED_XFT
		1298	&& bg >= 0
		1299	#endif
		1300	;
1291	// cut trailing spaces	1301	// cut trailing spaces
1292	while (len && text [len - 1] == ' ')	1302	while (len && text [len - 1] == ' ')
1293	len--;	1303	len--;
		1304
		1305	int x_ = buffered ? 0 : x;
		1306	int y_ = buffered ? 0 : y;
1294		1307
1295	while (len)	1308	while (len)
1296	{	1309	{
1297	int cwidth = term->fwidth;	1310	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1311	FcChar32 fc = *text++; len--;
…		…
1304	{	1317	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1318	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1319	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1320
1308	ep->glyph = glyph;	1321	ep->glyph = glyph;
1309	ep->x = x + (cwidth - extents.xOff >> 1);	1322	ep->x = x_ + (cwidth - extents.xOff >> 1);
1310	ep->y = y + ascent;	1323	ep->y = y_ + ascent;
		1324
		1325	if (extents.xOff == 0)
		1326	ep->x = x_ + cwidth;
		1327
1311	ep++;	1328	ep++;
1312	}	1329	}
1313		1330
1314	x += cwidth;	1331	x_ += cwidth;
		1332	}
		1333
		1334	if (buffered)
1315	}	1335	{
1316		1336	bool back_rendered = false;
1317	if (ep != enc)	1337	if (ep != enc)
		1338	{
		1339	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1340
		1341	#ifdef HAVE_BG_PIXMAP
		1342	if (term->bgPixmap.pixmap)
		1343	{
		1344	Picture dst = 0;
		1345
		1346	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1347	dst = XftDrawPicture (d2);
		1348
		1349	if (bg < 0 \|\| dst != 0)
		1350	{
		1351	int src_x = x, src_y = y ;
		1352
		1353	if (term->bgPixmap.is_parentOrigin ())
		1354	{
		1355	src_x += term->window_vt_x;
		1356	src_y += term->window_vt_y;
		1357	}
		1358
		1359	if (term->bgPixmap.pmap_width >= src_x+w
		1360	&& term->bgPixmap.pmap_height >= src_y+h)
		1361	{
		1362	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1363	src_x, src_y, w, h, 0, 0);
		1364	}
		1365	else
		1366	{
		1367	XGCValues gcv;
		1368
		1369	gcv.fill_style = FillTiled;
		1370	gcv.tile = term->bgPixmap.pixmap;
		1371	gcv.ts_x_origin = -src_x;
		1372	gcv.ts_y_origin = -src_y;
		1373
		1374	XChangeGC (disp, gc,
		1375	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1376	&gcv);
		1377
		1378	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1379
		1380	gcv.fill_style = FillSolid;
		1381	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1382	}
		1383
		1384	if (bg >= 0)
		1385	{
		1386	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1387	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1388	}
		1389
		1390	back_rendered = true;
		1391	}
		1392	}
		1393	#endif
		1394
		1395	if (bg >= 0 && !back_rendered)
		1396	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1397
		1398	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1399	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1400	}
		1401	else
		1402	clear_rect (d, x, y, w, h, bg);
		1403	}
		1404	else
		1405	{
		1406	clear_rect (d, x, y, w, h, bg);
1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1407	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1408	}
1319	}	1409	}
		1410
1320	#endif	1411	#endif
1321		1412
1322	/////////////////////////////////////////////////////////////////////////////	1413	/////////////////////////////////////////////////////////////////////////////
1323		1414
1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1415	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1335	void	1426	void
1336	rxvt_fontset::clear ()	1427	rxvt_fontset::clear ()
1337	{	1428	{
1338	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1429	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339	= rxvt_fontprop::unset;	1430	= rxvt_fontprop::unset;
		1431	force_prop = false;
1340		1432
1341	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1433	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342	FONT_UNREF (*i);	1434	FONT_UNREF (*i);
1343		1435
1344	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1436	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1456	if (fonts[i]->loaded)	1548	if (fonts[i]->loaded)
1457	return true;	1549	return true;
1458		1550
1459	fonts[i]->loaded = true;	1551	fonts[i]->loaded = true;
1460		1552
1461	if (!fonts[i]->load (prop))	1553	if (!fonts[i]->load (prop, force_prop))
1462	{	1554	{
1463	fonts[i]->cs = CS_UNKNOWN;	1555	fonts[i]->cs = CS_UNKNOWN;
1464	return false;	1556	return false;
1465	}	1557	}
1466		1558
…		…
1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1659	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568	FcPatternAddBool (p, FC_MINSPACE, 1);	1660	FcPatternAddBool (p, FC_MINSPACE, 1);
1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1661	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570		1662
1571	XftResult result;	1663	XftResult result;
1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1664	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573		1665
1574	FcPatternDestroy (p);	1666	FcPatternDestroy (p);
1575		1667
1576	if (match)	1668	if (match)
1577	{	1669	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs. Revision 1.119 by sasha, Thu Sep 20 15:32:34 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.119 by sasha, Thu Sep 20 15:32:34 2007 UTC