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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.93 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
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" },
…		…
158	0x304c, 0x672c, // が本	158	0x304c, 0x672c, // が本
159	};	159	};
160		160
161	#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]))
162		162
163	#define dTermDisplay Display *disp = term->xdisp	163	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
165
166	/////////////////////////////////////////////////////////////////////////////
167
168	#if XFT
169	rxvt_drawable::~rxvt_drawable ()
170	{
171	if (xftdrawable)
172	XftDrawDestroy (xftdrawable);
173	}
174
175	rxvt_drawable::operator XftDraw *()
176	{
177	if (!xftdrawable)
178	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
179
180	return xftdrawable;
181	}
182	#endif
183		165
184	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
185		167
186	static const char *	168	static const char *
187	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)
…		…
249	void	231	void
250	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
251	{	233	{
252	dTermDisplay;	234	dTermDisplay;
253	dTermGC;	235	dTermGC;
254		236
255	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
256	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
257	else if (color >= 0)	239	else if (color >= 0)
258	{	240	{
259	#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)
260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
261	#else	258	#else
262	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
263	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
264	#endif	261	#endif
265	}	262	}
266	}	263	}
267		264
268	/////////////////////////////////////////////////////////////////////////////	265	/////////////////////////////////////////////////////////////////////////////
269
270	#include "table/linedraw.h"
271		266
272	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
273	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
274		269
275	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
288	p.slant = rxvt_fontprop::roman;	283	p.slant = rxvt_fontprop::roman;
289		284
290	return p;	285	return p;
291	}	286	}
292		287
293	bool load (const rxvt_fontprop &prop)	288	bool load (const rxvt_fontprop &prop, bool force_prop)
294	{	289	{
295	width = 1; height = 1;	290	width = 1; height = 1;
296	ascent = 1; descent = 0;	291	ascent = 1; descent = 0;
297		292
298	set_name (strdup ("built-in support font"));	293	set_name (strdup ("built-in support font"));
…		…
359	;	354	;
360		355
361	int width = text - tp;	356	int width = text - tp;
362	int fwidth = term->fwidth * width;	357	int fwidth = term->fwidth * width;
363		358
		359	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	360	if (0x2500 <= t && t <= 0x259f)
365	{	361	{
		362	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	363	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	364	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	365	uint32_t *b = a + (offs & 15);
369		366
370	int W = fwidth;	367	int W = fwidth;
…		…
408		405
409	case 1: // rectangle, possibly stippled	406	case 1: // rectangle, possibly stippled
410	if (a)	407	if (a)
411	{	408	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	409	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		410
414	gcv.fill_style = FillStippled;	411	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	412	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	413	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	414	gcv.ts_y_origin = y;
418		415
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	434	(a - 1) * 9064, (b - 1) 90*64);
438	break;	435	break;
439	}	436	}
440	}	437	}
441	}	438	}
		439	#else
		440	if (0)
		441	;
		442	#endif
442	#if ENABLE_COMBINING	443	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	444	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	445	{
445	min_it (width, 2); // we only support wcwidth up to 2	446	min_it (width, 2); // we only support wcwidth up to 2
446		447
…		…
459	*chrs = cc->c2;	460	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	461	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	462	? f1
462	: (*fs)[fs->find_font (cc->c2)];	463	: (*fs)[fs->find_font (cc->c2)];
463		464
464	f2->draw (d, x, y, chrs, width, fg, -1);	465	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	466	}
466	}	467	}
467	#endif	468	#endif
468	else	469	else
469	switch (t)	470	switch (t)
…		…
489		490
490	void clear ();	491	void clear ();
491		492
492	rxvt_fontprop properties ();	493	rxvt_fontprop properties ();
493		494
494	bool load (const rxvt_fontprop &prop);	495	bool load (const rxvt_fontprop &prop, bool force_prop);
495		496
496	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	497	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497		498
498	void draw (rxvt_drawable &d, int x, int y,	499	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	500	const text_t *text, int len,
500	int fg, int bg);	501	int fg, int bg);
501		502
502	bool slow; // wether this is a proportional font or has other funny characteristics	503	bool slow; // wether this is a proportional font or has other funny characteristics
503	XFontStruct *f;	504	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	505	bool enc2b, encm;
506		506
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	507	char get_property (XFontStruct f, Atom property, const char *repl) const;
508	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	508	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
515	{	515	{
516	unsigned long value;	516	unsigned long value;
517		517
518	if (XGetFontProperty (f, property, &value))	518	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->xdisp, value);	519	return XGetAtomName (term->dpy, value);
520	else	520	else
521	return rxvt_strdup (repl);	521	return repl ? strdup (repl) : 0;
522	}	522	}
523		523
524	rxvt_fontprop	524	rxvt_fontprop
525	rxvt_font_x11::properties ()	525	rxvt_font_x11::properties ()
526	{	526	{
…		…
547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
548	{	548	{
549	unsigned long height;	549	unsigned long height;
550		550
551	#if 0	551	#if 0
552	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	552	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
553	return false;	553	return false;
554	#else	554	#else
555	height = f->ascent + f->descent;	555	height = f->ascent + f->descent;
556	#endif	556	#endif
557		557
…		…
645	return false;	645	return false;
646	}	646	}
647	}	647	}
648		648
649	bool	649	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	650	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	651	{
652	dTermDisplay;	652	dTermDisplay;
653		653
654	clear ();	654	clear ();
655		655
656	char field_str[64]; // enough for 128 bits	656	char field_str[64]; // enough for 128 bits
657		657
658	// first morph the font if required	658	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	659	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	660	{
662	char fname[1024];	661	char fname[1024];
663		662
664	if (name[0] != '-')	663	if (name[0] != '-')
665	{	664	{
…		…
679	f = 0;	678	f = 0;
680	}	679	}
681		680
682	if (prop.weight != rxvt_fontprop::unset)	681	if (prop.weight != rxvt_fontprop::unset)
683	{	682	{
684	replace_field (fname, name, 2, 0,	683	replace_field (fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	684	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	685	? "medium" : "bold");
687	set_name (strdup (fname));	686	set_name (strdup (fname));
688	}	687	}
689		688
…		…
833	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	832	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
834		833
835	if (encm)	834	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	835	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		837
839	while (N)	838	while (N)
840	{	839	{
841	if (f->per_char[N].width > width)	840	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	841	width = f->per_char[N].width;
843		842
…		…
892	void	891	void
893	rxvt_font_x11::clear ()	892	rxvt_font_x11::clear ()
894	{	893	{
895	if (f)	894	if (f)
896	{	895	{
897	XFreeFont (term->xdisp, f);	896	XFreeFont (term->dpy, f);
898	f = 0;	897	f = 0;
899	}	898	}
900	}	899	}
901		900
902	bool	901	bool
…		…
995	else	994	else
996	{	995	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		997
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		999
1001	if (slow)	1000	if (slow)
1002	{	1001	{
1003	do	1002	do
1004	{	1003	{
1005	if (xc->byte1 \|\| xc->byte2)	1004	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1026	else
1028	{	1027	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1029
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1031
1033	if (slow)	1032	if (slow)
1034	{	1033	{
1035	do	1034	do
1036	{	1035	{
1037	if (*xc)	1036	if (*xc)
…		…
1057		1056
1058	void clear ();	1057	void clear ();
1059		1058
1060	rxvt_fontprop properties ();	1059	rxvt_fontprop properties ();
1061		1060
1062	bool load (const rxvt_fontprop &prop);	1061	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1062
1064	void draw (rxvt_drawable &d, int x, int y,	1063	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1064	const text_t *text, int len,
1066	int fg, int bg);	1065	int fg, int bg);
1067		1066
1068	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1067	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069		1068
1070	protected:	1069	protected:
1071	XftFont *f;	1070	XftFont *f;
1072	};	1071	};
1073		1072
1074	void	1073	void
1075	rxvt_font_xft::clear ()	1074	rxvt_font_xft::clear ()
1076	{	1075	{
1077	if (f)	1076	if (f)
1078	{	1077	{
1079	XftFontClose (term->xdisp, f);	1078	XftFontClose (term->dpy, f);
1080	f = 0;	1079	f = 0;
1081	}	1080	}
1082	}	1081	}
1083		1082
1084	rxvt_fontprop	1083	rxvt_fontprop
…		…
1100		1099
1101	return p;	1100	return p;
1102	}	1101	}
1103		1102
1104	bool	1103	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1104	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1105	{
1107	dTermDisplay;	1106	dTermDisplay;
1108		1107
1109	clear ();	1108	clear ();
1110		1109
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1121
1123	if (prop.weight != rxvt_fontprop::unset	1122	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1123	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1124	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1125
1127	if (prop.slant != rxvt_fontprop::unset	1126	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1127	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1128	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1129
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1130	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1131	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1132	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1251	bool	1250	bool
1252	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1253	{	1252	{
1254	careful = false;	1253	careful = false;
1255		1254
1256	if (!XftCharExists (term->xdisp, f, unicode))	1255	if (!XftCharExists (term->dpy, f, unicode))
1257	return false;	1256	return false;
1258		1257
1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1260	return true;	1259	return true;
1261		1260
1262	// check character against base font bounding box	1261	// check character against base font bounding box
1263	FcChar32 ch = unicode;	1262	FcChar32 ch = unicode;
1264	XGlyphInfo g;	1263	XGlyphInfo g;
1265	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1264	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1266		1265
1267	int w = g.width - g.x;	1266	int w = g.width - g.x;
1268	int wcw = max (WCWIDTH (unicode), 1);	1267	int wcw = max (WCWIDTH (unicode), 1);
1269		1268
1270	careful = g.x > 0 \|\| w > prop->width * wcw;	1269	careful = g.x > 0 \|\| w > prop->width * wcw;
…		…
1282	void	1281	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1282	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1283	const text_t *text, int len,
1285	int fg, int bg)	1284	int fg, int bg)
1286	{	1285	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289	XGlyphInfo extents;	1286	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1287	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1291	XftGlyphSpec *ep = enc;	1288	XftGlyphSpec *ep = enc;
1292		1289
1293	dTermDisplay;	1290	dTermDisplay;
1294	dTermGC;	1291	dTermGC;
1295		1292
		1293	int w = term->fwidth * len;
		1294	int h = term->fheight;
		1295
		1296	/* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
		1297	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
		1298	* good idea from the perspective of packaging for wide variety of user configs.
		1299	*/
		1300	bool buffered = true
		1301	#ifdef FORCE_UNBUFFERED_XFT
		1302	&& bg >= 0
		1303	#endif
		1304	;
1296	// cut trailing spaces	1305	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1306	while (len && text [len - 1] == ' ')
1298	len--;	1307	len--;
1299		1308
		1309	int x_ = buffered ? 0 : x;
		1310	int y_ = buffered ? 0 : y;
		1311
1300	while (len)	1312	while (len)
1301	{	1313	{
1302	int cwidth = term->fwidth;	1314	int cwidth = term->fwidth;
1303	FcChar32 fc = *text++; len--;	1315	FcChar32 fc = *text++; len--;
1304		1316
1305	while (len && *text == NOCHAR)	1317	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1318	text++, len--, cwidth += term->fwidth;
1307		1319
1308	if (fc != ' ') // skip spaces	1320	if (fc != ' ') // skip spaces
1309	{	1321	{
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1322	FT_UInt glyph = XftCharIndex (disp, f, fc);
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1323	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312		1324
1313	ep->glyph = glyph;	1325	ep->glyph = glyph;
1314	ep->x = x + (cwidth - extents.xOff >> 1);	1326	ep->x = x_ + (cwidth - extents.xOff >> 1);
1315	ep->y = y + ascent;	1327	ep->y = y_ + ascent;
1316		1328
1317	if (extents.xOff == 0)	1329	if (extents.xOff == 0)
1318	ep->x = x + cwidth;	1330	ep->x = x_ + cwidth;
1319		1331
1320	ep++;	1332	ep++;
1321	}	1333	}
1322		1334
1323	x += cwidth;	1335	x_ += cwidth;
		1336	}
		1337
		1338	if (buffered)
1324	}	1339	{
1325		1340	bool back_rendered = false;
1326	if (ep != enc)	1341	if (ep != enc)
		1342	{
		1343	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1344
		1345	#ifdef HAVE_BG_PIXMAP
		1346	if (term->bgPixmap.pixmap)
		1347	{
		1348	Picture dst = 0;
		1349
		1350	if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
		1351	dst = XftDrawPicture (d2);
		1352
		1353	if (bg < 0 \|\| dst != 0)
		1354	{
		1355	int src_x = x, src_y = y ;
		1356
		1357	if (term->bgPixmap.is_parentOrigin ())
		1358	{
		1359	src_x += term->window_vt_x;
		1360	src_y += term->window_vt_y;
		1361	}
		1362
		1363	if (term->bgPixmap.pmap_width >= src_x+w
		1364	&& term->bgPixmap.pmap_height >= src_y+h)
		1365	{
		1366	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1367	src_x, src_y, w, h, 0, 0);
		1368	}
		1369	else
		1370	{
		1371	XGCValues gcv;
		1372
		1373	gcv.fill_style = FillTiled;
		1374	gcv.tile = term->bgPixmap.pixmap;
		1375	gcv.ts_x_origin = -src_x;
		1376	gcv.ts_y_origin = -src_y;
		1377
		1378	XChangeGC (disp, gc,
		1379	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1380	&gcv);
		1381
		1382	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1383
		1384	gcv.fill_style = FillSolid;
		1385	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1386	}
		1387
		1388	if (bg >= 0)
		1389	{
		1390	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1391	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1392	}
		1393
		1394	back_rendered = true;
		1395	}
		1396	}
		1397	#endif
		1398
		1399	if (bg >= 0 && !back_rendered)
		1400	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
		1401
		1402	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1403	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1404	}
		1405	else
		1406	clear_rect (d, x, y, w, h, bg);
		1407	}
		1408	else
		1409	{
		1410	clear_rect (d, x, y, w, h, bg);
1327	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1411	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1412	}
1328	}	1413	}
		1414
1329	#endif	1415	#endif
1330		1416
1331	/////////////////////////////////////////////////////////////////////////////	1417	/////////////////////////////////////////////////////////////////////////////
1332		1418
1333	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1419	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1344	void	1430	void
1345	rxvt_fontset::clear ()	1431	rxvt_fontset::clear ()
1346	{	1432	{
1347	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1433	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348	= rxvt_fontprop::unset;	1434	= rxvt_fontprop::unset;
		1435	force_prop = false;
1349		1436
1350	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1437	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351	FONT_UNREF (*i);	1438	FONT_UNREF (*i);
1352		1439
1353	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1440	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1362		1449
1363	rxvt_font *	1450	rxvt_font *
1364	rxvt_fontset::new_font (const char *name, codeset cs)	1451	rxvt_fontset::new_font (const char *name, codeset cs)
1365	{	1452	{
1366	rxvt_font *f;	1453	rxvt_font *f;
1367		1454
1368	if (!name \|\| !*name)	1455	if (!name \|\| !*name)
1369	{	1456	{
1370	name = "";	1457	name = "";
1371	f = new rxvt_font_default (this);	1458	f = new rxvt_font_default (this);
1372	}	1459	}
…		…
1465	if (fonts[i]->loaded)	1552	if (fonts[i]->loaded)
1466	return true;	1553	return true;
1467		1554
1468	fonts[i]->loaded = true;	1555	fonts[i]->loaded = true;
1469		1556
1470	if (!fonts[i]->load (prop))	1557	if (!fonts[i]->load (prop, force_prop))
1471	{	1558	{
1472	fonts[i]->cs = CS_UNKNOWN;	1559	fonts[i]->cs = CS_UNKNOWN;
1473	return false;	1560	return false;
1474	}	1561	}
1475		1562
…		…
1576	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1663	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1577	FcPatternAddBool (p, FC_MINSPACE, 1);	1664	FcPatternAddBool (p, FC_MINSPACE, 1);
1578	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1665	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1579		1666
1580	XftResult result;	1667	XftResult result;
1581	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1668	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1582		1669
1583	FcPatternDestroy (p);	1670	FcPatternDestroy (p);
1584		1671
1585	if (match)	1672	if (match)
1586	{	1673	{
…		…
1591	if (find_font (font) < 0)	1678	if (find_font (font) < 0)
1592	{	1679	{
1593	char fontname[4096];	1680	char fontname[4096];
1594	sprintf (fontname, "xft:%-.4090s", font);	1681	sprintf (fontname, "xft:%-.4090s", font);
1595		1682
1596	fonts.push_back (new_font (fontname, CS_UNICODE));	1683	fonts.push_back (new_font (fontname, CS_UNICODE));
1597	}	1684	}
1598		1685
1599	free (font);	1686	free (font);
1600	}	1687	}
1601	#endif	1688	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.93 by root, Tue Jan 31 00:25:16 2006 UTC vs. Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.93 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.123 by ayin, Sat Nov 24 10:32:33 2007 UTC