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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.4 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.48 by root, Sun Nov 21 20:19:24 2004 UTC

…		…
19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
		24	#include "rxvtutil.h"
24	#include "rxvtfont.h"	25	#include "rxvtfont.h"
25		26
26	#include <cstdlib>	27	#include <cstdlib>
		28	#include <wchar.h>
		29	#include <inttypes.h>
27		30
28	#define DISPLAY r->display->display	31	#define DISPLAY r->display->display
29	#define TGC r->TermWin.gc	32	#define TGC r->TermWin.gc
		33
		34	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
30		35
31	const struct rxvt_fallback_font {	36	const struct rxvt_fallback_font {
32	codeset cs;	37	codeset cs;
33	const char *name;	38	const char *name;
34	} fallback_fonts[] = {	39	} fallback_fonts[] = {
…		…
52	{ CS_ISO8859_10, "----r-------c-*-iso8859-10" },	57	{ CS_ISO8859_10, "----r-------c-*-iso8859-10" },
53	{ CS_ISO8859_11, "----r-------c-*-iso8859-11" },	58	{ CS_ISO8859_11, "----r-------c-*-iso8859-11" },
54	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },	59	{ CS_ISO8859_13, "----r-------c-*-iso8859-13" },
55	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	60	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
56	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	61	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
		62
		63	# if XFT
		64	{ CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" },
		65
		66	{ CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" },
		67	{ CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" },
		68	{ CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" },
		69	{ CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" },
		70	{ CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" },
		71	{ CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" },
		72	{ CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" },
		73	# endif
57	#endif	74	#endif
58		75
59	// japanese	76	// japanese
60	#if ENCODING_JP \|\| ENCODING_JP_EXT	77	#if ENCODING_JP \|\| ENCODING_JP_EXT
61	# if XFT	78	# if XFT
62	// prefer xft for complex scripts	79	// prefer xft for complex scripts
63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	80	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
		81	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
		82	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
		83	{ CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" },
64	# endif	84	# endif
65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	85	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
66	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	86	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	87	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
68	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },	88	{ CS_JIS0201_1976_0, "----r-------c--jisx0201-0" },
69	{ CS_JIS0208_1990_0, "----r-------c--jisx0208-0" },	89	{ CS_JIS0208_1990_0, "----r-------c--jisx0208-0" },
70	{ CS_JIS0212_1990_0, "----r-------c--jisx0212-0" },	90	{ CS_JIS0212_1990_0, "----r-------c--jisx0212-0" },
71	#endif	91	#endif
72		92
73	#if ENCODING_CN \|\| ENCODING_CN_EXT	93	#if ENCODING_ZH \|\| ENCODING_ZH_EXT
74	# if XFT	94	# if XFT
75	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	95	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
76	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	96	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
77	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	97	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
78	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	98	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
		99	{ CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },
79	# endif	100	# endif
80	{ CS_BIG5, "-----------c-*-big5-0" },	101	{ CS_BIG5, "-----------c-*-big5-0" },
81	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },	102	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
82	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },	103	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
83	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },	104	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
…		…
89	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },	110	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
90	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },	111	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
91	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },	112	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
92	#endif	113	#endif
93		114
		115	#if ENCODING_KR
		116	{ CS_KSC5601_1987_0, "-baekmuk-gulim---------c--ksc5601" },
		117	{ CS_KSC5601_1987_0, "-----------c--ksc5601" },
94	#if XFT	118	# if XFT
95	{ CS_UNICODE, "xft:Andale Mono" },	119	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
96	{ CS_UNICODE, "xft:Arial Unicode MS" },	120	{ CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" },
		121	# endif
97	#endif	122	#endif
		123
		124	// generic font fallback
98	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	125	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
99	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	126	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
100	{ CS_UNICODE, "----r-------c--iso10646-1" },	127	{ CS_UNICODE, "----r-------c--iso10646-1" },
101	{ CS_UNICODE, "----r-------m--iso10646-1" },	128	{ CS_UNICODE, "----r-------m--iso10646-1" },
102	#if XFT	129	#if XFT
		130	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},
		131	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
		132	{ CS_UNICODE, "xft:Andale Mono:antialias=false" },
		133	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },
		134
103	// FreeMono is usually uglier than x fonts, so try last only.	135	// FreeMono is usually uglier than x fonts, so try last only.
104	//{ CS_UNICODE, "xft:FreeMono" },	136	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
105	#endif	137	#endif
106		138
107	{ CS_UNKNOWN, 0 }	139	{ CS_UNKNOWN, 0 }
108	};	140	};
		141
		142	// these characters are used to guess the font height and width
		143	// pango uses a similar algorithm and eosn't trust the font either.
		144	static uint16_t extent_test_chars[] = {
		145	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
		146	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
		147	0x304c, 0x672c, // が本
		148	};
		149
		150	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
109		151
110	/////////////////////////////////////////////////////////////////////////////	152	/////////////////////////////////////////////////////////////////////////////
111		153
112	#if XFT	154	#if XFT
113	rxvt_drawable::~rxvt_drawable ()	155	rxvt_drawable::~rxvt_drawable ()
…		…
186		228
187	return (XChar2b *)enc_buf;	229	return (XChar2b *)enc_buf;
188	}	230	}
189		231
190	/////////////////////////////////////////////////////////////////////////////	232	/////////////////////////////////////////////////////////////////////////////
		233
		234	void
		235	rxvt_font::set_name (char *name)
		236	{
		237	if (this->name == name)
		238	return;
		239
		240	if (this->name) free (this->name); // let the compiler optimize
		241	this->name = name;
		242	}
191		243
192	void	244	void
193	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)	245	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
194	{	246	{
195	if (color == Color_bg)	247	if (color == Color_bg)
…		…
206	}	258	}
207		259
208	#include "table/linedraw.h"	260	#include "table/linedraw.h"
209		261
210	struct rxvt_font_default : rxvt_font {	262	struct rxvt_font_default : rxvt_font {
		263	struct rxvt_fontset *fs;
		264
		265	rxvt_font_default (rxvt_fontset *fs)
		266	: rxvt_font ()
		267	{
		268	this->fs = fs;
		269	}
211		270
212	rxvt_fontprop properties ()	271	rxvt_fontprop properties ()
213	{	272	{
214	rxvt_fontprop p;	273	rxvt_fontprop p;
215		274
…		…
223	bool load (const rxvt_fontprop &prop)	282	bool load (const rxvt_fontprop &prop)
224	{	283	{
225	width = 1; height = 1;	284	width = 1; height = 1;
226	ascent = 1; descent = 0;	285	ascent = 1; descent = 0;
227		286
228	set_name (strdup ("built-in pseudofont"));	287	set_name (strdup ("built-in support font"));
229		288
230	return true;	289	return true;
231	}	290	}
232		291
233	bool has_codepoint (unicode_t unicode)	292	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
234	{	293	{
		294	careful = false;
		295
235	if (unicode <= 0x001f)	296	if (unicode <= 0x001f)
236	return true;	297	return true;
237		298
238	if (unicode <= 0x007f)	299	if (unicode <= 0x007f)
239	return false;	300	return false;
…		…
248	return true;	309	return true;
249		310
250	switch (unicode)	311	switch (unicode)
251	{	312	{
252	case ZERO_WIDTH_CHAR:	313	case ZERO_WIDTH_CHAR:
		314	case NOCHAR:
253	return true;	315	return true;
254	}	316	}
255		317
256	return false;	318	return false;
257	}	319	}
…		…
356	}	418	}
357	}	419	}
358	#if ENABLE_COMBINING	420	#if ENABLE_COMBINING
359	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	421	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360	{	422	{
		423	text_t c2[2];
		424	int len2 = 1;
		425
		426	// support double-width (but not more) combining characters
		427	if (len && *text == NOCHAR)
		428	{
		429	c2[1] = *text; // not text++ to get correct x-width
		430	len2++;
		431	}
		432
		433	c2[0] = cc->c1;
361	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	434	rxvt_font f1 = (fs)[fs->find_font (c2[0])];
362	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);	435	f1->draw (d, x, y, c2, len2, fg, bg);
		436
363	if (cc->c2 != NOCHAR)	437	if (cc->c2 != NOCHAR)
364	{	438	{
		439	bool careful;
		440
365	// prefer font of first character, for no good reasons	441	// prefer font of first character, for no good reasons
366	rxvt_font *f2 = f1->has_codepoint (cc->c2)	442	c2[0] = cc->c2;
		443	rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful)
367	? f1	444	? f1
368	: (*fs)[fs->find_font (cc->c2)];	445	: (*fs)[fs->find_font (c2[0])];
369		446
370	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);	447	f2->draw (d, x, y, c2, len2, fg, -1);
371	}	448	}
372	}	449	}
373	#endif	450	#endif
374	else	451	else
375	switch (t)	452	switch (t)
376	{	453	{
		454	case '\t':
377	case ZERO_WIDTH_CHAR:	455	case ZERO_WIDTH_CHAR:
		456	case NOCHAR:
378	break;	457	break;
379		458
380	default:	459	default:
381	int w = 0;	460	int w = 0;
382	while (len > 0 && *text == NOCHAR)	461	while (len > 0 && *text == NOCHAR)
…		…
404		483
405	rxvt_fontprop properties ();	484	rxvt_fontprop properties ();
406		485
407	bool load (const rxvt_fontprop &prop);	486	bool load (const rxvt_fontprop &prop);
408		487
409	bool has_codepoint (unicode_t unicode);	488	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);
410		489
411	void draw (rxvt_drawable &d, int x, int y,	490	void draw (rxvt_drawable &d, int x, int y,
412	const text_t *text, int len,	491	const text_t *text, int len,
413	int fg, int bg);	492	int fg, int bg);
414		493
		494	bool slow; // wether this is a proportional font or has other funny characteristics
415	XFontStruct *f;	495	XFontStruct *f;
416	codeset cs;	496	codeset cs;
417	bool enc2b, encm;	497	bool enc2b, encm;
418		498
419	char get_property (XFontStruct f, const char property, const char repl) const;	499	char get_property (XFontStruct f, const char property, const char repl) const;
…		…
442	}	522	}
443		523
444	bool	524	bool
445	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	525	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
446	{	526	{
447	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	527	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
448	p.height = height;	528	p.height = height;
449	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	529	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
450	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	530	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451		531
452	return true;	532	return true;
…		…
508	else	588	else
509	return false;	589	return false;
510	}	590	}
511		591
512	// fix the size of scalable fonts	592	// fix the size of scalable fonts
513	static void	593	static bool
514	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)	594	replace_field (char buf, const char name, int index, const char old, const char *replace)
515	{	595	{
516	int slashes = 0;	596	int slashes = 0;
517	const char *size;	597	const char field, end;
518		598
519	for (const char c = name; c; c++)	599	for (const char c = name; c; c++)
520	if (*c == '-')	600	if (*c == '-')
521	{	601	{
522	if (slashes == 6)	602	if (slashes == index)
523	size = c + 1;	603	field = c + 1;
		604
		605	if (slashes == index + 1)
		606	end = c;
524		607
525	if (++slashes >= 13)	608	if (++slashes >= 13)
526	break;	609	break;
527	}	610	}
528		611
529	if (slashes >= 13 && size[0] == '0')	612	if (slashes >= 13 && (!old \|\| *field == old))
530	{	613	{
		614	// TODO: check for overflow in font-name
531	strncpy (buf, name, size - name);	615	strncpy (buf, name, field - name);
532	buf += size - name;	616	buf += field - name;
533	buf += sprintf (buf, "%d", prop.height);
534	strcpy (buf, size + 1);	617	strcpy (buf, replace);
		618	strcat (buf, end);
		619
		620	return true;
535	}	621	}
536	else	622	else
		623	{
537	strcpy (buf, name);	624	strcpy (buf, name);
		625
		626	return false;
		627	}
538	}	628	}
539		629
540	bool	630	bool
541	rxvt_font_x11::load (const rxvt_fontprop &prop)	631	rxvt_font_x11::load (const rxvt_fontprop &prop)
542	{	632	{
543	clear ();	633	clear ();
		634
		635	char field_str[64]; // enough for 128 bits
		636
		637	// first morph the font if required
		638	if (prop.weight != rxvt_fontprop::unset
		639	\|\| prop.slant != rxvt_fontprop::unset)
		640	{
		641	char fname[1024];
		642
		643	if (name[0] != '-')
		644	{
		645	f = XLoadQueryFont (DISPLAY, name);
		646
		647	if (!f)
		648	return false;
		649
		650	char *new_name = get_property (f, "FONT", name);
		651
		652	if (new_name)
		653	set_name (new_name);
		654	else
		655	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
		656
		657	XFreeFont (DISPLAY, f);
		658	f = 0;
		659	}
		660
		661	if (prop.weight != rxvt_fontprop::unset)
		662	{
		663	replace_field (fname, name, 2, 0,
		664	prop.weight < rxvt_fontprop::bold
		665	? "medium" : "bold");
		666	set_name (strdup (fname));
		667	}
		668
		669	if (prop.slant != rxvt_fontprop::unset)
		670	{
		671	replace_field (fname, name, 3, 0,
		672	prop.slant < rxvt_fontprop::italic
		673	? "r" : "i"); // TODO: handle "o"blique, too
		674	set_name (strdup (fname));
		675	}
		676	}
544		677
545	char **list;	678	char **list;
546	int count;	679	int count;
547	list = XListFonts (DISPLAY, name, 1024, &count);	680	list = XListFonts (DISPLAY, name, 1024, &count);
		681
548	set_name (0);	682	set_name (0);
549		683
550	if (!list)	684	if (!list)
551	return false;	685	return false;
552		686
		687	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
		688	? 0 : prop.height);
		689
553	int bestdiff = 0x7fffffff;	690	int bestdiff = 0x7fffffff;
554	for (int i = 0; i < count; i++)	691	for (int i = 0; i < count; i++)
555	{	692	{
556	rxvt_fontprop p;	693	rxvt_fontprop p;
557	char fname[1024];	694	char fname[1024];
558	fix_scalable (fname, list[i], prop);	695
		696	int diff = 0;
		697
		698	if (replace_field (fname, list[i], 6, '0', field_str))
		699	diff += 10; // slightly penalize scalable fonts
559		700
560	if (!set_properties (p, fname))	701	if (!set_properties (p, fname))
561	continue;	702	continue;
562		703
		704	if (prop.height != rxvt_fontprop::unset
563	if (p.height > prop.height) // weed out too large fonts	705	&& p.height > prop.height) // weed out too large fonts
564	continue;	706	continue;
565		707
566	int diff = (prop.height - p.height) * 32	708	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567	+ abs (prop.weight - p.weight)	709	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568	+ abs (prop.slant - p.slant );	710	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
		711	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569		712
570	if (!name // compare against best found so far	713	if (!name // compare against best found so far
571	\|\| diff < bestdiff)	714	\|\| diff < bestdiff)
572	{	715	{
573	set_name (strdup (fname));	716	set_name (strdup (fname));
…		…
617	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	760	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618		761
619	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	762	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
620	enc2b = encm \|\| f->max_char_or_byte2 > 255;	763	enc2b = encm \|\| f->max_char_or_byte2 > 255;
621		764
622	ascent = f->ascent;	765	ascent = f->ascent;
623	descent = f->descent;	766	descent = f->descent;
624	height = ascent + descent;	767	height = ascent + descent;
625		768
626	slow = false;	769	slow = false;
627		770
		771	#if 1 // only used for slow detection, TODO optimize
628	if (f->min_bounds.width == f->max_bounds.width)	772	if (f->min_bounds.width == f->max_bounds.width)
629	width = f->min_bounds.width;	773	width = f->min_bounds.width;
630	else if (f->per_char == NULL)	774	else if (f->per_char == NULL)
631	width = f->max_bounds.width;	775	width = f->max_bounds.width;
632	else	776	else
…		…
645	width = f->per_char[N].width;	789	width = f->per_char[N].width;
646		790
647	--N;	791	--N;
648	}	792	}
649	}	793	}
		794	#endif
		795
		796	width = 1;
		797
		798	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		799	{
		800	if (cs != CS_UNICODE
		801	&& *t > 0x100
		802	&& FROM_UNICODE (cs, *t) == NOCHAR)
		803	continue;
		804
		805	// ignore characters we wouldn't use anyways
		806	bool careful;
		807	if (!has_char (*t, &prop, careful))
		808	continue;
		809
		810	XChar2b ch = { t >> 8, t };
		811
		812	XCharStruct g;
		813	int dir_ret, asc_ret, des_ret;
		814	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
		815
		816	int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw;
		817
		818	if (width < g.width) width = g.width;
		819	}
650		820
651	if (cs == CS_UNKNOWN)	821	if (cs == CS_UNKNOWN)
652	{	822	{
653	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	823	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654		824
655	clear ();	825	clear ();
656
657	return false;	826	return false;
658	}	827	}
		828
		829	#if 0 // do it per-character
		830	if (prop && width > prop->width)
		831	{
		832	clear ();
		833	return false;
		834	}
		835	#endif
659		836
660	return true;	837	return true;
661	}	838	}
662		839
663	void	840	void
…		…
669	f = 0;	846	f = 0;
670	}	847	}
671	}	848	}
672		849
673	bool	850	bool
674	rxvt_font_x11::has_codepoint (unicode_t unicode)	851	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
675	{	852	{
676	uint32_t ch = FROM_UNICODE (cs, unicode);	853	uint32_t ch = FROM_UNICODE (cs, unicode);
677		854
678	if (ch == NOCHAR)	855	if (ch == NOCHAR)
679	return false;	856	return false;
…		…
688		865
689	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	866	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
690	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	867	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
691	return false;	868	return false;
692		869
693	if (!f->per_char)	870	if (f->per_char)
694	return true;	871	{
695
696	int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;	872	int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;
697	int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;	873	int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698		874
699	xcs = f->per_char + N;	875	xcs = f->per_char + N;
		876	}
		877	else
		878	xcs = &f->max_bounds;
700	}	879	}
701	else	880	else
702	{	881	{
703	if (ch < f->min_char_or_byte2 \|\| ch > f->max_char_or_byte2)	882	if (ch < f->min_char_or_byte2 \|\| ch > f->max_char_or_byte2)
704	return false;	883	return false;
705		884
706	if (!f->per_char)	885	if (f->per_char)
707	return true;
708
709	xcs = f->per_char + (ch - f->min_char_or_byte2);	886	xcs = f->per_char + (ch - f->min_char_or_byte2);
		887	else
		888	xcs = &f->max_bounds;
710	}	889	}
711		890
712	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0	891	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713	&& xcs->ascent == 0 && xcs->descent == 0)	892	&& xcs->ascent == 0 && xcs->descent == 0)
		893	return false;
		894
		895	if (!prop \|\| prop->width == rxvt_fontprop::unset)
		896	return true;
		897
		898	// check character against base font bounding box
		899	int w = xcs->width;
		900	int wcw = wcwidth (unicode);
		901	if (wcw > 0) w /= wcw;
		902
		903	careful = w > prop->width;
		904	if (careful && w > prop->width * MAX_OVERLAP >> 2)
714	return false;	905	return false;
715		906
716	return true;	907	return true;
717	}	908	}
718		909
…		…
728		919
729	bool slow = this->slow	920	bool slow = this->slow
730	\|\| width != r->TermWin.fwidth	921	\|\| width != r->TermWin.fwidth
731	\|\| height != r->TermWin.fheight;	922	\|\| height != r->TermWin.fheight;
732		923
733	int base = r->TermWin.fbase;	924	int base = ascent; // sorry, incorrect: r->TermWin.fbase;
734		925
735	XGCValues v;	926	XGCValues v;
736	v.foreground = r->pix_colors[fg];	927	v.foreground = r->pix_colors[fg];
737	v.font = f->fid;	928	v.font = f->fid;
738		929
…		…
803	}	994	}
804		995
805	/////////////////////////////////////////////////////////////////////////////	996	/////////////////////////////////////////////////////////////////////////////
806		997
807	#if XFT	998	#if XFT
808	#if 0
809	#define UNIBITS 21
810	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
811	#define SWATHBITS 8
812	#endif
813		999
814	struct rxvt_font_xft : rxvt_font {	1000	struct rxvt_font_xft : rxvt_font {
815	rxvt_font_xft () { f = 0; }	1001	rxvt_font_xft () { f = 0; }
816		1002
817	void clear ();	1003	void clear ();
…		…
822		1008
823	void draw (rxvt_drawable &d, int x, int y,	1009	void draw (rxvt_drawable &d, int x, int y,
824	const text_t *text, int len,	1010	const text_t *text, int len,
825	int fg, int bg);	1011	int fg, int bg);
826		1012
827	bool has_codepoint (unicode_t unicode);	1013	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);
828		1014
829	protected:	1015	protected:
830	XftFont *f;	1016	XftFont *f;
831	};	1017	};
832		1018
…		…
860	}	1046	}
861		1047
862	bool	1048	bool
863	rxvt_font_xft::load (const rxvt_fontprop &prop)	1049	rxvt_font_xft::load (const rxvt_fontprop &prop)
864	{	1050	{
865	#if 0
866	for (int i = 0; i < SWATHCOUNT; i++)
867	cvr[i] = 0;
868	#endif
869
870	clear ();	1051	clear ();
871		1052
872	FcPattern p = FcNameParse ((FcChar8 ) name);	1053	FcPattern p = FcNameParse ((FcChar8 ) name);
873		1054
874	if (!p)	1055	if (!p)
875	return false;	1056	return false;
876		1057
877	FcValue v;	1058	FcValue v;
878		1059
		1060	if (prop.height != rxvt_fontprop::unset
879	if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)	1061	\|\| FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
880	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1062	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881		1063
		1064	if (prop.weight != rxvt_fontprop::unset
882	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1065	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
883	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1066	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884		1067
		1068	if (prop.slant != rxvt_fontprop::unset
885	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1069	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
886	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1070	FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889	FcPatternAddBool (p, FC_MINSPACE, 1);
890		1071
891	#if 0 // clipping unfortunately destroys our precious double-width-characters	1072	#if 0 // clipping unfortunately destroys our precious double-width-characters
892	// clip width, we can't do better, or can we?	1073	// clip width, we can't do better, or can we?
893	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1074	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);	1075	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895	#endif	1076	#endif
		1077
		1078	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
		1079	FcPatternAddBool (p, FC_MINSPACE, 1);
		1080
		1081	// store generated name so iso14755 view gives better results
		1082	set_name ((char *)FcNameUnparse (p));
896		1083
897	XftResult result;	1084	XftResult result;
898	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1085	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
899		1086
900	FcPatternDestroy (p);	1087	FcPatternDestroy (p);
901		1088
902	if (!match)	1089	if (!match)
903	return false;	1090	return false;
904		1091
905	f = XftFontOpenPattern (DISPLAY, match);
906
907	if (!f)
908	{
909	FcPatternDestroy (match);
910	return false;
911	}
912
913	FT_Face face = XftLockFace (f);
914
915	slow = !FT_IS_FIXED_WIDTH (face);
916
917	int ftheight = 0;	1092	int ftheight = 0;
		1093	bool success = true;
918		1094
919	for (;;)	1095	for (;;)
920	{	1096	{
921	XGlyphInfo g1, g2;	1097	f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match));
922	FcChar8 c;
923		1098
924	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	1099	if (!f)
925	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	1100	{
		1101	success = false;
		1102	break;
		1103	}
926		1104
927	if (g1.xOff != g2.xOff) // don't simply trust the font	1105	FT_Face face = XftLockFace (f);
928	slow = true;
929		1106
930	width = g2.xOff;
931	ascent = (face->size->metrics.ascender + 63) >> 6;	1107	ascent = (face->size->metrics.ascender + 63) >> 6;
932	descent = (-face->size->metrics.descender + 63) >> 6;	1108	descent = (-face->size->metrics.descender + 63) >> 6;
933	height = ascent + descent;	1109	height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
		1110	width = 0;
934		1111
935	if (height <= prop.height \|\| !prop.height)	1112	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
		1113
		1114	XftUnlockFace (f);
		1115
		1116	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		1117	{
		1118	FcChar16 ch = *t;
		1119
		1120	if (cs != CS_UNICODE
		1121	&& ch > 0x100
		1122	&& FROM_UNICODE (cs, ch) == NOCHAR)
		1123	continue;
		1124
		1125	// ignore characters we wouldn't use anyways
		1126	bool careful;
		1127	if (!has_char (*t, &prop, careful))
		1128	continue;
		1129
		1130	XGlyphInfo g;
		1131	XftTextExtents16 (DISPLAY, f, &ch, 1, &g);
		1132
		1133	int wcw = wcwidth (ch);
		1134	if (wcw > 0) g.width = g.width / wcw;
		1135
		1136	if (width < g.width) width = g.width;
		1137	if (height < g.height) height = g.height;
		1138	}
		1139
		1140	if (prop.height == rxvt_fontprop::unset
		1141	\|\| height <= prop.height
		1142	\|\| height <= 2
		1143	\|\| !scalable)
936	break;	1144	break;
937		1145
938	if (ftheight)	1146	if (ftheight)
939	{	1147	{
940	// take smaller steps near the end	1148	// take smaller steps near the end
941	if (height > prop.height + 1) ftheight++;	1149	if (height > prop.height + 1) ftheight++;
942	if (height > prop.height + 2) ftheight++;	1150	if (height > prop.height + 2) ftheight++;
943	if (height > prop.height + 3) ftheight++;	1151	if (height > prop.height + 3) ftheight++;
944		1152
945	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);	1153	ftheight -= height - prop.height;
946	}	1154	}
947	else	1155	else
948	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);	1156	ftheight = prop.height - 1;
		1157
		1158	XftFontClose (DISPLAY, f);
		1159	FcPatternDel (match, FC_PIXEL_SIZE);
		1160	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
		1161	}
		1162
		1163	FcPatternDestroy (match);
		1164
		1165	#if 0 // do it per-character
		1166	if (prop.width != rxvt_fontprop::unset && width > prop.width)
949	}	1167	{
		1168	clear ();
		1169	success = false;
		1170	}
		1171	#endif
950		1172
951	XftUnlockFace (f);	1173	return success;
		1174	}
		1175
		1176	bool
		1177	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
		1178	{
		1179	careful = false;
		1180
		1181	if (!XftCharExists (DISPLAY, f, unicode))
		1182	return false;
		1183
		1184	if (!prop \|\| prop->width == rxvt_fontprop::unset)
		1185	return true;
		1186
		1187	// check character against base font bounding box
		1188	FcChar32 ch = unicode;
		1189	XGlyphInfo g;
		1190	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
		1191
		1192	int w = g.width;
		1193	int wcw = wcwidth (unicode);
		1194	if (wcw > 0) w /= wcw;
		1195
		1196	careful = w > prop->width;
		1197	if (careful && w > prop->width * MAX_OVERLAP >> 2)
		1198	return false;
952		1199
953	return true;	1200	return true;
954	}
955
956	bool
957	rxvt_font_xft::has_codepoint (unicode_t unicode)
958	{
959	return XftCharExists (DISPLAY, f, unicode);
960	}	1201	}
961		1202
962	void	1203	void
963	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1204	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964	const text_t *text, int len,	1205	const text_t *text, int len,
965	int fg, int bg)	1206	int fg, int bg)
966	{	1207	{
967	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1208	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
968		1209
969	if (!slow && width == r->TermWin.fwidth && 0)	1210	int base = ascent; // should be fbase, but that is incorrect
		1211
		1212	XGlyphInfo extents;
		1213	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));
		1214	FcChar32 *ep = enc;
		1215	int ewidth = 0;
		1216	int xoff = 0;
		1217
		1218	while (len)
970	{	1219	{
971	if (sizeof (text_t) == sizeof (FcChar16))	1220	int cwidth = r->TermWin.fwidth;
972	XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	1221	FcChar32 fc = *text++; len--;
		1222	FT_UInt gl;
		1223
		1224	while (len && *text == NOCHAR)
		1225	text++, len--, cwidth += r->TermWin.fwidth;
		1226
		1227	gl = XftCharIndex (d.display->display, f, fc);
		1228	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
		1229
		1230	if (extents.xOff != cwidth && ep != enc)
		1231	{
		1232	if (xoff > ewidth) xoff = ewidth;
		1233	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
		1234	x + (ewidth - xoff >> 1),
		1235	y + base, enc, ep - enc);
		1236	x += ewidth;
		1237
		1238	ep = enc;
		1239	ewidth = 0;
		1240	xoff = 0;
		1241	}
		1242
		1243	if (fc == ' ' && ep == enc) // skip leading spaces
		1244	{
		1245	x += cwidth;
		1246	continue;
		1247	}
		1248
973	else	1249	else
974	XftDrawString32 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
975	}
976	else
977	{
978	while (len)
979	{
980	if (text != NOCHAR && text != ' ')
981	{
982	int fwidth = r->TermWin.fwidth;
983	if (len >= 2 && text[1] == NOCHAR)
984	fwidth *= 2;
985
986	XGlyphInfo extents;
987	if (sizeof (text_t) == sizeof (FcChar16))
988	{
989	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
990	XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
991	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
992	}
993	else
994	{
995	XGlyphInfo extents;
996	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
997	XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
998	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
999	}
1000	}
1001
1002	x += r->TermWin.fwidth;
1003	text++;
1004	len--;
1005	}	1250	{
		1251	*ep++ = gl;
		1252	ewidth += cwidth;
		1253	xoff += extents.xOff;
		1254	}
		1255	}
		1256
		1257	if (ep != enc)
		1258	{
		1259	if (xoff > ewidth) xoff = ewidth;
		1260	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
		1261	x + (ewidth - xoff >> 1),
		1262	y + base, enc, ep - enc);
1006	}	1263	}
1007	}	1264	}
1008	#endif	1265	#endif
1009		1266
1010	/////////////////////////////////////////////////////////////////////////////	1267	/////////////////////////////////////////////////////////////////////////////
…		…
1021	}	1278	}
1022		1279
1023	void	1280	void
1024	rxvt_fontset::clear ()	1281	rxvt_fontset::clear ()
1025	{	1282	{
		1283	prop.width = prop.height = prop.weight = prop.slant
		1284	= rxvt_fontprop::unset;
		1285
1026	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1286	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027	FONT_UNREF (*i);	1287	FONT_UNREF (*i);
1028		1288
		1289	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
		1290	delete *p;
		1291
1029	free (fontdesc); fontdesc = 0;	1292	free (fontdesc); fontdesc = 0;
1030		1293
1031	fonts.clear ();	1294	fonts.clear ();
1032	base_id = 0;
1033	base_prop.height = 0x7fffffff;
1034	base_prop.weight = rxvt_fontprop::medium;
1035	base_prop.slant = rxvt_fontprop::roman;
1036		1295
1037	fallback = fallback_fonts;	1296	fallback = fallback_fonts;
1038	}	1297	}
1039		1298
1040	rxvt_font *	1299	rxvt_font *
…		…
1043	rxvt_font *f;	1302	rxvt_font *f;
1044		1303
1045	if (!name \|\| !*name)	1304	if (!name \|\| !*name)
1046	{	1305	{
1047	name = "";	1306	name = "";
1048	f = new rxvt_font_default;	1307	f = new rxvt_font_default (this);
1049	}	1308	}
1050	#if XFT	1309	#if XFT
1051	else if (!strncmp (name, "xft:", 4))	1310	else if (!strncmp (name, "xft:", 4))
1052	{	1311	{
1053	name += 4;	1312	name += 4;
1054	f = new rxvt_font_xft;	1313	f = new rxvt_font_xft ();
1055	}	1314	}
1056	#endif	1315	#endif
1057	else if (!strncmp (name, "x:", 2))	1316	else if (!strncmp (name, "x:", 2))
1058	{	1317	{
1059	name += 2;	1318	name += 2;
1060	f = new rxvt_font_x11;	1319	f = new rxvt_font_x11;
1061	}	1320	}
1062	else	1321	else
1063	f = new rxvt_font_x11;	1322	f = new rxvt_font_x11;
1064		1323
1065	f->fs = this;
1066	f->set_term (r);	1324	f->set_term (r);
1067	f->set_name (strdup (name));	1325	f->set_name (strdup (name));
1068		1326
1069	f->cs = cs;	1327	f->cs = cs;
1070	f->loaded = false;	1328	f->loaded = false;
…		…
1084		1342
1085	do	1343	do
1086	{	1344	{
1087	while (*desc <= ' ') desc++;	1345	while (*desc <= ' ') desc++;
1088		1346
		1347	codeset cs = CS_UNICODE;
		1348
1089	if (*desc == '[')	1349	if (*desc == '[')
1090	{	1350	{
1091	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1351	char spec[256];
1092
1093	//const char *extra = desc++; // not yet used	1352	const char *extra = ++desc; // not yet used
1094		1353
1095	desc = strchr (desc, ']');	1354	desc = strchr (desc, ']');
1096		1355
1097	if (!desc)	1356	if (!desc)
1098	{	1357	{
1099	fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n");	1358	rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100	break;	1359	break;
1101	}	1360	}
		1361
		1362	memcpy (spec, extra, min (desc - extra, 255));
		1363	spec[min (desc - extra, 255)] = 0;
		1364
		1365	if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
		1366	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
		1367	else
		1368	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102		1369
1103	desc++;	1370	desc++;
1104	while (*desc <= ' ') desc++;	1371	while (*desc <= ' ') desc++;
1105	}	1372	}
1106		1373
…		…
1111	if (end - desc < 511)	1378	if (end - desc < 511)
1112	{	1379	{
1113	strncpy (buf, desc, end - desc);	1380	strncpy (buf, desc, end - desc);
1114	buf[end - desc] = 0;	1381	buf[end - desc] = 0;
1115		1382
1116	fonts.push_back (new_font (buf, CS_UNICODE));	1383	fonts.push_back (new_font (buf, cs));
1117	}	1384	}
		1385	else
		1386	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118		1387
1119	desc = end + 1;	1388	desc = end + 1;
1120	}	1389	}
1121	while (*end);	1390	while (*end);
1122	}	1391	}
1123	}	1392	}
1124		1393
1125	bool	1394	bool
1126	rxvt_fontset::realize_font (int i)	1395	rxvt_fontset::realize_font (int i)
1127	{	1396	{
		1397	if (i < 0 \|\| i >= fonts.size ())
		1398	return false;
		1399
1128	if (fonts[i]->loaded)	1400	if (fonts[i]->loaded)
1129	return true;	1401	return true;
1130		1402
1131	fonts[i]->loaded = true;	1403	fonts[i]->loaded = true;
1132		1404
1133	if (!fonts[i]->load (base_prop))	1405	if (!fonts[i]->load (prop))
1134	{	1406	{
1135	fonts[i]->cs = CS_UNKNOWN;	1407	fonts[i]->cs = CS_UNKNOWN;
1136	return false;	1408	return false;
1137	}	1409	}
1138		1410
…		…
1148		1420
1149	fonts.push_back (new_font (0, CS_UNICODE));	1421	fonts.push_back (new_font (0, CS_UNICODE));
1150	realize_font (0);	1422	realize_font (0);
1151		1423
1152	add_fonts (desc);	1424	add_fonts (desc);
1153
1154	if (!base_id)
1155	base_id = 1;
1156
1157	// we currently need a base-font, no matter what
1158	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1159	{
1160	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1161	add_fonts ("fixed");
1162	base_id = fonts.size () - 1;
1163	}
1164
1165	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1166	return false;
1167
1168	base_prop = fonts[base_id]->properties ();
1169		1425
1170	return true;	1426	return true;
1171	}	1427	}
1172		1428
1173	int	1429	int
…		…
1179		1435
1180	return -1;	1436	return -1;
1181	}	1437	}
1182		1438
1183	int	1439	int
1184	rxvt_fontset::find_font (unicode_t unicode, bool bold)	1440	rxvt_fontset::find_font (unicode_t unicode)
1185	{	1441	{
		1442	if (unicode >= 1<<20)
		1443	return 0;
1186		1444
1187	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii	1445	unicode_t hi = unicode >> 8;
1188	i < fonts.size ();	1446
1189	i++)	1447	if (hi < fmap.size ()
		1448	&& fmap[hi]
		1449	&& (*fmap[hi])[unicode & 0xff] != 0xff)
		1450	return (*fmap[hi])[unicode & 0xff];
		1451
		1452	unsigned int i;
		1453
		1454	for (i = 0; i < fonts.size (); i++)
1190	{	1455	{
1191	rxvt_font *f = fonts[i];	1456	rxvt_font *f = fonts[i];
1192		1457
1193	if (!f->loaded)	1458	if (!f->loaded)
1194	{	1459	{
…		…
1200	}	1465	}
1201		1466
1202	if (f->cs == CS_UNKNOWN)	1467	if (f->cs == CS_UNKNOWN)
1203	goto next_font;	1468	goto next_font;
1204		1469
1205	if (bold && f->properties ().weight < rxvt_fontprop::bold)	1470	bool careful;
		1471	if (f->has_char (unicode, &prop, careful))
		1472	{
		1473	if (careful)
		1474	i \|= 128;
		1475
1206	goto next_font;	1476	goto found;
1207		1477	}
1208	if (f->has_codepoint (unicode))
1209	return i;
1210		1478
1211	next_font:	1479	next_font:
1212	if (i == fonts.size () - 1)	1480	if (i == fonts.size () - 1)
1213	{	1481	{
1214	if (fallback->name)	1482	if (fallback->name)
1215	{	1483	{
1216	// search through the fallback list	1484	// search through the fallback list
1217	fonts.push_back (new_font (fallback->name, fallback->cs));	1485	fonts.push_back (new_font (fallback->name, fallback->cs));
1218	fallback++;	1486	fallback++;
1219	}	1487	}
1220	else if (!bold)	1488	else
1221	{	1489	{
1222	// try to find a new font.	1490	// try to find a new font.
1223	// only xft currently supported, as there is no	1491	// only xft currently supported, as there is no
1224	// way to configure this and xft is easier to hack in,	1492	// way to configure this and xft is easier to hack in,
1225	// while x11 has more framework in place already.	1493	// while x11 has more framework in place already.
1226	#if XFT	1494	// TODO: this is a real resource hog, xft takes ages(?)
		1495	#if XFT && USE_SLOW_LOOKUP
1227	// grab the first xft font that seems suitable	1496	// grab the first xft font that seems suitable
1228	FcPattern *p = FcPatternCreate ();	1497	FcPattern *p = FcPatternCreate ();
1229		1498
1230	FcCharSet *s = FcCharSetCreate ();	1499	FcCharSet *s = FcCharSetCreate ();
1231	FcCharSetAddChar (s, unicode);	1500	FcCharSetAddChar (s, unicode);
1232	FcPatternAddCharSet (p, FC_CHARSET, s);	1501	FcPatternAddCharSet (p, FC_CHARSET, s);
1233	// charsets don't help that much, as xft might return	1502	// charsets don't help that much, as xft might return
1234	// a non-matching font even if a better font is available :/	1503	// a non-matching font even if a better font is available :/
1235		1504
		1505	x x x x TODO prop might have unset contents
1236	FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);	1506	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237	FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);	1507	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238	FcPatternAddInteger (p, FC_SLANT, base_prop.slant);	1508	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239	FcPatternAddBool (p, FC_MINSPACE, 1);	1509	FcPatternAddBool (p, FC_MINSPACE, 1);
1240	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1510	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241		1511
1242	XftResult result;	1512	XftResult result;
1243	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1513	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
…		…
1263	#endif	1533	#endif
1264	}	1534	}
1265	}	1535	}
1266	}	1536	}
1267		1537
1268	// if no bold font found, use a regular one	1538	/* we must return SOME font */
1269	if (bold)	1539	i = 0;
1270	return find_font (unicode);
1271		1540
1272	return 0; /* we must return SOME font */	1541	found:
1273	}	1542	// found a font, cache it
		1543	if (i < 255)
		1544	{
		1545	while (hi >= fmap.size ())
		1546	fmap.push_back (0);
1274		1547
		1548	if (!fmap[hi])
		1549	{
		1550	fmap[hi] = (pagemap *)new pagemap;
		1551	memset (fmap[hi], 0xff, sizeof (pagemap));
		1552	}
1275		1553
		1554	(*fmap[hi])[unicode & 0xff] = i;
		1555	}
1276		1556
		1557	return i;
		1558	}
		1559
		1560
		1561

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.4 by root, Mon Aug 16 12:04:57 2004 UTC vs. Revision 1.48 by root, Sun Nov 21 20:19:24 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.4 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.48 by root, Sun Nov 21 20:19:24 2004 UTC