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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.168 by sf-exg, Tue Dec 14 08:01:51 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
30	#include <inttypes.h>	29	#include <inttypes.h>
		30
		31	#if XFT
		32	# include <fontconfig/fontconfig.h>
		33	#endif
31		34
32	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width	35	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts	36	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34		37
35	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \	38	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36	(prop)->slant >= rxvt_fontprop::italic \	39	(prop)->slant >= rxvt_fontprop::italic \
37	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \	40	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \	41	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39	))	42	))
40		43
41	const struct rxvt_fallback_font {	44	static const struct rxvt_fallback_font {
42	codeset cs;	45	codeset cs;
43	const char *name;	46	const char *name;
44	} fallback_fonts[] = {	47	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	48	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	49	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	50	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		51
49	#if ENCODING_EU	52	#if ENCODING_EU
50	// cyrillic	53	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	54	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	55	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		56
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	57	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	58	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	59	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	60	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	61	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	68	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	69	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		70
68	# if XFT	71	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	72	{ CS_KOI8_U, "xft::lang=ru" },
70		73
71	{ CS_ISO8859_5, "xft::lang=ru" },	74	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	75	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	76	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	77	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	78	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
80		83
81	// japanese	84	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	85	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	86	# if XFT
84	// prefer xft for complex scripts	87	// prefer xft for complex scripts
		88	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	89	{ 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" },	90	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	91	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	92	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	93	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	94	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	220	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	221	{
219	}	222	}
220		223
221	void	224	void
222	rxvt_font::set_name (char *name)	225	rxvt_font::set_name (char *name_)
223	{	226	{
224	if (this->name == name)	227	if (name == name_)
225	return;	228	return;
226		229
227	if (this->name) free (this->name); // let the compiler optimize	230	if (name) free (name); // let the compiler optimize
228	this->name = name;	231	name = name_;
229	}	232	}
230		233
231	void	234	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	235	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	236	{
234	dTermDisplay;	237	dTermDisplay;
235	dTermGC;	238	dTermGC;
236		239
237	if (color < 0 \|\| color == Color_bg)	240	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	241	XClearArea (disp, d, x, y, w, h, false);
239	else	242	else if (color >= 0)
240	{	243	{
241	#if XFT	244	#if XFT
		245	Picture dst;
		246
		247	# ifdef HAVE_BG_PIXMAP
		248	if (term->bgPixmap.pixmap
		249	&& !term->pix_colors[color].is_opaque ()
		250	&& ((dst = XftDrawPicture (d))))
		251	{
		252	XClearArea (disp, d, x, y, w, h, false);
		253
		254	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		255	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		256	}
		257	else
		258	# endif
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		260
243	#else	261	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	262	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	263	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	264	#endif
247	}	265	}
248	}	266	}
249		267
250	/////////////////////////////////////////////////////////////////////////////	268	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		269
254	struct rxvt_font_default : rxvt_font {	270	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	271	struct rxvt_fontset *fs;
256		272
257	rxvt_font_default (rxvt_fontset *fs)	273	rxvt_font_default (rxvt_fontset *fs)
…		…
270	p.slant = rxvt_fontprop::roman;	286	p.slant = rxvt_fontprop::roman;
271		287
272	return p;	288	return p;
273	}	289	}
274		290
275	bool load (const rxvt_fontprop &prop)	291	bool load (const rxvt_fontprop &prop, bool force_prop)
276	{	292	{
277	width = 1; height = 1;	293	width = 1; height = 1;
278	ascent = 1; descent = 0;	294	ascent = 1; descent = 0;
279		295
280	set_name (strdup ("built-in support font"));	296	set_name (strdup ("built-in support font"));
…		…
293	return false;	309	return false;
294		310
295	if (unicode <= 0x009f)	311	if (unicode <= 0x009f)
296	return true;	312	return true;
297		313
		314	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	315	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	316	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	317	return true;
		318	#endif
301		319
302	if (IS_COMPOSE (unicode))	320	if (IS_COMPOSE (unicode))
303	return true;	321	return true;
304		322
305	switch (unicode)	323	switch (unicode)
…		…
341	;	359	;
342		360
343	int width = text - tp;	361	int width = text - tp;
344	int fwidth = term->fwidth * width;	362	int fwidth = term->fwidth * width;
345		363
		364	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	365	if (0x2500 <= t && t <= 0x259f)
347	{	366	{
		367	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	368	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	369	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	370	uint32_t *b = a + (offs & 15);
351		371
352	int W = fwidth;	372	int W = fwidth;
…		…
390		410
391	case 1: // rectangle, possibly stippled	411	case 1: // rectangle, possibly stippled
392	if (a)	412	if (a)
393	{	413	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	414	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		415
396	gcv.fill_style = FillStippled;	416	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	417	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	418	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	419	gcv.ts_y_origin = y;
400		420
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	439	(a - 1) * 9064, (b - 1) 90*64);
420	break;	440	break;
421	}	441	}
422	}	442	}
423	}	443	}
		444	#else
		445	if (0)
		446	;
		447	#endif
424	#if ENABLE_COMBINING	448	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	449	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	450	{
427	min_it (width, 2); // we only support wcwidth up to 2	451	min_it (width, 2); // we only support wcwidth up to 2
428		452
429	text_t chrs[2];	453	text_t chrs[2];
430	chrs [1] = NOCHAR;	454	chrs [1] = NOCHAR;
431		455
432	*chrs = cc->c1;	456	*chrs = cc->c1;
433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	457	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
434	f1->draw (d, x, y, chrs, width, fg, bg);	458	f1->draw (d, x, y, chrs, width, fg, bg);
435		459
436	if (cc->c2 != NOCHAR)	460	if (cc->c2 != NOCHAR)
437	{	461	{
438	bool careful;	462	bool careful;
439		463
440	// prefer font of first character, for no good reasons	464	// prefer font of first character, for no good reasons
441	*chrs = cc->c2;	465	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	466	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	467	? f1
444	: (*fs)[fs->find_font (cc->c2)];	468	: (*fs)[fs->find_font_idx (cc->c2)];
445		469
446	f2->draw (d, x, y, chrs, width, fg, -1);	470	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	471	}
448	}	472	}
449	#endif	473	#endif
450	else	474	else
451	switch (t)	475	switch (t)
…		…
462		486
463	x += fwidth;	487	x += fwidth;
464	}	488	}
465	}	489	}
466		490
		491	struct rxvt_font_overflow : rxvt_font {
		492	struct rxvt_fontset *fs;
		493
		494	rxvt_font_overflow (rxvt_fontset *fs)
		495	: rxvt_font ()
		496	{
		497	this->fs = fs;
		498	}
		499
		500	rxvt_fontprop properties ()
		501	{
		502	rxvt_fontprop p;
		503
		504	p.width = p.height = 1;
		505	p.ascent = rxvt_fontprop::unset;
		506	p.weight = rxvt_fontprop::medium;
		507	p.slant = rxvt_fontprop::roman;
		508
		509	return p;
		510	}
		511
		512	bool load (const rxvt_fontprop &prop, bool force_prop)
		513	{
		514	width = 1; height = 1;
		515	ascent = 1; descent = 0;
		516
		517	set_name (strdup ("built-in rendition overflow font"));
		518
		519	return true;
		520	}
		521
		522	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		523	{
		524	return false;
		525	}
		526
		527	void draw (rxvt_drawable &d, int x, int y,
		528	const text_t *text, int len,
		529	int fg, int bg)
		530	{
		531	while (len--)
		532	{
		533	int fid = fs->find_font_idx (*text);
		534	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		535	++text;
		536	x += term->fwidth;
		537	}
		538	}
		539	};
		540
467	/////////////////////////////////////////////////////////////////////////////	541	/////////////////////////////////////////////////////////////////////////////
468		542
469	struct rxvt_font_x11 : rxvt_font {	543	struct rxvt_font_x11 : rxvt_font {
470	rxvt_font_x11 () { f = 0; }	544	rxvt_font_x11 () { f = 0; }
471		545
472	void clear ();	546	void clear ();
473		547
474	rxvt_fontprop properties ();	548	rxvt_fontprop properties ();
475		549
476	bool load (const rxvt_fontprop &prop);	550	bool load (const rxvt_fontprop &prop, bool force_prop);
477		551
478	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	552	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479		553
480	void draw (rxvt_drawable &d, int x, int y,	554	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	555	const text_t *text, int len,
482	int fg, int bg);	556	int fg, int bg);
483		557
484	bool slow; // wether this is a proportional font or has other funny characteristics	558	bool slow; // whether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	559	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	560	bool enc2b, encm;
488		561
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	562	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);	563	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);	564	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	571	unsigned long value;
499		572
500	if (XGetFontProperty (f, property, &value))	573	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	574	return XGetAtomName (term->dpy, value);
502	else	575	else
503	return rxvt_strdup (repl);	576	return repl ? strdup (repl) : 0;
504	}	577	}
505		578
506	rxvt_fontprop	579	rxvt_fontprop
507	rxvt_font_x11::properties ()	580	rxvt_font_x11::properties ()
508	{	581	{
…		…
590	return false;	663	return false;
591	}	664	}
592		665
593	// fix the size of scalable fonts	666	// fix the size of scalable fonts
594	static bool	667	static bool
595	replace_field (char buf, const char name, int index, const char old, const char *replace)	668	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
596	{	669	{
597	int slashes = 0;	670	int slashes = 0;
598	const char field, end;	671	const char field, end;
599		672
600	for (const char c = name; c; c++)	673	for (const char c = name; c; c++)
…		…
610	break;	683	break;
611	}	684	}
612		685
613	if (slashes >= 13 && (!old \|\| *field == old))	686	if (slashes >= 13 && (!old \|\| *field == old))
614	{	687	{
615	// TODO: check for overflow in font-name	688	size_t len = field - name;
616	strncpy (buf, name, field - name);	689	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	690	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	691	strcpy (*ptr + len, replace);
619	strcat (buf, end);	692	strcat (*ptr, end);
620		693
621	return true;	694	return true;
622	}	695	}
623	else	696	else
624	{	697	{
625	strcpy (buf, name);	698	*ptr = strdup (name);
626		699
627	return false;	700	return false;
628	}	701	}
629	}	702	}
630		703
631	bool	704	bool
632	rxvt_font_x11::load (const rxvt_fontprop &prop)	705	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633	{	706	{
634	dTermDisplay;	707	dTermDisplay;
635		708
636	clear ();	709	clear ();
637		710
638	char field_str[64]; // enough for 128 bits	711	char field_str[64]; // enough for 128 bits
639		712
640	// first morph the font if required	713	// first morph the font if required
641	if (prop.weight != rxvt_fontprop::unset	714	if (force_prop)
642	\|\| prop.slant != rxvt_fontprop::unset)
643	{	715	{
644	char fname[1024];	716	char *fname;
645		717
646	if (name[0] != '-')	718	if (name[0] != '-')
647	{	719	{
648	f = XLoadQueryFont (disp, name);	720	f = XLoadQueryFont (disp, name);
649		721
…		…
661	f = 0;	733	f = 0;
662	}	734	}
663		735
664	if (prop.weight != rxvt_fontprop::unset)	736	if (prop.weight != rxvt_fontprop::unset)
665	{	737	{
666	replace_field (fname, name, 2, 0,	738	replace_field (&fname, name, 2, 0,
667	prop.weight < rxvt_fontprop::bold	739	prop.weight < rxvt_fontprop::bold
668	? "medium" : "bold");	740	? "medium" : "bold");
669	set_name (strdup (fname));	741	set_name (fname);
670	}	742	}
671		743
672	if (prop.slant != rxvt_fontprop::unset)	744	if (prop.slant != rxvt_fontprop::unset)
673	{	745	{
674	replace_field (fname, name, 3, 0,	746	replace_field (&fname, name, 3, 0,
675	prop.slant < rxvt_fontprop::italic	747	prop.slant < rxvt_fontprop::italic
676	? "r" : "i"); // TODO: handle "o"blique, too	748	? "r" : "i"); // TODO: handle "o"blique, too
677	set_name (strdup (fname));	749	set_name (fname);
678	}	750	}
679	}	751	}
680		752
681	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	753	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682	? 0 : prop.height);	754	? 0 : prop.height);
…		…
707	font_weight *fonts = new font_weight[count];	779	font_weight *fonts = new font_weight[count];
708		780
709	for (int i = 0; i < count; i++)	781	for (int i = 0; i < count; i++)
710	{	782	{
711	rxvt_fontprop p;	783	rxvt_fontprop p;
712	char fname[1024];	784	char *fname;
713		785
714	int diff = 0;	786	int diff = 0;
715		787
716	if (replace_field (fname, list[i], 6, '0', field_str))	788	if (replace_field (&fname, list[i], 6, '0', field_str))
717	diff += 10; // slightly penalize scalable fonts	789	diff += 10; // slightly penalize scalable fonts
		790	else
		791	{
		792	free (fname);
718	else if (replace_field (fname, list[i], 11, '0', "0"))	793	if (replace_field (&fname, list[i], 11, '0', "0"))
719	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	794	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		795	}
720		796
721	if (!set_properties (p, fname))	797	if (!set_properties (p, fname))
722	continue;	798	continue;
723		799
724	if (prop.height != rxvt_fontprop::unset	800	if (prop.height != rxvt_fontprop::unset
…		…
728	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	804	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);	805	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);	806	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);	807	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732		808
733	fonts[i].name = strdup (fname);	809	fonts[i].name = fname;
734	fonts[i].diff = diff;	810	fonts[i].diff = diff;
735	}	811	}
736		812
737	XFreeFontNames (list);	813	XFreeFontNames (list);
738		814
…		…
770	return false;	846	return false;
771		847
772	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	848	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	849	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774		850
		851	cs = CS_UNKNOWN;
		852
775	if (registry && encoding)	853	if (registry && encoding)
776	{	854	{
777	char charset[64];	855	char charset[64];
778	snprintf (charset, 64, "%s-%s", registry, encoding);	856	snprintf (charset, 64, "%s-%s", registry, encoding);
779		857
780	cs = codeset_from_name (charset);	858	cs = codeset_from_name (charset);
		859
		860	if (cs == CS_UNKNOWN)
		861	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781	}	862	}
782	else	863
		864	free (registry);
		865	free (encoding);
		866
		867	if (cs == CS_UNKNOWN)
783	{	868	{
784	const char *charset = get_property (f, XA_FONT, 0);	869	const char *charset = get_property (f, XA_FONT, 0);
785		870
786	if (!charset)	871	if (!charset)
787	charset = name;	872	charset = name;
…		…
790	while (*charset)	875	while (*charset)
791	if (*charset++ == '-' && !--count)	876	if (*charset++ == '-' && !--count)
792	break;	877	break;
793		878
794	cs = codeset_from_name (charset);	879	cs = codeset_from_name (charset);
		880	if (cs == CS_UNKNOWN)
		881	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		882	}
		883
		884	if (cs == CS_UNKNOWN)
795	}	885	{
796		886	clear ();
797	free (registry);	887	return false;
798	free (encoding);	888	}
799		889
800	if (cs == CS_UNICODE)	890	if (cs == CS_UNICODE)
801	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	891	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802		892
803	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	893	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
815	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	905	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816		906
817	if (encm)	907	if (encm)
818	N += (f->max_byte1 - f->min_byte1)	908	N += (f->max_byte1 - f->min_byte1)
819	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	909	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820		910
821	while (N)	911	while (N)
822	{	912	{
823	if (f->per_char[N].width > width)	913	if (f->per_char[N].width > width)
824	width = f->per_char[N].width;	914	width = f->per_char[N].width;
825		915
…		…
850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	940	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851		941
852	if (width < g.width) width = g.width;	942	if (width < g.width) width = g.width;
853	}	943	}
854		944
855	if (cs == CS_UNKNOWN)	945	#if 0 // do it per-character
		946	if (prop && width > prop->width)
856	{	947	{
857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859	clear ();	948	clear ();
860	return false;	949	return false;
861	}	950	}
862
863	#if 0 // do it per-character
864	if (prop && width > prop->width)
865	{
866	clear ();
867	return false;
868	}
869	#endif	951	#endif
870		952
871	return true;	953	return true;
872	}	954	}
873		955
…		…
887	uint32_t ch = FROM_UNICODE (cs, unicode);	969	uint32_t ch = FROM_UNICODE (cs, unicode);
888		970
889	if (ch == NOCHAR)	971	if (ch == NOCHAR)
890	return false;	972	return false;
891		973
892	/* check wether the character exists in _this_ font. horrible. */	974	/* check whether the character exists in _this_ font. horrible. */
893	XCharStruct *xcs;	975	XCharStruct *xcs;
894		976
895	if (encm)	977	if (encm)
896	{	978	{
897	unsigned char byte1 = ch >> 8;	979	unsigned char byte1 = ch >> 8;
…		…
927	return false;	1009	return false;
928		1010
929	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1011	if (!prop \|\| prop->width == rxvt_fontprop::unset)
930	return true;	1012	return true;
931		1013
932	// check wether character overlaps previous/next character	1014	// check whether character overlaps previous/next character
933	int w = xcs->rbearing - xcs->lbearing;	1015	int w = xcs->rbearing - xcs->lbearing;
934	int wcw = max (WCWIDTH (unicode), 1);	1016	int wcw = max (WCWIDTH (unicode), 1);
935		1017
936	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1018	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
937		1019
…		…
977	else	1059	else
978	{	1060	{
979	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1061	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980		1062
981	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1063	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
982		1064
983	if (slow)	1065	if (slow)
984	{	1066	{
985	do	1067	do
986	{	1068	{
987	if (xc->byte1 \|\| xc->byte2)	1069	if (xc->byte1 \|\| xc->byte2)
…		…
1009	else	1091	else
1010	{	1092	{
1011	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1093	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012		1094
1013	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1095	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1014		1096
1015	if (slow)	1097	if (slow)
1016	{	1098	{
1017	do	1099	do
1018	{	1100	{
1019	if (*xc)	1101	if (*xc)
…		…
1039		1121
1040	void clear ();	1122	void clear ();
1041		1123
1042	rxvt_fontprop properties ();	1124	rxvt_fontprop properties ();
1043		1125
1044	bool load (const rxvt_fontprop &prop);	1126	bool load (const rxvt_fontprop &prop, bool force_prop);
1045		1127
1046	void draw (rxvt_drawable &d, int x, int y,	1128	void draw (rxvt_drawable &d, int x, int y,
1047	const text_t *text, int len,	1129	const text_t *text, int len,
1048	int fg, int bg);	1130	int fg, int bg);
1049		1131
1050	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1132	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051		1133
1052	protected:	1134	protected:
1053	XftFont *f;	1135	XftFont *f;
1054	};	1136	};
1055		1137
…		…
1082		1164
1083	return p;	1165	return p;
1084	}	1166	}
1085		1167
1086	bool	1168	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1169	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1170	{
1089	dTermDisplay;	1171	dTermDisplay;
1090		1172
1091	clear ();	1173	clear ();
1092		1174
…		…
1101	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1183	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1184	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1185	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1186
1105	if (prop.weight != rxvt_fontprop::unset	1187	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1188	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1189	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1190
1109	if (prop.slant != rxvt_fontprop::unset	1191	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1192	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1193	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1194
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1195	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1196	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1197	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1198	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117	#endif	1199	#endif
1118		1200
1119	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1201	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120	FcPatternAddBool (p, FC_MINSPACE, 1);	1202	FcPatternAddBool (p, FC_MINSPACE, 1);
1121		1203
…		…
1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1347	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266	const text_t *text, int len,	1348	const text_t *text, int len,
1267	int fg, int bg)	1349	int fg, int bg)
1268	{	1350	{
1269	XGlyphInfo extents;	1351	XGlyphInfo extents;
1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1352	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1271	XftGlyphSpec *ep = enc;	1353	XftGlyphSpec *ep = enc;
1272		1354
1273	dTermDisplay;	1355	dTermDisplay;
1274	dTermGC;	1356	dTermGC;
1275		1357
1276	int w = term->fwidth * len;	1358	int w = term->fwidth * len;
1277	int h = term->fheight;	1359	int h = term->fheight;
1278		1360
1279	bool buffered = 0	1361	bool buffered = bg >= Color_transparent
1280	#ifndef FORCE_UNBUFFERED_XFT	1362	&& term->option (Opt_buffered);
1281	# if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
1282	\|\| !term->am_transparent // we aren't transparent
1283	\|\| term->am_pixmap_trans // we have a pixmap
1284	# endif
1285	\|\| bg >= 0; // we don't use a transparent bg
1286	#endif
1287		1363
1288	// cut trailing spaces	1364	// cut trailing spaces
1289	while (len && text [len - 1] == ' ')	1365	while (len && text [len - 1] == ' ')
1290	len--;	1366	len--;
1291		1367
…		…
1297	int cwidth = term->fwidth;	1373	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1374	FcChar32 fc = *text++; len--;
1299		1375
1300	while (len && *text == NOCHAR)	1376	while (len && *text == NOCHAR)
1301	text++, len--, cwidth += term->fwidth;	1377	text++, len--, cwidth += term->fwidth;
1302		1378
1303	if (fc != ' ') // skip spaces	1379	if (fc != ' ') // skip spaces
1304	{	1380	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1381	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1382	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1383
…		…
1322	{	1398	{
1323	if (ep != enc)	1399	if (ep != enc)
1324	{	1400	{
1325	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1401	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1326		1402
1327	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1403	#ifdef HAVE_BG_PIXMAP
1328	if (bg < 0 && term->am_pixmap_trans)	1404	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1329	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);	1405
1330	else if (bg < 0 && term->bgPixmap.pixmap)	1406	if (term->bgPixmap.pixmap
		1407	&& (bg == Color_transparent \|\| bg == Color_bg
		1408	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1331	{	1409	{
		1410	int src_x = x, src_y = y;
		1411
		1412	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
		1413	{
		1414	src_x += term->window_vt_x;
		1415	src_y += term->window_vt_y;
		1416	}
		1417
		1418	if (term->bgPixmap.pmap_width >= src_x + w
		1419	&& term->bgPixmap.pmap_height >= src_y + h)
		1420	{
		1421	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1422	src_x, src_y, w, h, 0, 0);
		1423	}
		1424	else
		1425	{
1332	XGCValues gcv;	1426	XGCValues gcv;
1333		1427
1334	gcv.fill_style = FillTiled;	1428	gcv.fill_style = FillTiled;
1335	gcv.tile = term->pixmap;	1429	gcv.tile = term->bgPixmap.pixmap;
1336	gcv.ts_x_origin = -x;	1430	gcv.ts_x_origin = -src_x;
1337	gcv.ts_y_origin = -y;	1431	gcv.ts_y_origin = -src_y;
1338		1432
1339	GC gc2 = XCreateGC (disp, d2,	1433	XChangeGC (disp, gc,
1340	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1434	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1341	&gcv);	1435	&gcv);
1342		1436
1343	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1437	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1344		1438
1345	XFreeGC (disp, gc2);	1439	gcv.fill_style = FillSolid;
		1440	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1441	}
		1442
		1443	if (dst)
		1444	{
		1445	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1446
		1447	// dst can only be set when bg >= 0
		1448	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1449	}
1346	}	1450	}
1347	else	1451	else
1348	#endif	1452	#endif
1349	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1453	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1350		1454
1351	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1455	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1352	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1456	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1353	}	1457	}
1354	else	1458	else
…		…
1379	void	1483	void
1380	rxvt_fontset::clear ()	1484	rxvt_fontset::clear ()
1381	{	1485	{
1382	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1486	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1383	= rxvt_fontprop::unset;	1487	= rxvt_fontprop::unset;
		1488	force_prop = false;
1384		1489
1385	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1490	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1386	FONT_UNREF (*i);	1491	(*i)->unref ();
1387		1492
1388	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1493	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1389	delete *p;	1494	delete *p;
1390		1495
1391	free (fontdesc); fontdesc = 0;	1496	free (fontdesc); fontdesc = 0;
…		…
1393	fonts.clear ();	1498	fonts.clear ();
1394		1499
1395	fallback = fallback_fonts;	1500	fallback = fallback_fonts;
1396	}	1501	}
1397		1502
		1503	void
		1504	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1505	{
		1506	font->set_term (term);
		1507
		1508	font->cs = cs;
		1509	font->loaded = false;
		1510	}
		1511
1398	rxvt_font *	1512	rxvt_font *
1399	rxvt_fontset::new_font (const char *name, codeset cs)	1513	rxvt_fontset::new_font (const char *name, codeset cs)
1400	{	1514	{
1401	rxvt_font *f;	1515	rxvt_font *f;
1402		1516
1403	if (!name \|\| !*name)	1517	if (!name \|\| !*name)
1404	{	1518	{
1405	name = "";	1519	name = "";
1406	f = new rxvt_font_default (this);	1520	f = new rxvt_font_default (this);
1407	}	1521	}
…		…
1418	f = new rxvt_font_x11;	1532	f = new rxvt_font_x11;
1419	}	1533	}
1420	else	1534	else
1421	f = new rxvt_font_x11;	1535	f = new rxvt_font_x11;
1422		1536
1423	f->set_term (term);
1424	f->set_name (strdup (name));	1537	f->set_name (strdup (name));
1425		1538	prepare_font (f, cs);
1426	f->cs = cs;
1427	f->loaded = false;
1428		1539
1429	return f;	1540	return f;
1430	}	1541	}
1431		1542
1432	/////////////////////////////////////////////////////////////////////////////	1543	/////////////////////////////////////////////////////////////////////////////
		1544
		1545	void
		1546	rxvt_fontset::push_font (rxvt_font *font)
		1547	{
		1548	// the fontCount index is reserved for the overflow font, it is only
		1549	// necessary when we get fontCount or more fonts, as they cannot be
		1550	// represented in the rendition.
		1551	if (fonts.size () == fontCount)
		1552	{
		1553	rxvt_font *f = new rxvt_font_overflow (this);
		1554
		1555	prepare_font (f, CS_UNICODE);
		1556	fonts.push_back (f);
		1557	}
		1558
		1559	fonts.push_back (font);
		1560	}
1433		1561
1434	void	1562	void
1435	rxvt_fontset::add_fonts (const char *desc)	1563	rxvt_fontset::add_fonts (const char *desc)
1436	{	1564	{
1437	if (desc)	1565	if (desc)
…		…
1475	if (!end)	1603	if (!end)
1476	end = desc + strlen (desc);	1604	end = desc + strlen (desc);
1477		1605
1478	if (end - desc < 511)	1606	if (end - desc < 511)
1479	{	1607	{
1480	strncpy (buf, desc, end - desc);	1608	memcpy (buf, desc, end - desc);
1481	buf[end - desc] = 0;	1609	buf[end - desc] = 0;
1482		1610
1483	fonts.push_back (new_font (buf, cs));	1611	push_font (new_font (buf, cs));
1484	}	1612	}
1485	else	1613	else
1486	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1614	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1487		1615
1488	desc = end + 1;	1616	desc = end + 1;
…		…
1500	if (fonts[i]->loaded)	1628	if (fonts[i]->loaded)
1501	return true;	1629	return true;
1502		1630
1503	fonts[i]->loaded = true;	1631	fonts[i]->loaded = true;
1504		1632
1505	if (!fonts[i]->load (prop))	1633	if (!fonts[i]->load (prop, force_prop))
1506	{	1634	{
1507	fonts[i]->cs = CS_UNKNOWN;	1635	fonts[i]->cs = CS_UNKNOWN;
1508	return false;	1636	return false;
1509	}	1637	}
1510		1638
…		…
1516	{	1644	{
1517	clear ();	1645	clear ();
1518		1646
1519	fontdesc = strdup (desc);	1647	fontdesc = strdup (desc);
1520		1648
1521	fonts.push_back (new_font (0, CS_UNICODE));	1649	push_font (new_font (0, CS_UNICODE));
1522	realize_font (0);	1650	realize_font (0);
1523		1651
1524	add_fonts (desc);	1652	add_fonts (desc);
1525		1653
1526	return true;	1654	return true;
…		…
1535		1663
1536	return -1;	1664	return -1;
1537	}	1665	}
1538		1666
1539	int	1667	int
1540	rxvt_fontset::find_font (unicode_t unicode)	1668	rxvt_fontset::find_font_idx (unicode_t unicode)
1541	{	1669	{
1542	if (unicode >= 1<<20)	1670	if (unicode >= 1<<20)
1543	return 0;	1671	return 0;
1544		1672
1545	unicode_t hi = unicode >> 8;	1673	unicode_t hi = unicode >> 8;
…		…
1571	goto next_font;	1699	goto next_font;
1572		1700
1573	bool careful;	1701	bool careful;
1574	if (f->has_char (unicode, &prop, careful))	1702	if (f->has_char (unicode, &prop, careful))
1575	{	1703	{
1576	if (careful)	1704	i = (i << 1) \| careful;
1577	i \|= 128;
1578		1705
1579	goto found;	1706	goto found;
1580	}	1707	}
1581		1708
1582	next_font:	1709	next_font:
1583	if (i == fonts.size () - 1)	1710	if (i == fonts.size () - 1)
1584	{	1711	{
1585	if (fallback->name)	1712	if (fallback->name)
1586	{	1713	{
1587	// search through the fallback list	1714	// search through the fallback list
1588	fonts.push_back (new_font (fallback->name, fallback->cs));	1715	push_font (new_font (fallback->name, fallback->cs));
1589	fallback++;	1716	fallback++;
1590	}	1717	}
1591	else	1718	else
1592	{	1719	{
1593	// try to find a new font.	1720	// try to find a new font.
…		…
1624	FcPatternDestroy (match);	1751	FcPatternDestroy (match);
1625		1752
1626	if (find_font (font) < 0)	1753	if (find_font (font) < 0)
1627	{	1754	{
1628	char fontname[4096];	1755	char fontname[4096];
1629	sprintf (fontname, "xft:%-.4090s", font);	1756	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1630		1757
1631	fonts.push_back (new_font (fontname, CS_UNICODE));	1758	push_font (new_font (fontname, CS_UNICODE));
1632	}	1759	}
1633		1760
1634	free (font);	1761	free (font);
1635	}	1762	}
1636	#endif	1763	#endif
…		…
1658	}	1785	}
1659		1786
1660	return i;	1787	return i;
1661	}	1788	}
1662		1789
1663
1664

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs. Revision 1.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC