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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 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	*
43	const char *name;	43	const char *name;
44	} fallback_fonts[] = {	44	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		48
49	#if ENCODING_EU	49	#if ENCODING_EU
50	// cyrillic	50	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		53
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		67
68	# if XFT	68	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	69	{ CS_KOI8_U, "xft::lang=ru" },
70		70
71	{ CS_ISO8859_5, "xft::lang=ru" },	71	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	72	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	73	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	74	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	75	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },	130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131	# endif	131	# endif
132	#endif	132	#endif
133		133
134	// generic font fallback
135	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	134	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
136	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	135	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
137	{ CS_UNICODE, "----r-------c--iso10646-1" },
138	{ CS_UNICODE, "----r-------m--iso10646-1" },
139	#if XFT	136	#if XFT
140	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	140	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144		141
145	// FreeMono is usually uglier than x fonts, so try last only.	142	// FreeMono is usually uglier than x fonts, so try after the others
146	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	143	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
147	#endif	144	#endif
148		145
		146	// generic font fallback, put this last, as many iso10646 fonts have extents
		147	// specified for all glyphs in the range they cover, but most are simply empty
		148	//{ CS_UNICODE, "----r-------c--iso10646-1" },
		149	//{ CS_UNICODE, "----r-------m--iso10646-1" },
149	{ CS_UNKNOWN, 0 }	150	{ CS_UNKNOWN, 0 }
150	};	151	};
151		152
152	// these characters are used to guess the font height and width	153	// these characters are used to guess the font height and width
153	// pango uses a similar algorithm and doesn't trust the font either.	154	// pango uses a similar algorithm and doesn't trust the font either.
…		…
157	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
158	};	159	};
159		160
160	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161		162
162	#define dTermDisplay Display *disp = term->xdisp	163	#define dTermDisplay Display *disp = term->dpy
163	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
164
165	/////////////////////////////////////////////////////////////////////////////
166
167	#if XFT
168	rxvt_drawable::~rxvt_drawable ()
169	{
170	if (xftdrawable)
171	XftDrawDestroy (xftdrawable);
172	}
173
174	rxvt_drawable::operator XftDraw *()
175	{
176	if (!xftdrawable)
177	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179	return xftdrawable;
180	}
181	#endif
182		165
183	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
184		167
185	static const char *	168	static const char *
186	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	169	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
…		…
248	void	231	void
249	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
250	{	233	{
251	dTermDisplay;	234	dTermDisplay;
252	dTermGC;	235	dTermGC;
253		236
254	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
255	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
256	else if (color >= 0)	239	else if (color >= 0)
257	{	240	{
258	#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)
259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
260	#else	258	#else
261	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
262	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
263	#endif	261	#endif
264	}	262	}
265	}	263	}
266		264
267	/////////////////////////////////////////////////////////////////////////////	265	/////////////////////////////////////////////////////////////////////////////
268
269	#include "table/linedraw.h"
270		266
271	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
273		269
274	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
287	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
288		284
289	return p;	285	return p;
290	}	286	}
291		287
292	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
293	{	289	{
294	width = 1; height = 1;	290	width = 1; height = 1;
295	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
296		292
297	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
…		…
310	return false;	306	return false;
311		307
312	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
313	return true;	309	return true;
314		310
		311	#ifdef BUILTIN_GLYPHS
315	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
316	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
317	return true;	314	return true;
		315	#endif
318		316
319	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
320	return true;	318	return true;
321		319
322	switch (unicode)	320	switch (unicode)
…		…
358	;	356	;
359		357
360	int width = text - tp;	358	int width = text - tp;
361	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
362		360
		361	#ifdef BUILTIN_GLYPHS
363	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
364	{	363	{
		364	# include "table/linedraw.h"
365	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
366	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
367	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
368		368
369	int W = fwidth;	369	int W = fwidth;
…		…
407		407
408	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
409	if (a)	409	if (a)
410	{	410	{
411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412		412
413	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
416	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
417		417
…		…
436	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
437	break;	437	break;
438	}	438	}
439	}	439	}
440	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
441	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	447	{
444	min_it (width, 2); // we only support wcwidth up to 2	448	min_it (width, 2); // we only support wcwidth up to 2
445		449
…		…
458	*chrs = cc->c2;	462	*chrs = cc->c2;
459	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
460	? f1	464	? f1
461	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
462		466
463	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
464	}	468	}
465	}	469	}
466	#endif	470	#endif
467	else	471	else
468	switch (t)	472	switch (t)
…		…
488		492
489	void clear ();	493	void clear ();
490		494
491	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
492		496
493	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
494		498
495	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	499	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496		500
497	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
498	const text_t *text, int len,	502	const text_t *text, int len,
499	int fg, int bg);	503	int fg, int bg);
500		504
501	bool slow; // wether this is a proportional font or has other funny characteristics	505	bool slow; // wether this is a proportional font or has other funny characteristics
502	XFontStruct *f;	506	XFontStruct *f;
503	codeset cs;
504	bool enc2b, encm;	507	bool enc2b, encm;
505		508
506	char get_property (XFontStruct f, Atom property, const char *repl) const;	509	char get_property (XFontStruct f, Atom property, const char *repl) const;
507	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	510	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
508	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
513	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	516	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
514	{	517	{
515	unsigned long value;	518	unsigned long value;
516		519
517	if (XGetFontProperty (f, property, &value))	520	if (XGetFontProperty (f, property, &value))
518	return XGetAtomName (term->xdisp, value);	521	return XGetAtomName (term->dpy, value);
519	else	522	else
520	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
521	}	524	}
522		525
523	rxvt_fontprop	526	rxvt_fontprop
524	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
525	{	528	{
…		…
546	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547	{	550	{
548	unsigned long height;	551	unsigned long height;
549		552
550	#if 0	553	#if 0
551	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552	return false;	555	return false;
553	#else	556	#else
554	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
555	#endif	558	#endif
556		559
…		…
644	return false;	647	return false;
645	}	648	}
646	}	649	}
647		650
648	bool	651	bool
649	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650	{	653	{
651	dTermDisplay;	654	dTermDisplay;
652		655
653	clear ();	656	clear ();
654		657
655	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
656		659
657	// first morph the font if required	660	// first morph the font if required
658	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
659	\|\| prop.slant != rxvt_fontprop::unset)
660	{	662	{
661	char fname[1024];	663	char fname[1024];
662		664
663	if (name[0] != '-')	665	if (name[0] != '-')
664	{	666	{
…		…
678	f = 0;	680	f = 0;
679	}	681	}
680		682
681	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
682	{	684	{
683	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
684	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
685	? "medium" : "bold");	687	? "medium" : "bold");
686	set_name (strdup (fname));	688	set_name (strdup (fname));
687	}	689	}
688		690
…		…
832	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	834	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
833		835
834	if (encm)	836	if (encm)
835	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837		839
838	while (N)	840	while (N)
839	{	841	{
840	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
841	width = f->per_char[N].width;	843	width = f->per_char[N].width;
842		844
…		…
861		863
862	XCharStruct g;	864	XCharStruct g;
863	int dir_ret, asc_ret, des_ret;	865	int dir_ret, asc_ret, des_ret;
864	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	866	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865		867
		868	int wcw = WCWIDTH (*t);
866	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	869	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867		870
868	if (width < g.width) width = g.width;	871	if (width < g.width) width = g.width;
869	}	872	}
870		873
871	if (cs == CS_UNKNOWN)	874	if (cs == CS_UNKNOWN)
…		…
890	void	893	void
891	rxvt_font_x11::clear ()	894	rxvt_font_x11::clear ()
892	{	895	{
893	if (f)	896	if (f)
894	{	897	{
895	XFreeFont (term->xdisp, f);	898	XFreeFont (term->dpy, f);
896	f = 0;	899	f = 0;
897	}	900	}
898	}	901	}
899		902
900	bool	903	bool
…		…
945	if (!prop \|\| prop->width == rxvt_fontprop::unset)	948	if (!prop \|\| prop->width == rxvt_fontprop::unset)
946	return true;	949	return true;
947		950
948	// check wether character overlaps previous/next character	951	// check wether character overlaps previous/next character
949	int w = xcs->rbearing - xcs->lbearing;	952	int w = xcs->rbearing - xcs->lbearing;
950	int wcw = WCWIDTH (unicode);	953	int wcw = max (WCWIDTH (unicode), 1);
951		954
952	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	955	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
953		956
954	if (careful && !OVERLAP_OK (w, wcw, prop))	957	if (careful && !OVERLAP_OK (w, wcw, prop))
955	return false;	958	return false;
…		…
993	else	996	else
994	{	997	{
995	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996		999
997	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
998		1001
999	if (slow)	1002	if (slow)
1000	{	1003	{
1001	do	1004	do
1002	{	1005	{
1003	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
…		…
1025	else	1028	else
1026	{	1029	{
1027	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028		1031
1029	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1030		1033
1031	if (slow)	1034	if (slow)
1032	{	1035	{
1033	do	1036	do
1034	{	1037	{
1035	if (*xc)	1038	if (*xc)
…		…
1055		1058
1056	void clear ();	1059	void clear ();
1057		1060
1058	rxvt_fontprop properties ();	1061	rxvt_fontprop properties ();
1059		1062
1060	bool load (const rxvt_fontprop &prop);	1063	bool load (const rxvt_fontprop &prop, bool force_prop);
1061		1064
1062	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1063	const text_t *text, int len,	1066	const text_t *text, int len,
1064	int fg, int bg);	1067	int fg, int bg);
1065		1068
1066	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1069	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1067		1070
1068	protected:	1071	protected:
1069	XftFont *f;	1072	XftFont *f;
1070	};	1073	};
1071		1074
1072	void	1075	void
1073	rxvt_font_xft::clear ()	1076	rxvt_font_xft::clear ()
1074	{	1077	{
1075	if (f)	1078	if (f)
1076	{	1079	{
1077	XftFontClose (term->xdisp, f);	1080	XftFontClose (term->dpy, f);
1078	f = 0;	1081	f = 0;
1079	}	1082	}
1080	}	1083	}
1081		1084
1082	rxvt_fontprop	1085	rxvt_fontprop
…		…
1098		1101
1099	return p;	1102	return p;
1100	}	1103	}
1101		1104
1102	bool	1105	bool
1103	rxvt_font_xft::load (const rxvt_fontprop &prop)	1106	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104	{	1107	{
1105	dTermDisplay;	1108	dTermDisplay;
1106		1109
1107	clear ();	1110	clear ();
1108		1111
…		…
1117	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1120	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1121	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1122	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120		1123
1121	if (prop.weight != rxvt_fontprop::unset	1124	if (prop.weight != rxvt_fontprop::unset
1122	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1125	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1126	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124		1127
1125	if (prop.slant != rxvt_fontprop::unset	1128	if (prop.slant != rxvt_fontprop::unset
1126	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1130	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128		1131
1129	#if 0 // clipping unfortunately destroys our precious double-width-characters	1132	#if 0 // clipping unfortunately destroys our precious double-width-characters
1130	// clip width, we can't do better, or can we?	1133	// clip width, we can't do better, or can we?
1131	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1134	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1249	bool	1252	bool
1250	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1253	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251	{	1254	{
1252	careful = false;	1255	careful = false;
1253		1256
1254	if (!XftCharExists (term->xdisp, f, unicode))	1257	if (!XftCharExists (term->dpy, f, unicode))
1255	return false;	1258	return false;
1256		1259
1257	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1260	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1258	return true;	1261	return true;
1259		1262
1260	// check character against base font bounding box	1263	// check character against base font bounding box
1261	FcChar32 ch = unicode;	1264	FcChar32 ch = unicode;
1262	XGlyphInfo g;	1265	XGlyphInfo g;
1263	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1266	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264		1267
1265	int w = g.width - g.x;	1268	int w = g.width - g.x;
1266	int wcw = WCWIDTH (unicode);	1269	int wcw = max (WCWIDTH (unicode), 1);
1267		1270
1268	careful = g.x > 0 \|\| w > prop->width * wcw;	1271	careful = g.x > 0 \|\| w > prop->width * wcw;
1269		1272
1270	if (careful && !OVERLAP_OK (w, wcw, prop))	1273	if (careful && !OVERLAP_OK (w, wcw, prop))
1271	return false;	1274	return false;
…		…
1280	void	1283	void
1281	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1284	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282	const text_t *text, int len,	1285	const text_t *text, int len,
1283	int fg, int bg)	1286	int fg, int bg)
1284	{	1287	{
1285	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287	XGlyphInfo extents;	1288	XGlyphInfo extents;
1288	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1289	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1289	XftGlyphSpec *ep = enc;	1290	XftGlyphSpec *ep = enc;
1290		1291
1291	dTermDisplay;	1292	dTermDisplay;
1292	dTermGC;	1293	dTermGC;
1293		1294
		1295	int w = term->fwidth * len;
		1296	int h = term->fheight;
		1297
		1298	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1299	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1300	* good idea from the perspective of packaging for wide variety of user configs.
		1301	*/
		1302	bool buffered = true
		1303	#ifdef FORCE_UNBUFFERED_XFT
		1304	&& bg >= 0
		1305	#endif
		1306	;
1294	// cut trailing spaces	1307	// cut trailing spaces
1295	while (len && text [len - 1] == ' ')	1308	while (len && text [len - 1] == ' ')
1296	len--;	1309	len--;
1297		1310
		1311	int x_ = buffered ? 0 : x;
		1312	int y_ = buffered ? 0 : y;
		1313
1298	while (len)	1314	while (len)
1299	{	1315	{
1300	int cwidth = term->fwidth;	1316	int cwidth = term->fwidth;
1301	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1302		1318
1303	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1304	text++, len--, cwidth += term->fwidth;	1320	text++, len--, cwidth += term->fwidth;
1305		1321
1306	if (fc != ' ') // skip spaces	1322	if (fc != ' ') // skip spaces
1307	{	1323	{
1308	FT_UInt glyph = XftCharIndex (disp, f, fc);	1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
1309	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310		1326
1311
1312	ep->glyph = glyph;	1327	ep->glyph = glyph;
1313	ep->x = x + (cwidth - extents.xOff >> 1);	1328	ep->x = x_ + (cwidth - extents.xOff >> 1);
1314	ep->y = y + ascent;	1329	ep->y = y_ + ascent;
1315		1330
1316	if (extents.xOff == 0)	1331	if (extents.xOff == 0)
1317	ep->x = x + cwidth;	1332	ep->x = x_ + cwidth;
1318		1333
1319	ep++;	1334	ep++;
1320	}	1335	}
1321		1336
1322	x += cwidth;	1337	x_ += cwidth;
		1338	}
		1339
		1340	if (buffered)
1323	}	1341	{
1324		1342	bool back_rendered = false;
1325	if (ep != enc)	1343	if (ep != enc)
		1344	{
		1345	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1346
		1347	#ifdef HAVE_BG_PIXMAP
		1348	if (term->bgPixmap.pixmap)
		1349	{
		1350	Picture dst = 0;
		1351
		1352	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1353	dst = XftDrawPicture (d2);
		1354
		1355	if (bg < 0 \|\| dst != 0)
		1356	{
		1357	int src_x = x, src_y = y ;
		1358
		1359	if (term->bgPixmap.is_parentOrigin ())
		1360	{
		1361	src_x += term->window_vt_x;
		1362	src_y += term->window_vt_y;
		1363	}
		1364
		1365	if (term->bgPixmap.pmap_width >= src_x+w
		1366	&& term->bgPixmap.pmap_height >= src_y+h)
		1367	{
		1368	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1369	src_x, src_y, w, h, 0, 0);
		1370	}
		1371	else
		1372	{
		1373	XGCValues gcv;
		1374
		1375	gcv.fill_style = FillTiled;
		1376	gcv.tile = term->bgPixmap.pixmap;
		1377	gcv.ts_x_origin = -src_x;
		1378	gcv.ts_y_origin = -src_y;
		1379
		1380	XChangeGC (disp, gc,
		1381	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1382	&gcv);
		1383
		1384	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1385
		1386	gcv.fill_style = FillSolid;
		1387	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1388	}
		1389
		1390	if (bg >= 0)
		1391	{
		1392	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1393	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1394	}
		1395
		1396	back_rendered = true;
		1397	}
		1398	}
		1399	#endif
		1400
		1401	if (bg >= 0 && !back_rendered)
		1402	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1403
		1404	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1405	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1406	}
		1407	else
		1408	clear_rect (d, x, y, w, h, bg);
		1409	}
		1410	else
		1411	{
		1412	clear_rect (d, x, y, w, h, bg);
1326	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1413	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1414	}
1327	}	1415	}
		1416
1328	#endif	1417	#endif
1329		1418
1330	/////////////////////////////////////////////////////////////////////////////	1419	/////////////////////////////////////////////////////////////////////////////
1331		1420
1332	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1421	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1343	void	1432	void
1344	rxvt_fontset::clear ()	1433	rxvt_fontset::clear ()
1345	{	1434	{
1346	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1435	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347	= rxvt_fontprop::unset;	1436	= rxvt_fontprop::unset;
		1437	force_prop = false;
1348		1438
1349	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1439	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350	FONT_UNREF (*i);	1440	FONT_UNREF (*i);
1351		1441
1352	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1442	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1361		1451
1362	rxvt_font *	1452	rxvt_font *
1363	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1364	{	1454	{
1365	rxvt_font *f;	1455	rxvt_font *f;
1366		1456
1367	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1368	{	1458	{
1369	name = "";	1459	name = "";
1370	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1371	}	1461	}
…		…
1464	if (fonts[i]->loaded)	1554	if (fonts[i]->loaded)
1465	return true;	1555	return true;
1466		1556
1467	fonts[i]->loaded = true;	1557	fonts[i]->loaded = true;
1468		1558
1469	if (!fonts[i]->load (prop))	1559	if (!fonts[i]->load (prop, force_prop))
1470	{	1560	{
1471	fonts[i]->cs = CS_UNKNOWN;	1561	fonts[i]->cs = CS_UNKNOWN;
1472	return false;	1562	return false;
1473	}	1563	}
1474		1564
…		…
1575	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1665	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576	FcPatternAddBool (p, FC_MINSPACE, 1);	1666	FcPatternAddBool (p, FC_MINSPACE, 1);
1577	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1667	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578		1668
1579	XftResult result;	1669	XftResult result;
1580	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1670	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581		1671
1582	FcPatternDestroy (p);	1672	FcPatternDestroy (p);
1583		1673
1584	if (match)	1674	if (match)
1585	{	1675	{
…		…
1590	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1591	{	1681	{
1592	char fontname[4096];	1682	char fontname[4096];
1593	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1594		1684
1595	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1596	}	1686	}
1597		1687
1598	free (font);	1688	free (font);
1599	}	1689	}
1600	#endif	1690	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs. Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.124 by ayin, Sat Nov 24 11:41:11 2007 UTC