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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.108 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.158 by root, Tue Mar 30 23:54:30 2010 UTC

…		…
1	/----------------------------------------------------------------------	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-2008 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
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" },
…		…
80		79
81	// japanese	80	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	82	# if XFT
84	// prefer xft for complex scripts	83	// prefer xft for complex scripts
		84	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	88	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	217	{
219	}	218	}
220		219
221	void	220	void
222	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
223	{	222	{
224	if (this->name == name)	223	if (name == name_)
225	return;	224	return;
226		225
227	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
228	this->name = name;	227	name = name_;
229	}	228	}
230		229
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 == Color_bg \|\| color == Color_transparent)	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 if (color >= 0)	238	else if (color >= 0)
240	{	239	{
241	#if XFT	240	#if XFT
		241	Picture dst;
		242
		243	# ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap
		245	&& !term->pix_colors[color].is_opaque ()
		246	&& ((dst = XftDrawPicture (d))))
		247	{
		248	XClearArea (disp, d, x, y, w, h, false);
		249
		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	}
		253	else
		254	# endif
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
243	#else	257	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	260	#endif
247	}	261	}
248	}	262	}
249		263
250	/////////////////////////////////////////////////////////////////////////////	264	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		265
254	struct rxvt_font_default : rxvt_font {	266	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	267	struct rxvt_fontset *fs;
256		268
257	rxvt_font_default (rxvt_fontset *fs)	269	rxvt_font_default (rxvt_fontset *fs)
…		…
293	return false;	305	return false;
294		306
295	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
296	return true;	308	return true;
297		309
		310	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	313	return true;
		314	#endif
301		315
302	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
303	return true;	317	return true;
304		318
305	switch (unicode)	319	switch (unicode)
…		…
341	;	355	;
342		356
343	int width = text - tp;	357	int width = text - tp;
344	int fwidth = term->fwidth * width;	358	int fwidth = term->fwidth * width;
345		359
		360	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
347	{	362	{
		363	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	364	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	365	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	366	uint32_t *b = a + (offs & 15);
351		367
352	int W = fwidth;	368	int W = fwidth;
…		…
390		406
391	case 1: // rectangle, possibly stippled	407	case 1: // rectangle, possibly stippled
392	if (a)	408	if (a)
393	{	409	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	410	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		411
396	gcv.fill_style = FillStippled;	412	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	413	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	414	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	415	gcv.ts_y_origin = y;
400		416
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	435	(a - 1) * 9064, (b - 1) 90*64);
420	break;	436	break;
421	}	437	}
422	}	438	}
423	}	439	}
		440	#else
		441	if (0)
		442	;
		443	#endif
424	#if ENABLE_COMBINING	444	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	445	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	446	{
427	min_it (width, 2); // we only support wcwidth up to 2	447	min_it (width, 2); // we only support wcwidth up to 2
428		448
…		…
497	unsigned long value;	517	unsigned long value;
498		518
499	if (XGetFontProperty (f, property, &value))	519	if (XGetFontProperty (f, property, &value))
500	return XGetAtomName (term->dpy, value);	520	return XGetAtomName (term->dpy, value);
501	else	521	else
502	return rxvt_strdup (repl);	522	return repl ? strdup (repl) : 0;
503	}	523	}
504		524
505	rxvt_fontprop	525	rxvt_fontprop
506	rxvt_font_x11::properties ()	526	rxvt_font_x11::properties ()
507	{	527	{
…		…
589	return false;	609	return false;
590	}	610	}
591		611
592	// fix the size of scalable fonts	612	// fix the size of scalable fonts
593	static bool	613	static bool
594	replace_field (char buf, const char name, int index, const char old, const char *replace)	614	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
595	{	615	{
596	int slashes = 0;	616	int slashes = 0;
597	const char field, end;	617	const char field, end;
598		618
599	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
609	break;	629	break;
610	}	630	}
611		631
612	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
613	{	633	{
614	// TODO: check for overflow in font-name	634	size_t len = field - name;
615	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
616	buf += field - name;	636	memcpy (*ptr, name, len);
617	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
618	strcat (buf, end);	638	strcat (*ptr, end);
619		639
620	return true;	640	return true;
621	}	641	}
622	else	642	else
623	{	643	{
624	strcpy (buf, name);	644	*ptr = strdup (name);
625		645
626	return false;	646	return false;
627	}	647	}
628	}	648	}
629		649
…		…
637	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
638		658
639	// first morph the font if required	659	// first morph the font if required
640	if (force_prop)	660	if (force_prop)
641	{	661	{
642	char fname[1024];	662	char *fname;
643		663
644	if (name[0] != '-')	664	if (name[0] != '-')
645	{	665	{
646	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
647		667
…		…
659	f = 0;	679	f = 0;
660	}	680	}
661		681
662	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
663	{	683	{
664	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
665	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
666	? "medium" : "bold");	686	? "medium" : "bold");
667	set_name (strdup (fname));	687	set_name (fname);
668	}	688	}
669		689
670	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
671	{	691	{
672	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
673	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
674	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
675	set_name (strdup (fname));	695	set_name (fname);
676	}	696	}
677	}	697	}
678		698
679	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680	? 0 : prop.height);	700	? 0 : prop.height);
…		…
705	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
706		726
707	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
708	{	728	{
709	rxvt_fontprop p;	729	rxvt_fontprop p;
710	char fname[1024];	730	char *fname;
711		731
712	int diff = 0;	732	int diff = 0;
713		733
714	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
715	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
716	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
717	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
718		742
719	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
720	continue;	744	continue;
721		745
722	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
726	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	750	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
727	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	751	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
728	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	752	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
729	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	753	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
730		754
731	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
732	fonts[i].diff = diff;	756	fonts[i].diff = diff;
733	}	757	}
734		758
735	XFreeFontNames (list);	759	XFreeFontNames (list);
736		760
…		…
768	return false;	792	return false;
769		793
770	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772		796
		797	cs = CS_UNKNOWN;
		798
773	if (registry && encoding)	799	if (registry && encoding)
774	{	800	{
775	char charset[64];	801	char charset[64];
776	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
777		803
778	cs = codeset_from_name (charset);	804	cs = codeset_from_name (charset);
		805
		806	if (cs == CS_UNKNOWN)
		807	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
779	}	808	}
780	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
781	{	814	{
782	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
783		816
784	if (!charset)	817	if (!charset)
785	charset = name;	818	charset = name;
…		…
788	while (*charset)	821	while (*charset)
789	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
790	break;	823	break;
791		824
792	cs = codeset_from_name (charset);	825	cs = codeset_from_name (charset);
		826	if (cs == CS_UNKNOWN)
		827	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		828	}
		829
		830	if (cs == CS_UNKNOWN)
793	}	831	{
794		832	clear ();
795	free (registry);	833	return false;
796	free (encoding);	834	}
797		835
798	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
799	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	837	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
800		838
801	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
813	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	851	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814		852
815	if (encm)	853	if (encm)
816	N += (f->max_byte1 - f->min_byte1)	854	N += (f->max_byte1 - f->min_byte1)
817	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	855	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818		856
819	while (N)	857	while (N)
820	{	858	{
821	if (f->per_char[N].width > width)	859	if (f->per_char[N].width > width)
822	width = f->per_char[N].width;	860	width = f->per_char[N].width;
823		861
…		…
848	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849		887
850	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
851	}	889	}
852		890
853	if (cs == CS_UNKNOWN)
854	{
855	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857	clear ();
858	return false;
859	}
860
861	#if 0 // do it per-character	891	#if 0 // do it per-character
862	if (prop && width > prop->width)	892	if (prop && width > prop->width)
863	{	893	{
864	clear ();	894	clear ();
865	return false;	895	return false;
…		…
975	else	1005	else
976	{	1006	{
977	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1007	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978		1008
979	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1009	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
980		1010
981	if (slow)	1011	if (slow)
982	{	1012	{
983	do	1013	do
984	{	1014	{
985	if (xc->byte1 \|\| xc->byte2)	1015	if (xc->byte1 \|\| xc->byte2)
…		…
1007	else	1037	else
1008	{	1038	{
1009	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1039	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010		1040
1011	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1041	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1012		1042
1013	if (slow)	1043	if (slow)
1014	{	1044	{
1015	do	1045	do
1016	{	1046	{
1017	if (*xc)	1047	if (*xc)
…		…
1043		1073
1044	void draw (rxvt_drawable &d, int x, int y,	1074	void draw (rxvt_drawable &d, int x, int y,
1045	const text_t *text, int len,	1075	const text_t *text, int len,
1046	int fg, int bg);	1076	int fg, int bg);
1047		1077
1048	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1078	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049		1079
1050	protected:	1080	protected:
1051	XftFont *f;	1081	XftFont *f;
1052	};	1082	};
1053		1083
…		…
1109	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110		1140
1111	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1112	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1113	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115	#endif	1145	#endif
1116		1146
1117	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1119		1149
…		…
1263	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264	const text_t *text, int len,	1294	const text_t *text, int len,
1265	int fg, int bg)	1295	int fg, int bg)
1266	{	1296	{
1267	XGlyphInfo extents;	1297	XGlyphInfo extents;
1268	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1269	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1270		1300
1271	dTermDisplay;	1301	dTermDisplay;
1272	dTermGC;	1302	dTermGC;
1273		1303
1274	int w = term->fwidth * len;	1304	int w = term->fwidth * len;
1275	int h = term->fheight;	1305	int h = term->fheight;
1276		1306
1277	bool buffered = bg >= 0 // we don't use a transparent bg	1307	bool buffered = bg >= Color_transparent
1278	#ifndef FORCE_UNBUFFERED_XFT	1308	&& term->option (Opt_buffered);
1279	# ifdef ENABLE_TRANSPARENCY
1280	\|\| !term->am_transparent // we aren't transparent
1281	# endif
1282	#endif
1283	;
1284		1309
1285	// cut trailing spaces	1310	// cut trailing spaces
1286	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1287	len--;	1312	len--;
1288		1313
…		…
1294	int cwidth = term->fwidth;	1319	int cwidth = term->fwidth;
1295	FcChar32 fc = *text++; len--;	1320	FcChar32 fc = *text++; len--;
1296		1321
1297	while (len && *text == NOCHAR)	1322	while (len && *text == NOCHAR)
1298	text++, len--, cwidth += term->fwidth;	1323	text++, len--, cwidth += term->fwidth;
1299		1324
1300	if (fc != ' ') // skip spaces	1325	if (fc != ' ') // skip spaces
1301	{	1326	{
1302	FT_UInt glyph = XftCharIndex (disp, f, fc);	1327	FT_UInt glyph = XftCharIndex (disp, f, fc);
1303	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1328	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304		1329
…		…
1319	{	1344	{
1320	if (ep != enc)	1345	if (ep != enc)
1321	{	1346	{
1322	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323		1348
1324	if (0)	1349	#ifdef HAVE_BG_PIXMAP
1325	;	1350	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1326	#ifdef ENABLE_TRANSPARENCY	1351
1327	else if (bg < 0 && term->am_pixmap_trans)
1328	XCopyArea (disp, term->pixmap, d2, gc,
1329	x + term->window_vt_x, y + term->window_vt_y,
1330	w, h, 0, 0);
1331	#endif
1332	#ifdef XPM_BACKGROUND
1333	else if (bg < 0 && term->bgPixmap.pixmap)	1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1334	{	1355	{
		1356	int src_x = x, src_y = y;
		1357
		1358	if (term->bgPixmap.is_parentOrigin ())
		1359	{
		1360	src_x += term->window_vt_x;
		1361	src_y += term->window_vt_y;
		1362	}
		1363
		1364	if (term->bgPixmap.pmap_width >= src_x + w
		1365	&& term->bgPixmap.pmap_height >= src_y + h)
		1366	{
		1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1368	src_x, src_y, w, h, 0, 0);
		1369	}
		1370	else
		1371	{
1335	XGCValues gcv;	1372	XGCValues gcv;
1336		1373
1337	gcv.fill_style = FillTiled;	1374	gcv.fill_style = FillTiled;
1338	gcv.tile = term->pixmap;	1375	gcv.tile = term->bgPixmap.pixmap;
1339	gcv.ts_x_origin = -x;	1376	gcv.ts_x_origin = -src_x;
1340	gcv.ts_y_origin = -y;	1377	gcv.ts_y_origin = -src_y;
1341		1378
1342	GC gc2 = XCreateGC (disp, d2,	1379	XChangeGC (disp, gc,
1343	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1344	&gcv);	1381	&gcv);
1345		1382
1346	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1347		1384
1348	XFreeGC (disp, gc2);	1385	gcv.fill_style = FillSolid;
		1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1387	}
		1388
		1389	if (dst)
		1390	{
		1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
		1393	// dst can only be set when bg >= 0
		1394	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1395	}
1349	}	1396	}
1350	#endif
1351	else	1397	else
		1398	#endif
1352	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1399	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1353		1400
1354	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1401	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1355	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1402	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1356	}	1403	}
1357	else	1404	else
…		…
1401		1448
1402	rxvt_font *	1449	rxvt_font *
1403	rxvt_fontset::new_font (const char *name, codeset cs)	1450	rxvt_fontset::new_font (const char *name, codeset cs)
1404	{	1451	{
1405	rxvt_font *f;	1452	rxvt_font *f;
1406		1453
1407	if (!name \|\| !*name)	1454	if (!name \|\| !*name)
1408	{	1455	{
1409	name = "";	1456	name = "";
1410	f = new rxvt_font_default (this);	1457	f = new rxvt_font_default (this);
1411	}	1458	}
…		…
1479	if (!end)	1526	if (!end)
1480	end = desc + strlen (desc);	1527	end = desc + strlen (desc);
1481		1528
1482	if (end - desc < 511)	1529	if (end - desc < 511)
1483	{	1530	{
1484	strncpy (buf, desc, end - desc);	1531	memcpy (buf, desc, end - desc);
1485	buf[end - desc] = 0;	1532	buf[end - desc] = 0;
1486		1533
1487	fonts.push_back (new_font (buf, cs));	1534	fonts.push_back (new_font (buf, cs));
1488	}	1535	}
1489	else	1536	else
…		…
1628	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1629		1676
1630	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1631	{	1678	{
1632	char fontname[4096];	1679	char fontname[4096];
1633	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1634		1681
1635	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1636	}	1683	}
1637		1684
1638	free (font);	1685	free (font);
1639	}	1686	}
1640	#endif	1687	#endif
…		…
1662	}	1709	}
1663		1710
1664	return i;	1711	return i;
1665	}	1712	}
1666		1713
1667
1668

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.108 by root, Tue Jun 26 00:40:19 2007 UTC vs. Revision 1.158 by root, Tue Mar 30 23:54:30 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.108 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.158 by root, Tue Mar 30 23:54:30 2010 UTC