[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.91 by root, Mon Jan 30 04:27:17 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	134	// generic font fallback
128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	135	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
…		…
150	0x304c, 0x672c, // が本	157	0x304c, 0x672c, // が本
151	};	158	};
152		159
153	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	160	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154		161
155	#define dTermDisplay Display *disp = term->display->display	162	#define dTermDisplay Display *disp = term->xdisp
156	#define dTermGC GC gc = term->gc	163	#define dTermGC GC gc = term->gc
157		164
158	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
159		166
160	#if XFT	167	#if XFT
…		…
165	}	172	}
166		173
167	rxvt_drawable::operator XftDraw *()	174	rxvt_drawable::operator XftDraw *()
168	{	175	{
169	if (!xftdrawable)	176	if (!xftdrawable)
170	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);	177	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
171		178
172	return xftdrawable;	179	return xftdrawable;
173	}	180	}
174	#endif	181	#endif
175		182
…		…
220		227
221	return res;	228	return res;
222	}	229	}
223		230
224	/////////////////////////////////////////////////////////////////////////////	231	/////////////////////////////////////////////////////////////////////////////
		232
		233	rxvt_font::rxvt_font ()
		234	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
		235	{
		236	}
225		237
226	void	238	void
227	rxvt_font::set_name (char *name)	239	rxvt_font::set_name (char *name)
228	{	240	{
229	if (this->name == name)	241	if (this->name == name)
…		…
238	{	250	{
239	dTermDisplay;	251	dTermDisplay;
240	dTermGC;	252	dTermGC;
241		253
242	if (color == Color_bg)	254	if (color == Color_bg)
243	XClearArea (disp, d, x, y, w, h, FALSE);	255	XClearArea (disp, d, x, y, w, h, false);
244	else if (color >= 0)	256	else if (color >= 0)
245	{	257	{
246	#if XFT	258	#if XFT
247	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
248	#else	260	#else
249	XSetForeground (disp, gc, term->pix_colors[color]);	261	XSetForeground (disp, gc, term->pix_colors[color]);
250	XFillRectangle (disp, d, gc, x, y, w, h);	262	XFillRectangle (disp, d, gc, x, y, w, h);
251	#endif	263	#endif
252	}	264	}
253	}	265	}
		266
		267	/////////////////////////////////////////////////////////////////////////////
254		268
255	#include "table/linedraw.h"	269	#include "table/linedraw.h"
256		270
257	struct rxvt_font_default : rxvt_font {	271	struct rxvt_font_default : rxvt_font {
258	struct rxvt_fontset *fs;	272	struct rxvt_fontset *fs;
…		…
425	}	439	}
426	}	440	}
427	#if ENABLE_COMBINING	441	#if ENABLE_COMBINING
428	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
429	{	443	{
		444	min_it (width, 2); // we only support wcwidth up to 2
		445
430	text_t chrs[2];	446	text_t chrs[2];
431	width = min (2, width);
432	chrs [1] = NOCHAR;	447	chrs [1] = NOCHAR;
433		448
434	*chrs = cc->c1;	449	*chrs = cc->c1;
435	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	450	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
436	f1->draw (d, x, y, chrs, width, fg, bg);	451	f1->draw (d, x, y, chrs, width, fg, bg);
…		…
486	bool slow; // wether this is a proportional font or has other funny characteristics	501	bool slow; // wether this is a proportional font or has other funny characteristics
487	XFontStruct *f;	502	XFontStruct *f;
488	codeset cs;	503	codeset cs;
489	bool enc2b, encm;	504	bool enc2b, encm;
490		505
491	char get_property (XFontStruct f, const char property, const char repl) const;	506	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);	507	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);	508	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
494	bool set_properties (rxvt_fontprop &p, const char *name);	509	bool set_properties (rxvt_fontprop &p, const char *name);
495	};	510	};
496		511
497	char *	512	char *
498	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	513	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
499	{	514	{
500	unsigned long value;	515	unsigned long value;
501		516
502	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))	517	if (XGetFontProperty (f, property, &value))
503	return XGetAtomName (term->display->display, value);	518	return XGetAtomName (term->xdisp, value);
504	else	519	else
505	return rxvt_strdup (repl);	520	return rxvt_strdup (repl);
506	}	521	}
507		522
508	rxvt_fontprop	523	rxvt_fontprop
…		…
514	}	529	}
515		530
516	bool	531	bool
517	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	532	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
518	{	533	{
519	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	534	p.width = width != rxvt_fontprop::unset ? width
		535	: avgwidth ? (avgwidth + 1) / 10
		536	: (height + 1) / 2;
520	p.height = height;	537	p.height = height;
521	p.ascent = rxvt_fontprop::unset;	538	p.ascent = rxvt_fontprop::unset;
522	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	539	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;	540	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
524		541
…		…
529	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	546	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
530	{	547	{
531	unsigned long height;	548	unsigned long height;
532		549
533	#if 0	550	#if 0
534	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))	551	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
535	return false;	552	return false;
536	#else	553	#else
537	height = f->ascent + f->descent;	554	height = f->ascent + f->descent;
538	#endif	555	#endif
539		556
540	unsigned long avgwidth;	557	unsigned long avgwidth;
541	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))	558	if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
542	avgwidth = 0;	559	avgwidth = 0;
543		560
544	char *weight = get_property (f, "WEIGHT_NAME", "medium");	561	char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
545	char *slant = get_property (f, "SLANT", "r");	562	char *slant = get_property (f, term->xa [XA_SLANT], "r");
546		563
547	set_properties (p, height, weight, slant, avgwidth);	564	set_properties (p, height, weight, slant, avgwidth);
548		565
549	free (weight);	566	free (weight);
550	free (slant);	567	free (slant);
…		…
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);
…		…
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
…		…
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
853	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	866	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
854		867
855	if (width < g.width) width = g.width;	868	if (width < g.width) width = g.width;
856	}	869	}
857		870
858	if (cs == CS_UNKNOWN)	871	if (cs == CS_UNKNOWN)
859	{	872	{
860	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	873	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
…		…
877	void	890	void
878	rxvt_font_x11::clear ()	891	rxvt_font_x11::clear ()
879	{	892	{
880	if (f)	893	if (f)
881	{	894	{
882	XFreeFont (term->display->display, f);	895	XFreeFont (term->xdisp, f);
883	f = 0;	896	f = 0;
884	}	897	}
885	}	898	}
886		899
887	bool	900	bool
…		…
930	return false;	943	return false;
931		944
932	if (!prop \|\| prop->width == rxvt_fontprop::unset)	945	if (!prop \|\| prop->width == rxvt_fontprop::unset)
933	return true;	946	return true;
934		947
935	// check character against base font bounding box	948	// check wether character overlaps previous/next character
936	int w = xcs->width;	949	int w = xcs->rbearing - xcs->lbearing;
937	int wcw = wcwidth (unicode);	950	int wcw = WCWIDTH (unicode);
938	if (wcw > 0) w = (w + wcw - 1) / wcw;
939		951
940	careful = w > prop->width;	952	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
941	if (careful && w > prop->width * MAX_OVERLAP >> 2)	953
		954	if (careful && !OVERLAP_OK (w, wcw, prop))
942	return false;	955	return false;
943		956
944	return true;	957	return true;
945	}	958	}
946		959
…		…
1059	void	1072	void
1060	rxvt_font_xft::clear ()	1073	rxvt_font_xft::clear ()
1061	{	1074	{
1062	if (f)	1075	if (f)
1063	{	1076	{
1064	XftFontClose (term->display->display, f);	1077	XftFontClose (term->xdisp, f);
1065	f = 0;	1078	f = 0;
1066	}	1079	}
1067	}	1080	}
1068		1081
1069	rxvt_fontprop	1082	rxvt_fontprop
…		…
1176	XGlyphInfo g;	1189	XGlyphInfo g;
1177	XftTextExtents16 (disp, f, &ch, 1, &g);	1190	XftTextExtents16 (disp, f, &ch, 1, &g);
1178		1191
1179	g.width -= g.x;	1192	g.width -= g.x;
1180		1193
1181	int wcw = wcwidth (ch);	1194	int wcw = WCWIDTH (ch);
1182	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	1195	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1183		1196
1184	if (width < g.width ) width = g.width;	1197	if (width < g.width ) width = g.width;
1185	if (height < g.height ) height = g.height;	1198	if (height < g.height ) height = g.height;
1186	if (glheight < g.height - g.y) glheight = g.height - g.y;	1199	if (glheight < g.height - g.y) glheight = g.height - g.y;
…		…
1236	bool	1249	bool
1237	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1250	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1238	{	1251	{
1239	careful = false;	1252	careful = false;
1240		1253
1241	if (!XftCharExists (term->display->display, f, unicode))	1254	if (!XftCharExists (term->xdisp, f, unicode))
1242	return false;	1255	return false;
1243		1256
1244	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1257	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1245	return true;	1258	return true;
1246		1259
1247	// check character against base font bounding box	1260	// check character against base font bounding box
1248	FcChar32 ch = unicode;	1261	FcChar32 ch = unicode;
1249	XGlyphInfo g;	1262	XGlyphInfo g;
1250	XftTextExtents32 (term->display->display, f, &ch, 1, &g);	1263	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1251		1264
1252	int w = g.width - g.x;	1265	int w = g.width - g.x;
1253	int wcw = wcwidth (unicode);	1266	int wcw = WCWIDTH (unicode);
1254	if (wcw > 0) w = (w + wcw - 1) / wcw;
1255		1267
1256	careful = w > prop->width;	1268	careful = g.x > 0 \|\| w > prop->width * wcw;
1257	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1269
		1270	if (careful && !OVERLAP_OK (w, wcw, prop))
		1271	return false;
		1272
		1273	// this weeds out _totally_ broken fonts, or glyphs
		1274	if (!OVERLAP_OK (g.xOff, wcw, prop))
1258	return false;	1275	return false;
1259		1276
1260	return true;	1277	return true;
1261	}	1278	}
1262		1279
…		…
1289	if (fc != ' ') // skip spaces	1306	if (fc != ' ') // skip spaces
1290	{	1307	{
1291	FT_UInt glyph = XftCharIndex (disp, f, fc);	1308	FT_UInt glyph = XftCharIndex (disp, f, fc);
1292	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1309	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1293		1310
		1311
1294	ep->glyph = glyph;	1312	ep->glyph = glyph;
1295	ep->x = x + (cwidth - extents.xOff >> 1);	1313	ep->x = x + (cwidth - extents.xOff >> 1);
1296	ep->y = y + ascent;	1314	ep->y = y + ascent;
		1315
		1316	if (extents.xOff == 0)
		1317	ep->x = x + cwidth;
		1318
1297	ep++;	1319	ep++;
1298	}	1320	}
1299		1321
1300	x += cwidth;	1322	x += cwidth;
1301	}	1323	}
…		…
1553	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1575	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1554	FcPatternAddBool (p, FC_MINSPACE, 1);	1576	FcPatternAddBool (p, FC_MINSPACE, 1);
1555	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1577	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1556		1578
1557	XftResult result;	1579	XftResult result;
1558	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);	1580	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1559		1581
1560	FcPatternDestroy (p);	1582	FcPatternDestroy (p);
1561		1583
1562	if (match)	1584	if (match)
1563	{	1585	{

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.91 by root, Mon Jan 30 04:27:17 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.91 by root, Mon Jan 30 04:27:17 2006 UTC