[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.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" },
…		…
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"));
…		…
311	return false;	306	return false;
312		307
313	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
314	return true;	309	return true;
315		310
		311	#ifdef BUILTIN_GLYPHS
316	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
317	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
318	return true;	314	return true;
		315	#endif
319		316
320	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
321	return true;	318	return true;
322		319
323	switch (unicode)	320	switch (unicode)
…		…
359	;	356	;
360		357
361	int width = text - tp;	358	int width = text - tp;
362	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
363		360
		361	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
365	{	363	{
		364	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
369		368
370	int W = fwidth;	369	int W = fwidth;
…		…
408		407
409	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
410	if (a)	409	if (a)
411	{	410	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		412
414	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
418		417
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
438	break;	437	break;
439	}	438	}
440	}	439	}
441	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
442	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	447	{
445	min_it (width, 2); // we only support wcwidth up to 2	448	min_it (width, 2); // we only support wcwidth up to 2
446		449
…		…
459	*chrs = cc->c2;	462	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	464	? f1
462	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font (cc->c2)];
463		466
464	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	468	}
466	}	469	}
467	#endif	470	#endif
468	else	471	else
469	switch (t)	472	switch (t)
…		…
489		492
490	void clear ();	493	void clear ();
491		494
492	rxvt_fontprop properties ();	495	rxvt_fontprop properties ();
493		496
494	bool load (const rxvt_fontprop &prop);	497	bool load (const rxvt_fontprop &prop, bool force_prop);
495		498
496	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;
497		500
498	void draw (rxvt_drawable &d, int x, int y,	501	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	502	const text_t *text, int len,
500	int fg, int bg);	503	int fg, int bg);
501		504
502	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
503	XFontStruct *f;	506	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	507	bool enc2b, encm;
506		508
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	509	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);	510	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);	511	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
514	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
515	{	517	{
516	unsigned long value;	518	unsigned long value;
517		519
518	if (XGetFontProperty (f, property, &value))	520	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->xdisp, value);	521	return XGetAtomName (term->dpy, value);
520	else	522	else
521	return rxvt_strdup (repl);	523	return repl ? strdup (repl) : 0;
522	}	524	}
523		525
524	rxvt_fontprop	526	rxvt_fontprop
525	rxvt_font_x11::properties ()	527	rxvt_font_x11::properties ()
526	{	528	{
…		…
547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	549	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
548	{	550	{
549	unsigned long height;	551	unsigned long height;
550		552
551	#if 0	553	#if 0
552	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	554	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
553	return false;	555	return false;
554	#else	556	#else
555	height = f->ascent + f->descent;	557	height = f->ascent + f->descent;
556	#endif	558	#endif
557		559
…		…
645	return false;	647	return false;
646	}	648	}
647	}	649	}
648		650
649	bool	651	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	652	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	653	{
652	dTermDisplay;	654	dTermDisplay;
653		655
654	clear ();	656	clear ();
655		657
656	char field_str[64]; // enough for 128 bits	658	char field_str[64]; // enough for 128 bits
657		659
658	// first morph the font if required	660	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	661	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	662	{
662	char fname[1024];	663	char fname[1024];
663		664
664	if (name[0] != '-')	665	if (name[0] != '-')
665	{	666	{
…		…
679	f = 0;	680	f = 0;
680	}	681	}
681		682
682	if (prop.weight != rxvt_fontprop::unset)	683	if (prop.weight != rxvt_fontprop::unset)
683	{	684	{
684	replace_field (fname, name, 2, 0,	685	replace_field (fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	686	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	687	? "medium" : "bold");
687	set_name (strdup (fname));	688	set_name (strdup (fname));
688	}	689	}
689		690
…		…
833	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;
834		835
835	if (encm)	836	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	837	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	838	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		839
839	while (N)	840	while (N)
840	{	841	{
841	if (f->per_char[N].width > width)	842	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	843	width = f->per_char[N].width;
843		844
…		…
892	void	893	void
893	rxvt_font_x11::clear ()	894	rxvt_font_x11::clear ()
894	{	895	{
895	if (f)	896	if (f)
896	{	897	{
897	XFreeFont (term->xdisp, f);	898	XFreeFont (term->dpy, f);
898	f = 0;	899	f = 0;
899	}	900	}
900	}	901	}
901		902
902	bool	903	bool
…		…
995	else	996	else
996	{	997	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	998	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		999
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1000	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		1001
1001	if (slow)	1002	if (slow)
1002	{	1003	{
1003	do	1004	do
1004	{	1005	{
1005	if (xc->byte1 \|\| xc->byte2)	1006	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1028	else
1028	{	1029	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1030	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1031
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1032	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1033
1033	if (slow)	1034	if (slow)
1034	{	1035	{
1035	do	1036	do
1036	{	1037	{
1037	if (*xc)	1038	if (*xc)
…		…
1057		1058
1058	void clear ();	1059	void clear ();
1059		1060
1060	rxvt_fontprop properties ();	1061	rxvt_fontprop properties ();
1061		1062
1062	bool load (const rxvt_fontprop &prop);	1063	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1064
1064	void draw (rxvt_drawable &d, int x, int y,	1065	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1066	const text_t *text, int len,
1066	int fg, int bg);	1067	int fg, int bg);
1067		1068
1068	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;
1069		1070
1070	protected:	1071	protected:
1071	XftFont *f;	1072	XftFont *f;
1072	};	1073	};
1073		1074
1074	void	1075	void
1075	rxvt_font_xft::clear ()	1076	rxvt_font_xft::clear ()
1076	{	1077	{
1077	if (f)	1078	if (f)
1078	{	1079	{
1079	XftFontClose (term->xdisp, f);	1080	XftFontClose (term->dpy, f);
1080	f = 0;	1081	f = 0;
1081	}	1082	}
1082	}	1083	}
1083		1084
1084	rxvt_fontprop	1085	rxvt_fontprop
…		…
1100		1101
1101	return p;	1102	return p;
1102	}	1103	}
1103		1104
1104	bool	1105	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1106	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1107	{
1107	dTermDisplay;	1108	dTermDisplay;
1108		1109
1109	clear ();	1110	clear ();
1110		1111
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1120	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1121	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1122	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1123
1123	if (prop.weight != rxvt_fontprop::unset	1124	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1125	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1126	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1127
1127	if (prop.slant != rxvt_fontprop::unset	1128	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1129	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1130	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1131
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1132	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1133	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1134	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1251	bool	1252	bool
1252	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
1253	{	1254	{
1254	careful = false;	1255	careful = false;
1255		1256
1256	if (!XftCharExists (term->xdisp, f, unicode))	1257	if (!XftCharExists (term->dpy, f, unicode))
1257	return false;	1258	return false;
1258		1259
1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1260	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1260	return true;	1261	return true;
1261		1262
1262	// check character against base font bounding box	1263	// check character against base font bounding box
1263	FcChar32 ch = unicode;	1264	FcChar32 ch = unicode;
1264	XGlyphInfo g;	1265	XGlyphInfo g;
1265	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1266	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1266		1267
1267	int w = g.width - g.x;	1268	int w = g.width - g.x;
1268	int wcw = max (WCWIDTH (unicode), 1);	1269	int wcw = max (WCWIDTH (unicode), 1);
1269		1270
1270	careful = g.x > 0 \|\| w > prop->width * wcw;	1271	careful = g.x > 0 \|\| w > prop->width * wcw;
…		…
1282	void	1283	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1284	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1285	const text_t *text, int len,
1285	int fg, int bg)	1286	int fg, int bg)
1286	{	1287	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289	XGlyphInfo extents;	1288	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1289	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1291	XftGlyphSpec *ep = enc;	1290	XftGlyphSpec *ep = enc;
1292		1291
1293	dTermDisplay;	1292	dTermDisplay;
1294	dTermGC;	1293	dTermGC;
1295		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	;
1296	// cut trailing spaces	1307	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1308	while (len && text [len - 1] == ' ')
1298	len--;	1309	len--;
1299		1310
		1311	int x_ = buffered ? 0 : x;
		1312	int y_ = buffered ? 0 : y;
		1313
1300	while (len)	1314	while (len)
1301	{	1315	{
1302	int cwidth = term->fwidth;	1316	int cwidth = term->fwidth;
1303	FcChar32 fc = *text++; len--;	1317	FcChar32 fc = *text++; len--;
1304		1318
1305	while (len && *text == NOCHAR)	1319	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1320	text++, len--, cwidth += term->fwidth;
1307		1321
1308	if (fc != ' ') // skip spaces	1322	if (fc != ' ') // skip spaces
1309	{	1323	{
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1324	FT_UInt glyph = XftCharIndex (disp, f, fc);
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1325	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312		1326
1313	ep->glyph = glyph;	1327	ep->glyph = glyph;
1314	ep->x = x + (cwidth - extents.xOff >> 1);	1328	ep->x = x_ + (cwidth - extents.xOff >> 1);
1315	ep->y = y + ascent;	1329	ep->y = y_ + ascent;
1316		1330
1317	if (extents.xOff == 0)	1331	if (extents.xOff == 0)
1318	ep->x = x + cwidth;	1332	ep->x = x_ + cwidth;
1319		1333
1320	ep++;	1334	ep++;
1321	}	1335	}
1322		1336
1323	x += cwidth;	1337	x_ += cwidth;
		1338	}
		1339
		1340	if (buffered)
1324	}	1341	{
1325		1342	bool back_rendered = false;
1326	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);
1327	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1413	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1414	}
1328	}	1415	}
		1416
1329	#endif	1417	#endif
1330		1418
1331	/////////////////////////////////////////////////////////////////////////////	1419	/////////////////////////////////////////////////////////////////////////////
1332		1420
1333	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1421	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1344	void	1432	void
1345	rxvt_fontset::clear ()	1433	rxvt_fontset::clear ()
1346	{	1434	{
1347	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1435	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348	= rxvt_fontprop::unset;	1436	= rxvt_fontprop::unset;
		1437	force_prop = false;
1349		1438
1350	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1439	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351	FONT_UNREF (*i);	1440	FONT_UNREF (*i);
1352		1441
1353	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1442	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1362		1451
1363	rxvt_font *	1452	rxvt_font *
1364	rxvt_fontset::new_font (const char *name, codeset cs)	1453	rxvt_fontset::new_font (const char *name, codeset cs)
1365	{	1454	{
1366	rxvt_font *f;	1455	rxvt_font *f;
1367		1456
1368	if (!name \|\| !*name)	1457	if (!name \|\| !*name)
1369	{	1458	{
1370	name = "";	1459	name = "";
1371	f = new rxvt_font_default (this);	1460	f = new rxvt_font_default (this);
1372	}	1461	}
…		…
1465	if (fonts[i]->loaded)	1554	if (fonts[i]->loaded)
1466	return true;	1555	return true;
1467		1556
1468	fonts[i]->loaded = true;	1557	fonts[i]->loaded = true;
1469		1558
1470	if (!fonts[i]->load (prop))	1559	if (!fonts[i]->load (prop, force_prop))
1471	{	1560	{
1472	fonts[i]->cs = CS_UNKNOWN;	1561	fonts[i]->cs = CS_UNKNOWN;
1473	return false;	1562	return false;
1474	}	1563	}
1475		1564
…		…
1576	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1665	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1577	FcPatternAddBool (p, FC_MINSPACE, 1);	1666	FcPatternAddBool (p, FC_MINSPACE, 1);
1578	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1667	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1579		1668
1580	XftResult result;	1669	XftResult result;
1581	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1670	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1582		1671
1583	FcPatternDestroy (p);	1672	FcPatternDestroy (p);
1584		1673
1585	if (match)	1674	if (match)
1586	{	1675	{
…		…
1591	if (find_font (font) < 0)	1680	if (find_font (font) < 0)
1592	{	1681	{
1593	char fontname[4096];	1682	char fontname[4096];
1594	sprintf (fontname, "xft:%-.4090s", font);	1683	sprintf (fontname, "xft:%-.4090s", font);
1595		1684
1596	fonts.push_back (new_font (fontname, CS_UNICODE));	1685	fonts.push_back (new_font (fontname, CS_UNICODE));
1597	}	1686	}
1598		1687
1599	free (font);	1688	free (font);
1600	}	1689	}
1601	#endif	1690	#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.124 by ayin, Sat Nov 24 11:41:11 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.124 by ayin, Sat Nov 24 11:41:11 2007 UTC