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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.97 by root, Sun Feb 19 16:34:36 2006 UTC vs.
Revision 1.134 by root, Wed Jan 23 09:42:02 2008 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	*
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	24	#include "rxvtutil.h"
26	#include "rxvtfont.h"	25	#include "rxvtfont.h"
27		26
28	#include <cstdlib>	27	#include <cstdlib>
29		28
…		…
43	const char *name;	42	const char *name;
44	} fallback_fonts[] = {	43	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	44	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	45	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		47
49	#if ENCODING_EU	48	#if ENCODING_EU
50	// cyrillic	49	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	50	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	51	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		52
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	53	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	54	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	55	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	56	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	57	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	64	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	65	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		66
68	# if XFT	67	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	68	{ CS_KOI8_U, "xft::lang=ru" },
70		69
71	{ CS_ISO8859_5, "xft::lang=ru" },	70	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	71	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	72	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	73	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	74	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
231	void	230	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	232	{
234	dTermDisplay;	233	dTermDisplay;
235	dTermGC;	234	dTermGC;
236		235
237	if (color < 0 \|\| color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
239	else	238	else if (color >= 0)
240	{	239	{
241	#if XFT	240	#if XFT
		241	bool done = false;
		242
		243	# ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())
		245	{
		246	Picture dst = XftDrawPicture (d);
		247
		248	if (dst != 0)
		249	{
		250	XClearArea (disp, d, x, y, w, h, false);
		251	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		252	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		253	done = true;
		254	}
		255	}
		256	# endif
		257	if (!done)
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	258	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		259
243	#else	260	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	261	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	262	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	263	#endif
247	}	264	}
248	}	265	}
249		266
250	/////////////////////////////////////////////////////////////////////////////	267	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		268
254	struct rxvt_font_default : rxvt_font {	269	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	270	struct rxvt_fontset *fs;
256		271
257	rxvt_font_default (rxvt_fontset *fs)	272	rxvt_font_default (rxvt_fontset *fs)
…		…
270	p.slant = rxvt_fontprop::roman;	285	p.slant = rxvt_fontprop::roman;
271		286
272	return p;	287	return p;
273	}	288	}
274		289
275	bool load (const rxvt_fontprop &prop)	290	bool load (const rxvt_fontprop &prop, bool force_prop)
276	{	291	{
277	width = 1; height = 1;	292	width = 1; height = 1;
278	ascent = 1; descent = 0;	293	ascent = 1; descent = 0;
279		294
280	set_name (strdup ("built-in support font"));	295	set_name (strdup ("built-in support font"));
…		…
293	return false;	308	return false;
294		309
295	if (unicode <= 0x009f)	310	if (unicode <= 0x009f)
296	return true;	311	return true;
297		312
		313	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	314	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	315	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	316	return true;
		317	#endif
301		318
302	if (IS_COMPOSE (unicode))	319	if (IS_COMPOSE (unicode))
303	return true;	320	return true;
304		321
305	switch (unicode)	322	switch (unicode)
…		…
341	;	358	;
342		359
343	int width = text - tp;	360	int width = text - tp;
344	int fwidth = term->fwidth * width;	361	int fwidth = term->fwidth * width;
345		362
		363	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	364	if (0x2500 <= t && t <= 0x259f)
347	{	365	{
		366	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	367	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	368	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	369	uint32_t *b = a + (offs & 15);
351		370
352	int W = fwidth;	371	int W = fwidth;
…		…
390		409
391	case 1: // rectangle, possibly stippled	410	case 1: // rectangle, possibly stippled
392	if (a)	411	if (a)
393	{	412	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	413	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		414
396	gcv.fill_style = FillStippled;	415	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	416	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	417	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	418	gcv.ts_y_origin = y;
400		419
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	438	(a - 1) * 9064, (b - 1) 90*64);
420	break;	439	break;
421	}	440	}
422	}	441	}
423	}	442	}
		443	#else
		444	if (0)
		445	;
		446	#endif
424	#if ENABLE_COMBINING	447	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	448	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	449	{
427	min_it (width, 2); // we only support wcwidth up to 2	450	min_it (width, 2); // we only support wcwidth up to 2
428		451
…		…
441	*chrs = cc->c2;	464	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	465	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	466	? f1
444	: (*fs)[fs->find_font (cc->c2)];	467	: (*fs)[fs->find_font (cc->c2)];
445		468
446	f2->draw (d, x, y, chrs, width, fg, -1);	469	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	470	}
448	}	471	}
449	#endif	472	#endif
450	else	473	else
451	switch (t)	474	switch (t)
…		…
471		494
472	void clear ();	495	void clear ();
473		496
474	rxvt_fontprop properties ();	497	rxvt_fontprop properties ();
475		498
476	bool load (const rxvt_fontprop &prop);	499	bool load (const rxvt_fontprop &prop, bool force_prop);
477		500
478	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	501	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479		502
480	void draw (rxvt_drawable &d, int x, int y,	503	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	504	const text_t *text, int len,
482	int fg, int bg);	505	int fg, int bg);
483		506
484	bool slow; // wether this is a proportional font or has other funny characteristics	507	bool slow; // wether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	508	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	509	bool enc2b, encm;
488		510
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	511	char get_property (XFontStruct f, Atom property, const char *repl) const;
490	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	512	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
491	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	513	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	520	unsigned long value;
499		521
500	if (XGetFontProperty (f, property, &value))	522	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	523	return XGetAtomName (term->dpy, value);
502	else	524	else
503	return rxvt_strdup (repl);	525	return repl ? strdup (repl) : 0;
504	}	526	}
505		527
506	rxvt_fontprop	528	rxvt_fontprop
507	rxvt_font_x11::properties ()	529	rxvt_font_x11::properties ()
508	{	530	{
…		…
590	return false;	612	return false;
591	}	613	}
592		614
593	// fix the size of scalable fonts	615	// fix the size of scalable fonts
594	static bool	616	static bool
595	replace_field (char buf, const char name, int index, const char old, const char *replace)	617	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
596	{	618	{
597	int slashes = 0;	619	int slashes = 0;
598	const char field, end;	620	const char field, end;
599		621
600	for (const char c = name; c; c++)	622	for (const char c = name; c; c++)
…		…
610	break;	632	break;
611	}	633	}
612		634
613	if (slashes >= 13 && (!old \|\| *field == old))	635	if (slashes >= 13 && (!old \|\| *field == old))
614	{	636	{
615	// TODO: check for overflow in font-name	637	size_t len = field - name;
616	strncpy (buf, name, field - name);	638	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	639	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	640	strcpy (*ptr + len, replace);
619	strcat (buf, end);	641	strcat (*ptr, end);
620		642
621	return true;	643	return true;
622	}	644	}
623	else	645	else
624	{	646	{
625	strcpy (buf, name);	647	*ptr = strdup (name);
626		648
627	return false;	649	return false;
628	}	650	}
629	}	651	}
630		652
631	bool	653	bool
632	rxvt_font_x11::load (const rxvt_fontprop &prop)	654	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633	{	655	{
634	dTermDisplay;	656	dTermDisplay;
635		657
636	clear ();	658	clear ();
637		659
638	char field_str[64]; // enough for 128 bits	660	char field_str[64]; // enough for 128 bits
639		661
640	// first morph the font if required	662	// first morph the font if required
641	if (prop.weight != rxvt_fontprop::unset	663	if (force_prop)
642	\|\| prop.slant != rxvt_fontprop::unset)
643	{	664	{
644	char fname[1024];	665	char *fname;
645		666
646	if (name[0] != '-')	667	if (name[0] != '-')
647	{	668	{
648	f = XLoadQueryFont (disp, name);	669	f = XLoadQueryFont (disp, name);
649		670
…		…
661	f = 0;	682	f = 0;
662	}	683	}
663		684
664	if (prop.weight != rxvt_fontprop::unset)	685	if (prop.weight != rxvt_fontprop::unset)
665	{	686	{
666	replace_field (fname, name, 2, 0,	687	replace_field (&fname, name, 2, 0,
667	prop.weight < rxvt_fontprop::bold	688	prop.weight < rxvt_fontprop::bold
668	? "medium" : "bold");	689	? "medium" : "bold");
669	set_name (strdup (fname));	690	set_name (fname);
670	}	691	}
671		692
672	if (prop.slant != rxvt_fontprop::unset)	693	if (prop.slant != rxvt_fontprop::unset)
673	{	694	{
674	replace_field (fname, name, 3, 0,	695	replace_field (&fname, name, 3, 0,
675	prop.slant < rxvt_fontprop::italic	696	prop.slant < rxvt_fontprop::italic
676	? "r" : "i"); // TODO: handle "o"blique, too	697	? "r" : "i"); // TODO: handle "o"blique, too
677	set_name (strdup (fname));	698	set_name (fname);
678	}	699	}
679	}	700	}
680		701
681	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	702	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682	? 0 : prop.height);	703	? 0 : prop.height);
…		…
707	font_weight *fonts = new font_weight[count];	728	font_weight *fonts = new font_weight[count];
708		729
709	for (int i = 0; i < count; i++)	730	for (int i = 0; i < count; i++)
710	{	731	{
711	rxvt_fontprop p;	732	rxvt_fontprop p;
712	char fname[1024];	733	char *fname;
713		734
714	int diff = 0;	735	int diff = 0;
715		736
716	if (replace_field (fname, list[i], 6, '0', field_str))	737	if (replace_field (&fname, list[i], 6, '0', field_str))
717	diff += 10; // slightly penalize scalable fonts	738	diff += 10; // slightly penalize scalable fonts
		739	else
		740	{
		741	free (fname);
718	else if (replace_field (fname, list[i], 11, '0', "0"))	742	if (replace_field (&fname, list[i], 11, '0', "0"))
719	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	743	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		744	}
720		745
721	if (!set_properties (p, fname))	746	if (!set_properties (p, fname))
722	continue;	747	continue;
723		748
724	if (prop.height != rxvt_fontprop::unset	749	if (prop.height != rxvt_fontprop::unset
…		…
728	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	753	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
729	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	754	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
730	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	755	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
731	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	756	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732		757
733	fonts[i].name = strdup (fname);	758	fonts[i].name = fname;
734	fonts[i].diff = diff;	759	fonts[i].diff = diff;
735	}	760	}
736		761
737	XFreeFontNames (list);	762	XFreeFontNames (list);
738		763
…		…
815	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	840	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816		841
817	if (encm)	842	if (encm)
818	N += (f->max_byte1 - f->min_byte1)	843	N += (f->max_byte1 - f->min_byte1)
819	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	844	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820		845
821	while (N)	846	while (N)
822	{	847	{
823	if (f->per_char[N].width > width)	848	if (f->per_char[N].width > width)
824	width = f->per_char[N].width;	849	width = f->per_char[N].width;
825		850
…		…
977	else	1002	else
978	{	1003	{
979	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1004	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980		1005
981	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1006	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
982		1007
983	if (slow)	1008	if (slow)
984	{	1009	{
985	do	1010	do
986	{	1011	{
987	if (xc->byte1 \|\| xc->byte2)	1012	if (xc->byte1 \|\| xc->byte2)
…		…
1009	else	1034	else
1010	{	1035	{
1011	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1036	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012		1037
1013	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1038	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1014		1039
1015	if (slow)	1040	if (slow)
1016	{	1041	{
1017	do	1042	do
1018	{	1043	{
1019	if (*xc)	1044	if (*xc)
…		…
1039		1064
1040	void clear ();	1065	void clear ();
1041		1066
1042	rxvt_fontprop properties ();	1067	rxvt_fontprop properties ();
1043		1068
1044	bool load (const rxvt_fontprop &prop);	1069	bool load (const rxvt_fontprop &prop, bool force_prop);
1045		1070
1046	void draw (rxvt_drawable &d, int x, int y,	1071	void draw (rxvt_drawable &d, int x, int y,
1047	const text_t *text, int len,	1072	const text_t *text, int len,
1048	int fg, int bg);	1073	int fg, int bg);
1049		1074
1050	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1075	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051		1076
1052	protected:	1077	protected:
1053	XftFont *f;	1078	XftFont *f;
1054	};	1079	};
1055		1080
…		…
1082		1107
1083	return p;	1108	return p;
1084	}	1109	}
1085		1110
1086	bool	1111	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1112	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1113	{
1089	dTermDisplay;	1114	dTermDisplay;
1090		1115
1091	clear ();	1116	clear ();
1092		1117
…		…
1101	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1126	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1127	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1128	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1129
1105	if (prop.weight != rxvt_fontprop::unset	1130	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1131	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1132	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1133
1109	if (prop.slant != rxvt_fontprop::unset	1134	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1135	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1136	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1137
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1138	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1139	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1140	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
…		…
1274	dTermGC;	1299	dTermGC;
1275		1300
1276	int w = term->fwidth * len;	1301	int w = term->fwidth * len;
1277	int h = term->fheight;	1302	int h = term->fheight;
1278		1303
1279	bool buffered = 0	1304	/*
1280	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1305	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1281	\|\| !term->am_transparent // we aren't transparent	1306	* good idea from the perspective of packaging for wide variety of user configs.
1282	\|\| term->am_pixmap_trans // we have a pixmap	1307	*/
		1308	bool buffered = bg >= Color_transparent;
		1309	#ifdef FORCE_UNBUFFERED_XFT
		1310	buffered = false;
1283	#endif	1311	#endif
1284	\|\| bg >= 0; // we don't use a transparent bg
1285		1312
1286	// cut trailing spaces	1313	// cut trailing spaces
1287	while (len && text [len - 1] == ' ')	1314	while (len && text [len - 1] == ' ')
1288	len--;	1315	len--;
1289		1316
…		…
1295	int cwidth = term->fwidth;	1322	int cwidth = term->fwidth;
1296	FcChar32 fc = *text++; len--;	1323	FcChar32 fc = *text++; len--;
1297		1324
1298	while (len && *text == NOCHAR)	1325	while (len && *text == NOCHAR)
1299	text++, len--, cwidth += term->fwidth;	1326	text++, len--, cwidth += term->fwidth;
1300		1327
1301	if (fc != ' ') // skip spaces	1328	if (fc != ' ') // skip spaces
1302	{	1329	{
1303	FT_UInt glyph = XftCharIndex (disp, f, fc);	1330	FT_UInt glyph = XftCharIndex (disp, f, fc);
1304	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1331	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305		1332
…		…
1318		1345
1319	if (buffered)	1346	if (buffered)
1320	{	1347	{
1321	if (ep != enc)	1348	if (ep != enc)
1322	{	1349	{
		1350	bool back_rendered = false;
1323	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1351	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324		1352
1325	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1353	#ifdef HAVE_BG_PIXMAP
1326	if (bg < 0 && term->am_pixmap_trans)	1354
1327	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
1328	else if (bg < 0 && term->bgPixmap.pixmap)	1355	if (term->bgPixmap.pixmap
		1356	&& !(bg >= 0 && term->pix_colors[bg].is_opaque ()))
1329	{	1357	{
		1358	Picture dst = XftDrawPicture (d2);
		1359
		1360	int src_x = x, src_y = y;
		1361
		1362	if (term->bgPixmap.is_parentOrigin ())
		1363	{
		1364	src_x += term->window_vt_x;
		1365	src_y += term->window_vt_y;
		1366	}
		1367
		1368	if (term->bgPixmap.pmap_width >= src_x+w
		1369	&& term->bgPixmap.pmap_height >= src_y+h)
		1370	{
		1371	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1372	src_x, src_y, w, h, 0, 0);
		1373	}
		1374	else
		1375	{
1330	XGCValues gcv;	1376	XGCValues gcv;
1331		1377
1332	gcv.fill_style = FillTiled;	1378	gcv.fill_style = FillTiled;
1333	gcv.tile = term->pixmap;	1379	gcv.tile = term->bgPixmap.pixmap;
1334	gcv.ts_x_origin = -x;	1380	gcv.ts_x_origin = -src_x;
1335	gcv.ts_y_origin = -y;	1381	gcv.ts_y_origin = -src_y;
1336		1382
1337	GC gc2 = XCreateGC (disp, d2,	1383	XChangeGC (disp, gc,
1338	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1384	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1339	&gcv);	1385	&gcv);
1340		1386
1341	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1387	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1342		1388
1343	XFreeGC (disp, gc2);	1389	gcv.fill_style = FillSolid;
		1390	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1391	}
		1392
		1393	if (bg >= 0 && dst) // colour must be (and is) non-opaque here
		1394	{
		1395	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1396	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1397	}
		1398
		1399	back_rendered = true;
1344	}	1400	}
1345	else
1346	#endif	1401	#endif
		1402
		1403	if (!back_rendered)
1347	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1404	XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1348		1405
1349	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1406	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1350	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1407	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1351	}	1408	}
1352	else	1409	else
…		…
1377	void	1434	void
1378	rxvt_fontset::clear ()	1435	rxvt_fontset::clear ()
1379	{	1436	{
1380	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1437	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1381	= rxvt_fontprop::unset;	1438	= rxvt_fontprop::unset;
		1439	force_prop = false;
1382		1440
1383	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1441	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1384	FONT_UNREF (*i);	1442	FONT_UNREF (*i);
1385		1443
1386	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1444	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1395		1453
1396	rxvt_font *	1454	rxvt_font *
1397	rxvt_fontset::new_font (const char *name, codeset cs)	1455	rxvt_fontset::new_font (const char *name, codeset cs)
1398	{	1456	{
1399	rxvt_font *f;	1457	rxvt_font *f;
1400		1458
1401	if (!name \|\| !*name)	1459	if (!name \|\| !*name)
1402	{	1460	{
1403	name = "";	1461	name = "";
1404	f = new rxvt_font_default (this);	1462	f = new rxvt_font_default (this);
1405	}	1463	}
…		…
1473	if (!end)	1531	if (!end)
1474	end = desc + strlen (desc);	1532	end = desc + strlen (desc);
1475		1533
1476	if (end - desc < 511)	1534	if (end - desc < 511)
1477	{	1535	{
1478	strncpy (buf, desc, end - desc);	1536	memcpy (buf, desc, end - desc);
1479	buf[end - desc] = 0;	1537	buf[end - desc] = 0;
1480		1538
1481	fonts.push_back (new_font (buf, cs));	1539	fonts.push_back (new_font (buf, cs));
1482	}	1540	}
1483	else	1541	else
…		…
1498	if (fonts[i]->loaded)	1556	if (fonts[i]->loaded)
1499	return true;	1557	return true;
1500		1558
1501	fonts[i]->loaded = true;	1559	fonts[i]->loaded = true;
1502		1560
1503	if (!fonts[i]->load (prop))	1561	if (!fonts[i]->load (prop, force_prop))
1504	{	1562	{
1505	fonts[i]->cs = CS_UNKNOWN;	1563	fonts[i]->cs = CS_UNKNOWN;
1506	return false;	1564	return false;
1507	}	1565	}
1508		1566
…		…
1624	if (find_font (font) < 0)	1682	if (find_font (font) < 0)
1625	{	1683	{
1626	char fontname[4096];	1684	char fontname[4096];
1627	sprintf (fontname, "xft:%-.4090s", font);	1685	sprintf (fontname, "xft:%-.4090s", font);
1628		1686
1629	fonts.push_back (new_font (fontname, CS_UNICODE));	1687	fonts.push_back (new_font (fontname, CS_UNICODE));
1630	}	1688	}
1631		1689
1632	free (font);	1690	free (font);
1633	}	1691	}
1634	#endif	1692	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.97 by root, Sun Feb 19 16:34:36 2006 UTC vs. Revision 1.134 by root, Wed Jan 23 09:42:02 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.97 by root, Sun Feb 19 16:34:36 2006 UTC vs.
Revision 1.134 by root, Wed Jan 23 09:42:02 2008 UTC