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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.101 by root, Sat Mar 11 00:33:23 2006 UTC vs. Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.101 by root, Sat Mar 11 00:33:23 2006 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC