[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.97 by root, Sun Feb 19 16:34:36 2006 UTC

…		…
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
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;
…		…
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 < 0 \|\| color == Color_bg)
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
245	{	240	{
246	#if XFT	241	#if XFT
247	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
248	#else	243	#else
249	XSetForeground (disp, gc, term->pix_colors[color]);	244	XSetForeground (disp, gc, term->pix_colors[color]);
250	XFillRectangle (disp, d, gc, x, y, w, h);	245	XFillRectangle (disp, d, gc, x, y, w, h);
251	#endif	246	#endif
252	}	247	}
253	}	248	}
		249
		250	/////////////////////////////////////////////////////////////////////////////
254		251
255	#include "table/linedraw.h"	252	#include "table/linedraw.h"
256		253
257	struct rxvt_font_default : rxvt_font {	254	struct rxvt_font_default : rxvt_font {
258	struct rxvt_fontset *fs;	255	struct rxvt_fontset *fs;
…		…
425	}	422	}
426	}	423	}
427	#if ENABLE_COMBINING	424	#if ENABLE_COMBINING
428	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429	{	426	{
		427	min_it (width, 2); // we only support wcwidth up to 2
		428
430	text_t chrs[2];	429	text_t chrs[2];
431	width = min (2, width);
432	chrs [1] = NOCHAR;	430	chrs [1] = NOCHAR;
433		431
434	*chrs = cc->c1;	432	*chrs = cc->c1;
435	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
436	f1->draw (d, x, y, chrs, width, fg, bg);	434	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
486	bool slow; // wether this is a proportional font or has other funny characteristics	484	bool slow; // wether this is a proportional font or has other funny characteristics
487	XFontStruct *f;	485	XFontStruct *f;
488	codeset cs;	486	codeset cs;
489	bool enc2b, encm;	487	bool enc2b, encm;
490		488
491	char get_property (XFontStruct f, const char property, const char repl) const;	489	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);	490	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);	491	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494	bool set_properties (rxvt_fontprop &p, const char *name);	492	bool set_properties (rxvt_fontprop &p, const char *name);
495	};	493	};
496		494
497	char *	495	char *
498	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	496	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
499	{	497	{
500	unsigned long value;	498	unsigned long value;
501		499
502	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	500	if (XGetFontProperty (f, property, &value))
503	return XGetAtomName (term->display->display, value);	501	return XGetAtomName (term->dpy, value);
504	else	502	else
505	return rxvt_strdup (repl);	503	return rxvt_strdup (repl);
506	}	504	}
507		505
508	rxvt_fontprop	506	rxvt_fontprop
…		…
514	}	512	}
515		513
516	bool	514	bool
517	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	515	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
518	{	516	{
519	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	517	p.width = width != rxvt_fontprop::unset ? width
		518	: avgwidth ? (avgwidth + 1) / 10
		519	: (height + 1) / 2;
520	p.height = height;	520	p.height = height;
521	p.ascent = rxvt_fontprop::unset;	521	p.ascent = rxvt_fontprop::unset;
522	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	522	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;	523	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524		524
…		…
529	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	529	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530	{	530	{
531	unsigned long height;	531	unsigned long height;
532		532
533	#if 0	533	#if 0
534	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	534	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
535	return false;	535	return false;
536	#else	536	#else
537	height = f->ascent + f->descent;	537	height = f->ascent + f->descent;
538	#endif	538	#endif
539		539
540	unsigned long avgwidth;	540	unsigned long avgwidth;
541	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	541	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542	avgwidth = 0;	542	avgwidth = 0;
543		543
544	char *weight = get_property (f, "WEIGHT_NAME", "medium");	544	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545	char *slant = get_property (f, "SLANT", "r");	545	char *slant = get_property (f, term->xa [XA_SLANT], "r");
546		546
547	set_properties (p, height, weight, slant, avgwidth);	547	set_properties (p, height, weight, slant, avgwidth);
548		548
549	free (weight);	549	free (weight);
550	free (slant);	550	free (slant);
…		…
648	f = XLoadQueryFont (disp, name);	648	f = XLoadQueryFont (disp, name);
649		649
650	if (!f)	650	if (!f)
651	return false;	651	return false;
652		652
653	char *new_name = get_property (f, "FONT", name);	653	char *new_name = get_property (f, XA_FONT, name);
654		654
655	if (new_name)	655	if (new_name)
656	set_name (new_name);	656	set_name (new_name);
657	else	657	else
658	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	658	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
…		…
767	delete [] fonts;	767	delete [] fonts;
768		768
769	if (!f)	769	if (!f)
770	return false;	770	return false;
771		771
772	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	772	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773	char *encoding = get_property (f, "CHARSET_ENCODING", 0);	773	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774		774
775	if (registry && encoding)	775	if (registry && encoding)
776	{	776	{
777	char charset[64];	777	char charset[64];
778	snprintf (charset, 64, "%s-%s", registry, encoding);	778	snprintf (charset, 64, "%s-%s", registry, encoding);
779		779
780	cs = codeset_from_name (charset);	780	cs = codeset_from_name (charset);
781	}	781	}
782	else	782	else
783	{	783	{
784	const char *charset = get_property (f, "FONT", 0);	784	const char *charset = get_property (f, XA_FONT, 0);
785		785
786	if (!charset)	786	if (!charset)
787	charset = name;	787	charset = name;
788		788
789	int count = 13;	789	int count = 13;
…		…
804	enc2b = encm \|\| f->max_char_or_byte2 > 255;	804	enc2b = encm \|\| f->max_char_or_byte2 > 255;
805		805
806	slow = false;	806	slow = false;
807		807
808	#if 1 // only used for slow detection, TODO optimize	808	#if 1 // only used for slow detection, TODO optimize
809	if (f->min_bounds.width == f->max_bounds.width)	809	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;	810	width = f->max_bounds.width;
813	else	811	else
814	{	812	{
815	slow = true;	813	slow = true;
816		814
…		…
832		830
833	width = 1;	831	width = 1;
834		832
835	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	833	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
836	{	834	{
837	if (cs != CS_UNICODE
838	&& *t > 0x100
839	&& FROM_UNICODE (cs, *t) == NOCHAR)	835	if (FROM_UNICODE (cs, *t) == NOCHAR)
840	continue;	836	continue;
841		837
842	// ignore characters we wouldn't use anyways	838	// ignore characters we wouldn't use anyways
843	bool careful;	839	bool careful;
844	if (!has_char (*t, &prop, careful))	840	if (!has_char (*t, &prop, careful))
…		…
848		844
849	XCharStruct g;	845	XCharStruct g;
850	int dir_ret, asc_ret, des_ret;	846	int dir_ret, asc_ret, des_ret;
851	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	847	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
852		848
		849	int wcw = WCWIDTH (*t);
853	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854		851
855	if (width < g.width) width = g.width;	852	if (width < g.width) width = g.width;
856	}	853	}
857		854
858	if (cs == CS_UNKNOWN)	855	if (cs == CS_UNKNOWN)
859	{	856	{
860	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
877	void	874	void
878	rxvt_font_x11::clear ()	875	rxvt_font_x11::clear ()
879	{	876	{
880	if (f)	877	if (f)
881	{	878	{
882	XFreeFont (term->display->display, f);	879	XFreeFont (term->dpy, f);
883	f = 0;	880	f = 0;
884	}	881	}
885	}	882	}
886		883
887	bool	884	bool
…		…
930	return false;	927	return false;
931		928
932	if (!prop \|\| prop->width == rxvt_fontprop::unset)	929	if (!prop \|\| prop->width == rxvt_fontprop::unset)
933	return true;	930	return true;
934		931
935	// check character against base font bounding box	932	// check wether character overlaps previous/next character
936	int w = xcs->width;	933	int w = xcs->rbearing - xcs->lbearing;
937	int wcw = wcwidth (unicode);	934	int wcw = max (WCWIDTH (unicode), 1);
938	if (wcw > 0) w = (w + wcw - 1) / wcw;
939		935
940	careful = w > prop->width;	936	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
941	if (careful && w > prop->width * MAX_OVERLAP >> 2)	937
		938	if (careful && !OVERLAP_OK (w, wcw, prop))
942	return false;	939	return false;
943		940
944	return true;	941	return true;
945	}	942	}
946		943
…		…
1059	void	1056	void
1060	rxvt_font_xft::clear ()	1057	rxvt_font_xft::clear ()
1061	{	1058	{
1062	if (f)	1059	if (f)
1063	{	1060	{
1064	XftFontClose (term->display->display, f);	1061	XftFontClose (term->dpy, f);
1065	f = 0;	1062	f = 0;
1066	}	1063	}
1067	}	1064	}
1068		1065
1069	rxvt_fontprop	1066	rxvt_fontprop
…		…
1176	XGlyphInfo g;	1173	XGlyphInfo g;
1177	XftTextExtents16 (disp, f, &ch, 1, &g);	1174	XftTextExtents16 (disp, f, &ch, 1, &g);
1178		1175
1179	g.width -= g.x;	1176	g.width -= g.x;
1180		1177
1181	int wcw = wcwidth (ch);	1178	int wcw = WCWIDTH (ch);
1182	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1179	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183		1180
1184	if (width < g.width ) width = g.width;	1181	if (width < g.width ) width = g.width;
1185	if (height < g.height ) height = g.height;	1182	if (height < g.height ) height = g.height;
1186	if (glheight < g.height - g.y) glheight = g.height - g.y;	1183	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1236	bool	1233	bool
1237	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1234	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238	{	1235	{
1239	careful = false;	1236	careful = false;
1240		1237
1241	if (!XftCharExists (term->display->display, f, unicode))	1238	if (!XftCharExists (term->dpy, f, unicode))
1242	return false;	1239	return false;
1243		1240
1244	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1241	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1245	return true;	1242	return true;
1246		1243
1247	// check character against base font bounding box	1244	// check character against base font bounding box
1248	FcChar32 ch = unicode;	1245	FcChar32 ch = unicode;
1249	XGlyphInfo g;	1246	XGlyphInfo g;
1250	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1247	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1251		1248
1252	int w = g.width - g.x;	1249	int w = g.width - g.x;
1253	int wcw = wcwidth (unicode);	1250	int wcw = max (WCWIDTH (unicode), 1);
1254	if (wcw > 0) w = (w + wcw - 1) / wcw;
1255		1251
1256	careful = w > prop->width;	1252	careful = g.x > 0 \|\| w > prop->width * wcw;
1257	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1253
		1254	if (careful && !OVERLAP_OK (w, wcw, prop))
		1255	return false;
		1256
		1257	// this weeds out _totally_ broken fonts, or glyphs
		1258	if (!OVERLAP_OK (g.xOff, wcw, prop))
1258	return false;	1259	return false;
1259		1260
1260	return true;	1261	return true;
1261	}	1262	}
1262		1263
1263	void	1264	void
1264	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265	const text_t *text, int len,	1266	const text_t *text, int len,
1266	int fg, int bg)	1267	int fg, int bg)
1267	{	1268	{
1268	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1269
1270	XGlyphInfo extents;	1269	XGlyphInfo extents;
1271	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1272	XftGlyphSpec *ep = enc;	1271	XftGlyphSpec *ep = enc;
1273		1272
1274	dTermDisplay;	1273	dTermDisplay;
1275	dTermGC;	1274	dTermGC;
1276		1275
		1276	int w = term->fwidth * len;
		1277	int h = term->fheight;
		1278
		1279	bool buffered = 0
		1280	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
		1281	\|\| !term->am_transparent // we aren't transparent
		1282	\|\| term->am_pixmap_trans // we have a pixmap
		1283	#endif
		1284	\|\| bg >= 0; // we don't use a transparent bg
		1285
1277	// cut trailing spaces	1286	// cut trailing spaces
1278	while (len && text [len - 1] == ' ')	1287	while (len && text [len - 1] == ' ')
1279	len--;	1288	len--;
		1289
		1290	int x_ = buffered ? 0 : x;
		1291	int y_ = buffered ? 0 : y;
1280		1292
1281	while (len)	1293	while (len)
1282	{	1294	{
1283	int cwidth = term->fwidth;	1295	int cwidth = term->fwidth;
1284	FcChar32 fc = *text++; len--;	1296	FcChar32 fc = *text++; len--;
…		…
1290	{	1302	{
1291	FT_UInt glyph = XftCharIndex (disp, f, fc);	1303	FT_UInt glyph = XftCharIndex (disp, f, fc);
1292	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1304	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293		1305
1294	ep->glyph = glyph;	1306	ep->glyph = glyph;
1295	ep->x = x + (cwidth - extents.xOff >> 1);	1307	ep->x = x_ + (cwidth - extents.xOff >> 1);
1296	ep->y = y + ascent;	1308	ep->y = y_ + ascent;
		1309
		1310	if (extents.xOff == 0)
		1311	ep->x = x_ + cwidth;
		1312
1297	ep++;	1313	ep++;
1298	}	1314	}
1299		1315
1300	x += cwidth;	1316	x_ += cwidth;
		1317	}
		1318
		1319	if (buffered)
1301	}	1320	{
1302
1303	if (ep != enc)	1321	if (ep != enc)
		1322	{
		1323	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1324
		1325	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
		1326	if (bg < 0 && term->am_pixmap_trans)
		1327	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
		1328	else if (bg < 0 && term->bgPixmap.pixmap)
		1329	{
		1330	XGCValues gcv;
		1331
		1332	gcv.fill_style = FillTiled;
		1333	gcv.tile = term->pixmap;
		1334	gcv.ts_x_origin = -x;
		1335	gcv.ts_y_origin = -y;
		1336
		1337	GC gc2 = XCreateGC (disp, d2,
		1338	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1339	&gcv);
		1340
		1341	XFillRectangle (disp, d2, gc2, 0, 0, w, h);
		1342
		1343	XFreeGC (disp, gc2);
		1344	}
		1345	else
		1346	#endif
		1347	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1348
		1349	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1350	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1351	}
		1352	else
		1353	clear_rect (d, x, y, w, h, bg);
		1354	}
		1355	else
		1356	{
		1357	clear_rect (d, x, y, w, h, bg);
1304	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1358	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1359	}
1305	}	1360	}
		1361
1306	#endif	1362	#endif
1307		1363
1308	/////////////////////////////////////////////////////////////////////////////	1364	/////////////////////////////////////////////////////////////////////////////
1309		1365
1310	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1366	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1553	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1609	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554	FcPatternAddBool (p, FC_MINSPACE, 1);	1610	FcPatternAddBool (p, FC_MINSPACE, 1);
1555	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1611	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556		1612
1557	XftResult result;	1613	XftResult result;
1558	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1614	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1559		1615
1560	FcPatternDestroy (p);	1616	FcPatternDestroy (p);
1561		1617
1562	if (match)	1618	if (match)
1563	{	1619	{

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.97 by root, Sun Feb 19 16:34:36 2006 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.97 by root, Sun Feb 19 16:34:36 2006 UTC