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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 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)
		796	// also weed out too large fonts
		797	\|\| (prop.height != rxvt_fontprop::unset
		798	&& p.height > prop.height))
		799	{
		800	free (fname);
722	continue;	801	continue;
723		802	}
724	if (prop.height != rxvt_fontprop::unset
725	&& p.height > prop.height) // weed out too large fonts
726	continue;
727		803
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);
781	}	859
782	else	860	if (cs == CS_UNKNOWN)
		861	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
783	{	862	}
		863
		864	free (registry);
		865	free (encoding);
		866
		867	if (cs == CS_UNKNOWN)
		868	{
784	const char *charset = get_property (f, XA_FONT, 0);	869	char *value = get_property (f, XA_FONT, 0);
		870	const char *charset = value;
785		871
786	if (!charset)	872	if (!charset)
787	charset = name;	873	charset = name;
788		874
789	int count = 13;	875	int count = 13;
790	while (*charset)	876	while (*charset)
791	if (*charset++ == '-' && !--count)	877	if (*charset++ == '-' && !--count)
792	break;	878	break;
793		879
794	cs = codeset_from_name (charset);	880	cs = codeset_from_name (charset);
		881	if (cs == CS_UNKNOWN)
		882	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		883
		884	free (value);
		885	}
		886
		887	if (cs == CS_UNKNOWN)
795	}	888	{
796		889	clear ();
797	free (registry);	890	return false;
798	free (encoding);	891	}
799		892
800	if (cs == CS_UNICODE)	893	if (cs == CS_UNICODE)
801	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	894	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802		895
803	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	896	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
815	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	908	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816		909
817	if (encm)	910	if (encm)
818	N += (f->max_byte1 - f->min_byte1)	911	N += (f->max_byte1 - f->min_byte1)
819	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	912	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820		913
821	while (N)	914	while (N)
822	{	915	{
823	if (f->per_char[N].width > width)	916	if (f->per_char[N].width > width)
824	width = f->per_char[N].width;	917	width = f->per_char[N].width;
825		918
…		…
828	}	921	}
829	#endif	922	#endif
830		923
831	width = 1;	924	width = 1;
832		925
833	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	926	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
834	{	927	{
835	if (FROM_UNICODE (cs, *t) == NOCHAR)	928	if (FROM_UNICODE (cs, *t) == NOCHAR)
836	continue;	929	continue;
837		930
838	// ignore characters we wouldn't use anyways	931	// ignore characters we wouldn't use anyways
…		…
850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	943	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851		944
852	if (width < g.width) width = g.width;	945	if (width < g.width) width = g.width;
853	}	946	}
854		947
855	if (cs == CS_UNKNOWN)	948	#if 0 // do it per-character
		949	if (prop && width > prop->width)
856	{	950	{
857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859	clear ();	951	clear ();
860	return false;	952	return false;
861	}	953	}
862
863	#if 0 // do it per-character
864	if (prop && width > prop->width)
865	{
866	clear ();
867	return false;
868	}
869	#endif	954	#endif
870		955
871	return true;	956	return true;
872	}	957	}
873		958
…		…
887	uint32_t ch = FROM_UNICODE (cs, unicode);	972	uint32_t ch = FROM_UNICODE (cs, unicode);
888		973
889	if (ch == NOCHAR)	974	if (ch == NOCHAR)
890	return false;	975	return false;
891		976
892	/* check wether the character exists in _this_ font. horrible. */	977	/* check whether the character exists in _this_ font. horrible. */
893	XCharStruct *xcs;	978	XCharStruct *xcs;
894		979
895	if (encm)	980	if (encm)
896	{	981	{
897	unsigned char byte1 = ch >> 8;	982	unsigned char byte1 = ch >> 8;
…		…
927	return false;	1012	return false;
928		1013
929	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1014	if (!prop \|\| prop->width == rxvt_fontprop::unset)
930	return true;	1015	return true;
931		1016
932	// check wether character overlaps previous/next character	1017	// check whether character overlaps previous/next character
933	int w = xcs->rbearing - xcs->lbearing;	1018	int w = xcs->rbearing - xcs->lbearing;
934	int wcw = max (WCWIDTH (unicode), 1);	1019	int wcw = max (WCWIDTH (unicode), 1);
935		1020
936	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1021	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
937		1022
…		…
977	else	1062	else
978	{	1063	{
979	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1064	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980		1065
981	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1066	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
982		1067
983	if (slow)	1068	if (slow)
984	{	1069	{
985	do	1070	do
986	{	1071	{
987	if (xc->byte1 \|\| xc->byte2)	1072	if (xc->byte1 \|\| xc->byte2)
…		…
1009	else	1094	else
1010	{	1095	{
1011	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1096	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012		1097
1013	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1098	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1014		1099
1015	if (slow)	1100	if (slow)
1016	{	1101	{
1017	do	1102	do
1018	{	1103	{
1019	if (*xc)	1104	if (*xc)
…		…
1039		1124
1040	void clear ();	1125	void clear ();
1041		1126
1042	rxvt_fontprop properties ();	1127	rxvt_fontprop properties ();
1043		1128
1044	bool load (const rxvt_fontprop &prop);	1129	bool load (const rxvt_fontprop &prop, bool force_prop);
1045		1130
1046	void draw (rxvt_drawable &d, int x, int y,	1131	void draw (rxvt_drawable &d, int x, int y,
1047	const text_t *text, int len,	1132	const text_t *text, int len,
1048	int fg, int bg);	1133	int fg, int bg);
1049		1134
1050	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1135	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051		1136
1052	protected:	1137	protected:
1053	XftFont *f;	1138	XftFont *f;
1054	};	1139	};
1055		1140
…		…
1082		1167
1083	return p;	1168	return p;
1084	}	1169	}
1085		1170
1086	bool	1171	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1172	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1173	{
1089	dTermDisplay;	1174	dTermDisplay;
1090		1175
1091	clear ();	1176	clear ();
1092		1177
…		…
1101	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1186	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1187	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1188	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1189
1105	if (prop.weight != rxvt_fontprop::unset	1190	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1191	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1192	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1193
1109	if (prop.slant != rxvt_fontprop::unset	1194	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1195	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1196	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1197
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1198	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1199	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1200	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1201	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117	#endif	1202	#endif
1118		1203
1119	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1204	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120	FcPatternAddBool (p, FC_MINSPACE, 1);	1205	FcPatternAddBool (p, FC_MINSPACE, 1);
1121		1206
…		…
1154		1239
1155	XftUnlockFace (f);	1240	XftUnlockFace (f);
1156		1241
1157	int glheight = height;	1242	int glheight = height;
1158		1243
1159	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1244	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1160	{	1245	{
1161	FcChar16 ch = *t;	1246	FcChar16 ch = *t;
1162		1247
1163	if (cs != CS_UNICODE	1248	if (cs != CS_UNICODE
1164	&& ch > 0x100	1249	&& ch > 0x100
…		…
1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1350	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266	const text_t *text, int len,	1351	const text_t *text, int len,
1267	int fg, int bg)	1352	int fg, int bg)
1268	{	1353	{
1269	XGlyphInfo extents;	1354	XGlyphInfo extents;
1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1355	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1271	XftGlyphSpec *ep = enc;	1356	XftGlyphSpec *ep = enc;
1272		1357
1273	dTermDisplay;	1358	dTermDisplay;
1274	dTermGC;	1359	dTermGC;
1275		1360
1276	int w = term->fwidth * len;	1361	int w = term->fwidth * len;
1277	int h = term->fheight;	1362	int h = term->fheight;
1278		1363
1279	bool buffered = 0	1364	bool buffered = bg >= Color_transparent
1280	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1365	&& term->option (Opt_buffered);
1281	\|\| !term->am_transparent // we aren't transparent
1282	\|\| term->am_pixmap_trans // we have a pixmap
1283	#endif
1284	\|\| bg >= 0; // we don't use a transparent bg
1285		1366
1286	// cut trailing spaces	1367	// cut trailing spaces
1287	while (len && text [len - 1] == ' ')	1368	while (len && text [len - 1] == ' ')
1288	len--;	1369	len--;
1289		1370
…		…
1295	int cwidth = term->fwidth;	1376	int cwidth = term->fwidth;
1296	FcChar32 fc = *text++; len--;	1377	FcChar32 fc = *text++; len--;
1297		1378
1298	while (len && *text == NOCHAR)	1379	while (len && *text == NOCHAR)
1299	text++, len--, cwidth += term->fwidth;	1380	text++, len--, cwidth += term->fwidth;
1300		1381
1301	if (fc != ' ') // skip spaces	1382	if (fc != ' ') // skip spaces
1302	{	1383	{
1303	FT_UInt glyph = XftCharIndex (disp, f, fc);	1384	FT_UInt glyph = XftCharIndex (disp, f, fc);
1304	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1385	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305		1386
…		…
1320	{	1401	{
1321	if (ep != enc)	1402	if (ep != enc)
1322	{	1403	{
1323	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1404	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324		1405
1325	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1406	#ifdef HAVE_BG_PIXMAP
1326	if (bg < 0 && term->am_pixmap_trans)	1407	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1327	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);	1408
1328	else if (bg < 0 && term->bgPixmap.pixmap)	1409	if (term->bgPixmap.pixmap
		1410	&& (bg == Color_transparent \|\| bg == Color_bg
		1411	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1329	{	1412	{
		1413	int src_x = x, src_y = y;
		1414
		1415	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
		1416	{
		1417	src_x += term->window_vt_x;
		1418	src_y += term->window_vt_y;
		1419	}
		1420
		1421	if (term->bgPixmap.pmap_width >= src_x + w
		1422	&& term->bgPixmap.pmap_height >= src_y + h)
		1423	{
		1424	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1425	src_x, src_y, w, h, 0, 0);
		1426	}
		1427	else
		1428	{
1330	XGCValues gcv;	1429	XGCValues gcv;
1331		1430
1332	gcv.fill_style = FillTiled;	1431	gcv.fill_style = FillTiled;
1333	gcv.tile = term->pixmap;	1432	gcv.tile = term->bgPixmap.pixmap;
1334	gcv.ts_x_origin = -x;	1433	gcv.ts_x_origin = -src_x;
1335	gcv.ts_y_origin = -y;	1434	gcv.ts_y_origin = -src_y;
1336		1435
1337	GC gc2 = XCreateGC (disp, d2,	1436	XChangeGC (disp, gc,
1338	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1437	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1339	&gcv);	1438	&gcv);
1340		1439
1341	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1440	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1342		1441
1343	XFreeGC (disp, gc2);	1442	gcv.fill_style = FillSolid;
		1443	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1444	}
		1445
		1446	if (dst)
		1447	{
		1448	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1449
		1450	// dst can only be set when bg >= 0
		1451	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1452	}
1344	}	1453	}
1345	else	1454	else
1346	#endif	1455	#endif
1347	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1456	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1348		1457
1349	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1458	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1350	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1459	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1351	}	1460	}
1352	else	1461	else
…		…
1377	void	1486	void
1378	rxvt_fontset::clear ()	1487	rxvt_fontset::clear ()
1379	{	1488	{
1380	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1489	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1381	= rxvt_fontprop::unset;	1490	= rxvt_fontprop::unset;
		1491	force_prop = false;
1382		1492
1383	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1493	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1384	FONT_UNREF (*i);	1494	(*i)->unref ();
1385		1495
1386	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1496	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1387	delete *p;	1497	delete *p;
1388		1498
1389	free (fontdesc); fontdesc = 0;	1499	free (fontdesc); fontdesc = 0;
…		…
1391	fonts.clear ();	1501	fonts.clear ();
1392		1502
1393	fallback = fallback_fonts;	1503	fallback = fallback_fonts;
1394	}	1504	}
1395		1505
		1506	void
		1507	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1508	{
		1509	font->set_term (term);
		1510
		1511	font->cs = cs;
		1512	font->loaded = false;
		1513	}
		1514
1396	rxvt_font *	1515	rxvt_font *
1397	rxvt_fontset::new_font (const char *name, codeset cs)	1516	rxvt_fontset::new_font (const char *name, codeset cs)
1398	{	1517	{
1399	rxvt_font *f;	1518	rxvt_font *f;
1400		1519
1401	if (!name \|\| !*name)	1520	if (!name \|\| !*name)
1402	{	1521	{
1403	name = "";	1522	name = "";
1404	f = new rxvt_font_default (this);	1523	f = new rxvt_font_default (this);
1405	}	1524	}
…		…
1416	f = new rxvt_font_x11;	1535	f = new rxvt_font_x11;
1417	}	1536	}
1418	else	1537	else
1419	f = new rxvt_font_x11;	1538	f = new rxvt_font_x11;
1420		1539
1421	f->set_term (term);
1422	f->set_name (strdup (name));	1540	f->set_name (strdup (name));
1423		1541	prepare_font (f, cs);
1424	f->cs = cs;
1425	f->loaded = false;
1426		1542
1427	return f;	1543	return f;
1428	}	1544	}
1429		1545
1430	/////////////////////////////////////////////////////////////////////////////	1546	/////////////////////////////////////////////////////////////////////////////
		1547
		1548	void
		1549	rxvt_fontset::push_font (rxvt_font *font)
		1550	{
		1551	// the fontCount index is reserved for the overflow font, it is only
		1552	// necessary when we get fontCount or more fonts, as they cannot be
		1553	// represented in the rendition.
		1554	if (fonts.size () == fontCount)
		1555	{
		1556	rxvt_font *f = new rxvt_font_overflow (this);
		1557
		1558	prepare_font (f, CS_UNICODE);
		1559	fonts.push_back (f);
		1560	}
		1561
		1562	fonts.push_back (font);
		1563	}
1431		1564
1432	void	1565	void
1433	rxvt_fontset::add_fonts (const char *desc)	1566	rxvt_fontset::add_fonts (const char *desc)
1434	{	1567	{
1435	if (desc)	1568	if (desc)
…		…
1473	if (!end)	1606	if (!end)
1474	end = desc + strlen (desc);	1607	end = desc + strlen (desc);
1475		1608
1476	if (end - desc < 511)	1609	if (end - desc < 511)
1477	{	1610	{
1478	strncpy (buf, desc, end - desc);	1611	memcpy (buf, desc, end - desc);
1479	buf[end - desc] = 0;	1612	buf[end - desc] = 0;
1480		1613
1481	fonts.push_back (new_font (buf, cs));	1614	push_font (new_font (buf, cs));
1482	}	1615	}
1483	else	1616	else
1484	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1617	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1485		1618
1486	desc = end + 1;	1619	desc = end + 1;
…		…
1498	if (fonts[i]->loaded)	1631	if (fonts[i]->loaded)
1499	return true;	1632	return true;
1500		1633
1501	fonts[i]->loaded = true;	1634	fonts[i]->loaded = true;
1502		1635
1503	if (!fonts[i]->load (prop))	1636	if (!fonts[i]->load (prop, force_prop))
1504	{	1637	{
1505	fonts[i]->cs = CS_UNKNOWN;	1638	fonts[i]->cs = CS_UNKNOWN;
1506	return false;	1639	return false;
1507	}	1640	}
1508		1641
…		…
1514	{	1647	{
1515	clear ();	1648	clear ();
1516		1649
1517	fontdesc = strdup (desc);	1650	fontdesc = strdup (desc);
1518		1651
1519	fonts.push_back (new_font (0, CS_UNICODE));	1652	push_font (new_font (0, CS_UNICODE));
1520	realize_font (0);	1653	realize_font (0);
1521		1654
1522	add_fonts (desc);	1655	add_fonts (desc);
1523		1656
1524	return true;	1657	return true;
…		…
1533		1666
1534	return -1;	1667	return -1;
1535	}	1668	}
1536		1669
1537	int	1670	int
1538	rxvt_fontset::find_font (unicode_t unicode)	1671	rxvt_fontset::find_font_idx (unicode_t unicode)
1539	{	1672	{
1540	if (unicode >= 1<<20)	1673	if (unicode >= 1<<20)
1541	return 0;	1674	return 0;
1542		1675
1543	unicode_t hi = unicode >> 8;	1676	unicode_t hi = unicode >> 8;
…		…
1569	goto next_font;	1702	goto next_font;
1570		1703
1571	bool careful;	1704	bool careful;
1572	if (f->has_char (unicode, &prop, careful))	1705	if (f->has_char (unicode, &prop, careful))
1573	{	1706	{
1574	if (careful)	1707	i = (i << 1) \| careful;
1575	i \|= 128;
1576		1708
1577	goto found;	1709	goto found;
1578	}	1710	}
1579		1711
1580	next_font:	1712	next_font:
1581	if (i == fonts.size () - 1)	1713	if (i == fonts.size () - 1)
1582	{	1714	{
1583	if (fallback->name)	1715	if (fallback->name)
1584	{	1716	{
1585	// search through the fallback list	1717	// search through the fallback list
1586	fonts.push_back (new_font (fallback->name, fallback->cs));	1718	push_font (new_font (fallback->name, fallback->cs));
1587	fallback++;	1719	fallback++;
1588	}	1720	}
1589	else	1721	else
1590	{	1722	{
1591	// try to find a new font.	1723	// try to find a new font.
…		…
1622	FcPatternDestroy (match);	1754	FcPatternDestroy (match);
1623		1755
1624	if (find_font (font) < 0)	1756	if (find_font (font) < 0)
1625	{	1757	{
1626	char fontname[4096];	1758	char fontname[4096];
1627	sprintf (fontname, "xft:%-.4090s", font);	1759	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1628		1760
1629	fonts.push_back (new_font (fontname, CS_UNICODE));	1761	push_font (new_font (fontname, CS_UNICODE));
1630	}	1762	}
1631		1763
1632	free (font);	1764	free (font);
1633	}	1765	}
1634	#endif	1766	#endif
…		…
1656	}	1788	}
1657		1789
1658	return i;	1790	return i;
1659	}	1791	}
1660		1792
1661
1662

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs. Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC