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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.5 by root, Tue Aug 17 01:29:12 2004 UTC vs. Revision 1.56 by root, Fri Dec 10 19:55:55 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.5 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.56 by root, Fri Dec 10 19:55:55 2004 UTC