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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.3 by root, Sun Aug 15 21:55:45 2004 UTC vs.
Revision 1.74 by root, Tue Dec 6 15:41:26 2005 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: defaultfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2004 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
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	* GNU General Public License for more details.	15	* GNU General Public License for more details.
16	*	16	*
17	* You should have received a copy of the GNU General Public License	17	* You should have received a copy of the GNU General Public License
18	* along with this program; if not, write to the Free Software	18	* along with this program; if not, write to the Free Software
19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 "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:autohint=false" },
		138	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=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 doesn'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	}
…		…
264	void	331	void
265	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	332	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
266	const text_t *text, int len,	333	const text_t *text, int len,
267	int fg, int bg)	334	int fg, int bg)
268	{	335	{
		336	Display *disp = d.display->display;
		337
269	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	338	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
270		339
271	XSetForeground (d.display->display, TGC, r->pix_colors[fg]);	340	XSetForeground (disp, TGC, r->pix_colors[fg]);
272		341
273	while (len--)	342	while (len)
274	{	343	{
275	#if ENABLE_COMBINING	344	#if ENABLE_COMBINING
276	compose_char *cc;	345	compose_char *cc;
277	#endif	346	#endif
		347	const text_t *tp = text;
278	text_t t = *text++;	348	text_t t = *tp;
		349
		350	while (++text, --len && *text == NOCHAR)
		351	;
		352
		353	int width = text - tp;
		354	int fwidth = r->TermWin.fwidth * width;
279		355
280	if (0x2500 <= t && t <= 0x259f)	356	if (0x2500 <= t && t <= 0x259f)
281	{	357	{
282	uint16_t offs = linedraw_offs[t - 0x2500];	358	uint16_t offs = linedraw_offs[t - 0x2500];
283	uint32_t *a = linedraw_command + (offs >> 4);	359	uint32_t *a = linedraw_command + (offs >> 4);
284	uint32_t *b = a + (offs & 15);	360	uint32_t *b = a + (offs & 15);
285		361
286	int W = r->TermWin.fwidth;	362	int W = fwidth;
287	int H = r->TermWin.fheight;	363	int H = r->TermWin.fheight;
288		364
289	int x_[16];	365	int x_[16];
290	int y_[16];	366	int y_[16];
291		367
…		…
300		376
301	XGCValues gcv;	377	XGCValues gcv;
302		378
303	gcv.cap_style = CapButt;	379	gcv.cap_style = CapButt;
304	gcv.line_width = 0;	380	gcv.line_width = 0;
305	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);	381	XChangeGC (disp, TGC, GCLineWidth \| GCCapStyle, &gcv);
306		382
307	while (a < b)	383	while (a < b)
308	{	384	{
309	uint32_t command = *a++;	385	uint32_t command = *a++;
310		386
…		…
317	int y2 = y_[(command >> 0) & 15];	393	int y2 = y_[(command >> 0) & 15];
318		394
319	switch (op)	395	switch (op)
320	{	396	{
321	case 0: // line	397	case 0: // line
322	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);	398	XDrawLine (disp, d, TGC, x1, y1, x2, y2);
323	break;	399	break;
324		400
325	case 1: // rectangle, possibly stippled	401	case 1: // rectangle, possibly stippled
326	if (a)	402	if (a)
327	{	403	{
328	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	404	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329		405
330	gcv.fill_style = FillStippled;	406	gcv.fill_style = FillStippled;
331	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);	407	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
332	gcv.ts_x_origin = x;	408	gcv.ts_x_origin = x;
333	gcv.ts_y_origin = y;	409	gcv.ts_y_origin = y;
334		410
335	XChangeGC (d.display->display, TGC,	411	XChangeGC (disp, TGC,
336	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	412	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
337	&gcv);	413	&gcv);
338	}	414	}
339		415
340	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	416	XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341		417
342	if (a)	418	if (a)
343	{	419	{
344	XFreePixmap (d.display->display, gcv.stipple);	420	XFreePixmap (disp, gcv.stipple);
345	gcv.stipple = 0;	421	gcv.stipple = 0;
346	gcv.fill_style = FillSolid;	422	gcv.fill_style = FillSolid;
347	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);	423	XChangeGC (disp, TGC, GCFillStyle, &gcv);
348	}	424	}
349	break;	425	break;
350	case 2: // arc	426	case 2: // arc
351	XDrawArc (d.display->display, d, TGC,	427	XDrawArc (disp, d, TGC,
352	x1 - W/2, y1 - H/2, W-1, H-1,	428	x1 - W/2, y1 - H/2, W-1, H-1,
353	(a - 1) * 9064, (b - 1) 90*64);	429	(a - 1) * 9064, (b - 1) 90*64);
354	break;	430	break;
355	}	431	}
356	}	432	}
357	}	433	}
358	#if ENABLE_COMBINING	434	#if ENABLE_COMBINING
359	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	435	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
360	{	436	{
		437	text_t chrs[2];
		438	width = min (2, width);
		439	chrs [1] = NOCHAR;
		440
		441	*chrs = cc->c1;
361	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	442	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
362	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);	443	f1->draw (d, x, y, chrs, width, fg, bg);
		444
363	if (cc->c2 != NOCHAR)	445	if (cc->c2 != NOCHAR)
364	{	446	{
		447	bool careful;
		448
365	// prefer font of first character, for no good reasons	449	// prefer font of first character, for no good reasons
366	rxvt_font *f2 = f1->has_codepoint (cc->c2)	450	*chrs = cc->c2;
		451	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
367	? f1	452	? f1
368	: (*fs)[fs->find_font (cc->c2)];	453	: (*fs)[fs->find_font (cc->c2)];
369		454
370	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);	455	f2->draw (d, x, y, chrs, width, fg, -1);
371	}	456	}
372	}	457	}
373	#endif	458	#endif
374	else	459	else
375	switch (t)	460	switch (t)
376	{	461	{
		462	case '\t':
377	case ZERO_WIDTH_CHAR:	463	case ZERO_WIDTH_CHAR:
		464	case NOCHAR:
378	break;	465	break;
379		466
380	default:	467	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,	468	XDrawRectangle (disp, d, TGC, x + 2, y + 2,
390	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);	469	fwidth - 4, r->TermWin.fheight - 4);
391	x += w;
392	}	470	}
393		471
394	x += r->TermWin.fwidth;	472	x += fwidth;
395	}	473	}
396	}	474	}
397		475
398	/////////////////////////////////////////////////////////////////////////////	476	/////////////////////////////////////////////////////////////////////////////
399		477
…		…
404		482
405	rxvt_fontprop properties ();	483	rxvt_fontprop properties ();
406		484
407	bool load (const rxvt_fontprop &prop);	485	bool load (const rxvt_fontprop &prop);
408		486
409	bool has_codepoint (unicode_t unicode);	487	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);
410		488
411	void draw (rxvt_drawable &d, int x, int y,	489	void draw (rxvt_drawable &d, int x, int y,
412	const text_t *text, int len,	490	const text_t *text, int len,
413	int fg, int bg);	491	int fg, int bg);
414		492
		493	bool slow; // wether this is a proportional font or has other funny characteristics
415	XFontStruct *f;	494	XFontStruct *f;
416	codeset cs;	495	codeset cs;
417	bool enc2b, encm;	496	bool enc2b, encm;
418		497
419	char get_property (XFontStruct f, const char property, const char repl) const;	498	char get_property (XFontStruct f, const char property, const char repl) const;
…		…
442	}	521	}
443		522
444	bool	523	bool
445	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	524	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
446	{	525	{
447	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	526	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
448	p.height = height;	527	p.height = height;
449	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	528	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;	529	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
451		530
452	return true;	531	return true;
…		…
454		533
455	bool	534	bool
456	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	535	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
457	{	536	{
458	unsigned long height;	537	unsigned long height;
		538
		539	#if 0
459	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	540	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
460	return false;	541	return false;
		542	#else
		543	height = f->ascent + f->descent;
		544	#endif
461		545
462	unsigned long avgwidth;	546	unsigned long avgwidth;
463	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	547	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
464	avgwidth = 0;	548	avgwidth = 0;
465		549
…		…
508	else	592	else
509	return false;	593	return false;
510	}	594	}
511		595
512	// fix the size of scalable fonts	596	// fix the size of scalable fonts
513	static void	597	static bool
514	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)	598	replace_field (char buf, const char name, int index, const char old, const char *replace)
515	{	599	{
516	int slashes = 0;	600	int slashes = 0;
517	const char *size;	601	const char field, end;
518		602
519	for (const char c = name; c; c++)	603	for (const char c = name; c; c++)
520	if (*c == '-')	604	if (*c == '-')
521	{	605	{
522	if (slashes == 6)	606	if (slashes == index)
523	size = c + 1;	607	field = c + 1;
		608
		609	if (slashes == index + 1)
		610	end = c;
524		611
525	if (++slashes >= 13)	612	if (++slashes >= 13)
526	break;	613	break;
527	}	614	}
528		615
529	if (slashes >= 13 && size[0] == '0')	616	if (slashes >= 13 && (!old \|\| *field == old))
530	{	617	{
		618	// TODO: check for overflow in font-name
531	strncpy (buf, name, size - name);	619	strncpy (buf, name, field - name);
532	buf += size - name;	620	buf += field - name;
533	buf += sprintf (buf, "%d", prop.height);
534	strcpy (buf, size + 1);	621	strcpy (buf, replace);
		622	strcat (buf, end);
		623
		624	return true;
535	}	625	}
536	else	626	else
		627	{
537	strcpy (buf, name);	628	strcpy (buf, name);
		629
		630	return false;
		631	}
538	}	632	}
539		633
540	bool	634	bool
541	rxvt_font_x11::load (const rxvt_fontprop &prop)	635	rxvt_font_x11::load (const rxvt_fontprop &prop)
542	{	636	{
		637	Display *disp = DISPLAY;
		638
543	clear ();	639	clear ();
		640
		641	char field_str[64]; // enough for 128 bits
		642
		643	// first morph the font if required
		644	if (prop.weight != rxvt_fontprop::unset
		645	\|\| prop.slant != rxvt_fontprop::unset)
		646	{
		647	char fname[1024];
		648
		649	if (name[0] != '-')
		650	{
		651	f = XLoadQueryFont (disp, name);
		652
		653	if (!f)
		654	return false;
		655
		656	char *new_name = get_property (f, "FONT", name);
		657
		658	if (new_name)
		659	set_name (new_name);
		660	else
		661	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
		662
		663	XFreeFont (disp, f);
		664	f = 0;
		665	}
		666
		667	if (prop.weight != rxvt_fontprop::unset)
		668	{
		669	replace_field (fname, name, 2, 0,
		670	prop.weight < rxvt_fontprop::bold
		671	? "medium" : "bold");
		672	set_name (strdup (fname));
		673	}
		674
		675	if (prop.slant != rxvt_fontprop::unset)
		676	{
		677	replace_field (fname, name, 3, 0,
		678	prop.slant < rxvt_fontprop::italic
		679	? "r" : "i"); // TODO: handle "o"blique, too
		680	set_name (strdup (fname));
		681	}
		682	}
		683
		684	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
		685	? 0 : prop.height);
		686
		687	struct font_weight {
		688	char *name;
		689	int diff;
		690
		691	void clear ()
		692	{
		693	name = 0;
		694	diff = 0x7fffffff;
		695	}
		696
		697	font_weight () { clear (); }
		698	~font_weight () { free (name); }
		699	};
544		700
545	char **list;	701	char **list;
546	int count;	702	int count;
547	list = XListFonts (DISPLAY, name, 1024, &count);	703	list = XListFonts (disp, name, 4000, &count);
		704
548	set_name (0);	705	set_name (0);
549		706
550	if (!list)	707	if (!list)
551	return false;	708	return false;
552		709
553	int bestdiff = 0x7fffffff;	710	font_weight *fonts = new font_weight[count];
		711
554	for (int i = 0; i < count; i++)	712	for (int i = 0; i < count; i++)
555	{	713	{
556	rxvt_fontprop p;	714	rxvt_fontprop p;
557	char fname[1024];	715	char fname[1024];
558	fix_scalable (fname, list[i], prop);	716
		717	int diff = 0;
		718
		719	if (replace_field (fname, list[i], 6, '0', field_str))
		720	diff += 10; // slightly penalize scalable fonts
		721	else if (replace_field (fname, list[i], 11, '0', "0"))
		722	diff += 300; // more heavily penalize what looks like scaled bitmap fotns
559		723
560	if (!set_properties (p, fname))	724	if (!set_properties (p, fname))
561	continue;	725	continue;
562		726
		727	if (prop.height != rxvt_fontprop::unset
563	if (p.height > prop.height) // weed out too large fonts	728	&& p.height > prop.height) // weed out too large fonts
564	continue;	729	continue;
565		730
566	int diff = (prop.height - p.height) * 32	731	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
567	+ abs (prop.weight - p.weight)	732	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
568	+ abs (prop.slant - p.slant );	733	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
		734	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
569		735
570	if (!name // compare against best found so far	736	fonts[i].name = strdup (fname);
571	\|\| diff < bestdiff)	737	fonts[i].diff = diff;
572	{
573	set_name (strdup (fname));
574	bestdiff = diff;
575	}
576	}	738	}
577		739
578	XFreeFontNames (list);	740	XFreeFontNames (list);
579		741
580	if (!name)	742	// this loop only iterates when the guessed font-size is too small
581	return false;	743	for (;;)
		744	{
		745	font_weight *best = fonts + count - 1;
582		746
583	f = XLoadQueryFont (DISPLAY, name);	747	for (font_weight *w = best; w-- > fonts; )
		748	if (w->diff <= best->diff)
		749	best = w;
		750
		751	if (!best->name
		752	\|\| !(f = XLoadQueryFont (disp, best->name)))
		753	break;
		754
		755	set_name (best->name);
		756	best->clear ();
		757
		758	ascent = f->ascent;
		759	descent = f->descent;
		760	height = ascent + descent;
		761
		762	if (prop.height == rxvt_fontprop::unset
		763	\|\| height <= prop.height)
		764	break; // font is ready for use
		765
		766	// PIXEL_SIZE small enough, but real height too large
		767	clear ();
		768	}
		769
		770	delete [] fonts;
584		771
585	if (!f)	772	if (!f)
586	return false;	773	return false;
587		774
588	char *registry = get_property (f, "CHARSET_REGISTRY", 0);	775	char *registry = get_property (f, "CHARSET_REGISTRY", 0);
…		…
617	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	804	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
618		805
619	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	806	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
620	enc2b = encm \|\| f->max_char_or_byte2 > 255;	807	enc2b = encm \|\| f->max_char_or_byte2 > 255;
621		808
622	ascent = f->ascent;
623	descent = f->descent;
624	height = ascent + descent;
625
626	slow = false;	809	slow = false;
627		810
		811	#if 1 // only used for slow detection, TODO optimize
628	if (f->min_bounds.width == f->max_bounds.width)	812	if (f->min_bounds.width == f->max_bounds.width)
629	width = f->min_bounds.width;	813	width = f->min_bounds.width;
630	else if (f->per_char == NULL)	814	else if (f->per_char == NULL)
631	width = f->max_bounds.width;	815	width = f->max_bounds.width;
632	else	816	else
…		…
645	width = f->per_char[N].width;	829	width = f->per_char[N].width;
646		830
647	--N;	831	--N;
648	}	832	}
649	}	833	}
		834	#endif
		835
		836	width = 1;
		837
		838	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		839	{
		840	if (cs != CS_UNICODE
		841	&& *t > 0x100
		842	&& FROM_UNICODE (cs, *t) == NOCHAR)
		843	continue;
		844
		845	// ignore characters we wouldn't use anyways
		846	bool careful;
		847	if (!has_char (*t, &prop, careful))
		848	continue;
		849
		850	XChar2b ch = { t >> 8, t };
		851
		852	XCharStruct g;
		853	int dir_ret, asc_ret, des_ret;
		854	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
		855
		856	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
		857
		858	if (width < g.width) width = g.width;
		859	}
650		860
651	if (cs == CS_UNKNOWN)	861	if (cs == CS_UNKNOWN)
652	{	862	{
653	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);	863	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
654		864
655	clear ();	865	clear ();
656
657	return false;	866	return false;
658	}	867	}
		868
		869	#if 0 // do it per-character
		870	if (prop && width > prop->width)
		871	{
		872	clear ();
		873	return false;
		874	}
		875	#endif
659		876
660	return true;	877	return true;
661	}	878	}
662		879
663	void	880	void
…		…
669	f = 0;	886	f = 0;
670	}	887	}
671	}	888	}
672		889
673	bool	890	bool
674	rxvt_font_x11::has_codepoint (unicode_t unicode)	891	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
675	{	892	{
676	uint32_t ch = FROM_UNICODE (cs, unicode);	893	uint32_t ch = FROM_UNICODE (cs, unicode);
677		894
678	if (ch == NOCHAR)	895	if (ch == NOCHAR)
679	return false;	896	return false;
…		…
688		905
689	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	906	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
690	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	907	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
691	return false;	908	return false;
692		909
693	if (!f->per_char)	910	if (f->per_char)
694	return true;	911	{
695
696	int D = f->max_char_or_byte2 - f->min_char_or_byte2 + 1;	912	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;	913	int N = (byte1 - f->min_byte1) * D + byte2 - f->min_char_or_byte2;
698		914
699	xcs = f->per_char + N;	915	xcs = f->per_char + N;
		916	}
		917	else
		918	xcs = &f->max_bounds;
700	}	919	}
701	else	920	else
702	{	921	{
703	if (ch < f->min_char_or_byte2 \|\| ch > f->max_char_or_byte2)	922	if (ch < f->min_char_or_byte2 \|\| ch > f->max_char_or_byte2)
704	return false;	923	return false;
705		924
706	if (!f->per_char)	925	if (f->per_char)
707	return true;
708
709	xcs = f->per_char + (ch - f->min_char_or_byte2);	926	xcs = f->per_char + (ch - f->min_char_or_byte2);
		927	else
		928	xcs = &f->max_bounds;
710	}	929	}
711		930
712	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0	931	if (xcs->lbearing == 0 && xcs->rbearing == 0 && xcs->width == 0
713	&& xcs->ascent == 0 && xcs->descent == 0)	932	&& xcs->ascent == 0 && xcs->descent == 0)
		933	return false;
		934
		935	if (!prop \|\| prop->width == rxvt_fontprop::unset)
		936	return true;
		937
		938	// check character against base font bounding box
		939	int w = xcs->width;
		940	int wcw = wcwidth (unicode);
		941	if (wcw > 0) w = (w + wcw - 1) / wcw;
		942
		943	careful = w > prop->width;
		944	if (careful && w > prop->width * MAX_OVERLAP >> 2)
714	return false;	945	return false;
715		946
716	return true;	947	return true;
717	}	948	}
718		949
…		…
728		959
729	bool slow = this->slow	960	bool slow = this->slow
730	\|\| width != r->TermWin.fwidth	961	\|\| width != r->TermWin.fwidth
731	\|\| height != r->TermWin.fheight;	962	\|\| height != r->TermWin.fheight;
732		963
733	int base = r->TermWin.fbase;	964	int base = ascent; // sorry, incorrect: r->TermWin.fbase;
734		965
735	XGCValues v;	966	XGCValues v;
736	v.foreground = r->pix_colors[fg];	967	v.foreground = r->pix_colors[fg];
737	v.font = f->fid;	968	v.font = f->fid;
738		969
…		…
803	}	1034	}
804		1035
805	/////////////////////////////////////////////////////////////////////////////	1036	/////////////////////////////////////////////////////////////////////////////
806		1037
807	#if XFT	1038	#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		1039
814	struct rxvt_font_xft : rxvt_font {	1040	struct rxvt_font_xft : rxvt_font {
815	rxvt_font_xft () { f = 0; }	1041	rxvt_font_xft () { f = 0; }
816		1042
817	void clear ();	1043	void clear ();
…		…
822		1048
823	void draw (rxvt_drawable &d, int x, int y,	1049	void draw (rxvt_drawable &d, int x, int y,
824	const text_t *text, int len,	1050	const text_t *text, int len,
825	int fg, int bg);	1051	int fg, int bg);
826		1052
827	bool has_codepoint (unicode_t unicode);	1053	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);
828		1054
829	protected:	1055	protected:
830	XftFont *f;	1056	XftFont *f;
831	};	1057	};
832		1058
…		…
860	}	1086	}
861		1087
862	bool	1088	bool
863	rxvt_font_xft::load (const rxvt_fontprop &prop)	1089	rxvt_font_xft::load (const rxvt_fontprop &prop)
864	{	1090	{
865	#if 0	1091	Display *disp = DISPLAY;
866	for (int i = 0; i < SWATHCOUNT; i++)
867	cvr[i] = 0;
868	#endif
869		1092
870	clear ();	1093	clear ();
871		1094
872	FcPattern p = FcNameParse ((FcChar8 ) name);	1095	FcPattern p = FcNameParse ((FcChar8 ) name);
873		1096
874	if (!p)	1097	if (!p)
875	return false;	1098	return false;
876		1099
877	FcValue v;	1100	FcValue v;
878		1101
		1102	if (prop.height != rxvt_fontprop::unset
879	if (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)	1103	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
		1104	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
880	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1105	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
881		1106
		1107	if (prop.weight != rxvt_fontprop::unset
882	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1108	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
883	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1109	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
884		1110
		1111	if (prop.slant != rxvt_fontprop::unset
885	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1112	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
886	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1113	FcPatternAddInteger (p, FC_SLANT, prop.slant);
887
888	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
889	FcPatternAddBool (p, FC_MINSPACE, 1);
890		1114
891	#if 0 // clipping unfortunately destroys our precious double-width-characters	1115	#if 0 // clipping unfortunately destroys our precious double-width-characters
892	// clip width, we can't do better, or can we?	1116	// clip width, we can't do better, or can we?
893	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1117	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
894	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);	1118	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
895	#endif	1119	#endif
896		1120
		1121	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
		1122	FcPatternAddBool (p, FC_MINSPACE, 1);
		1123
		1124	// store generated name so iso14755 view gives better results
		1125	set_name ((char *)FcNameUnparse (p));
		1126
897	XftResult result;	1127	XftResult result;
898	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1128	FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);
899		1129
900	FcPatternDestroy (p);	1130	FcPatternDestroy (p);
901		1131
902	if (!match)	1132	if (!match)
903	return false;	1133	return false;
904		1134
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;	1135	int ftheight = 0;
		1136	bool success = true;
918		1137
919	for (;;)	1138	for (;;)
920	{	1139	{
921	XGlyphInfo g1, g2;	1140	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
922	FcChar8 c;
923		1141
924	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	1142	if (!f)
925	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	1143	{
		1144	success = false;
		1145	break;
		1146	}
926		1147
927	if (g1.xOff != g2.xOff) // don't simply trust the font	1148	FT_Face face = XftLockFace (f);
928	slow = true;
929		1149
930	width = g2.xOff;
931	ascent = (face->size->metrics.ascender + 63) >> 6;	1150	ascent = (face->size->metrics.ascender + 63) >> 6;
932	descent = (-face->size->metrics.descender + 63) >> 6;	1151	descent = (-face->size->metrics.descender + 63) >> 6;
933	height = ascent + descent;	1152	height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
		1153	width = 0;
934		1154
		1155	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
		1156
		1157	XftUnlockFace (f);
		1158
		1159	int glheight = height;
		1160
		1161	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
		1162	{
		1163	FcChar16 ch = *t;
		1164
		1165	if (cs != CS_UNICODE
		1166	&& ch > 0x100
		1167	&& FROM_UNICODE (cs, ch) == NOCHAR)
		1168	continue;
		1169
		1170	// ignore characters we wouldn't use anyways
		1171	bool careful;
		1172	if (!has_char (*t, &prop, careful))
		1173	continue;
		1174
		1175	XGlyphInfo g;
		1176	XftTextExtents16 (disp, f, &ch, 1, &g);
		1177
		1178	g.width -= g.x;
		1179
		1180	int wcw = wcwidth (ch);
		1181	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
		1182
		1183	if (width < g.width ) width = g.width;
		1184	if (height < g.height ) height = g.height;
		1185	if (glheight < g.height - g.y) glheight = g.height - g.y;
		1186	}
		1187
		1188	if (!width)
		1189	{
		1190	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
		1191
		1192	XftFontClose (disp, f);
		1193	f = 0;
		1194
		1195	success = false;
		1196	break;
		1197	}
		1198
		1199	if (prop.height == rxvt_fontprop::unset
935	if (height <= prop.height \|\| !prop.height)	1200	\|\| (height <= prop.height && glheight <= prop.height)
		1201	\|\| height <= 2
		1202	\|\| !scalable)
936	break;	1203	break;
937		1204
938	if (ftheight)	1205	if (ftheight)
939	{	1206	{
940	// take smaller steps near the end	1207	// take smaller steps near the end
941	if (height > prop.height + 1) ftheight++;	1208	if (height > prop.height + 1) ftheight++;
942	if (height > prop.height + 2) ftheight++;	1209	if (height > prop.height + 2) ftheight++;
943	if (height > prop.height + 3) ftheight++;	1210	if (height > prop.height + 3) ftheight++;
944		1211
945	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);	1212	ftheight -= height - prop.height;
946	}	1213	}
947	else	1214	else
948	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);	1215	ftheight = prop.height - 1;
		1216
		1217	XftFontClose (disp, f);
		1218	FcPatternDel (match, FC_PIXEL_SIZE);
		1219	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
		1220	}
		1221
		1222	FcPatternDestroy (match);
		1223
		1224	#if 0 // do it per-character
		1225	if (prop.width != rxvt_fontprop::unset && width > prop.width)
949	}	1226	{
		1227	clear ();
		1228	success = false;
		1229	}
		1230	#endif
950		1231
951	XftUnlockFace (f);	1232	return success;
		1233	}
		1234
		1235	bool
		1236	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)
		1237	{
		1238	careful = false;
		1239
		1240	if (!XftCharExists (DISPLAY, f, unicode))
		1241	return false;
		1242
		1243	if (!prop \|\| prop->width == rxvt_fontprop::unset)
		1244	return true;
		1245
		1246	// check character against base font bounding box
		1247	FcChar32 ch = unicode;
		1248	XGlyphInfo g;
		1249	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
		1250
		1251	int w = g.width - g.x;
		1252	int wcw = wcwidth (unicode);
		1253	if (wcw > 0) w = (w + wcw - 1) / wcw;
		1254
		1255	careful = w > prop->width;
		1256	if (careful && w > prop->width * MAX_OVERLAP >> 2)
		1257	return false;
952		1258
953	return true;	1259	return true;
954	}
955
956	bool
957	rxvt_font_xft::has_codepoint (unicode_t unicode)
958	{
959	return XftCharExists (DISPLAY, f, unicode);
960	}	1260	}
961		1261
962	void	1262	void
963	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1263	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
964	const text_t *text, int len,	1264	const text_t *text, int len,
965	int fg, int bg)	1265	int fg, int bg)
966	{	1266	{
967	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1267	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
968		1268
969	if (!slow && width == r->TermWin.fwidth && 0)	1269	int base = ascent; // should be fbase, but that is incorrect
		1270
		1271	XGlyphInfo extents;
		1272	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));
		1273	FcChar32 *ep = enc;
		1274	int ewidth = 0;
		1275
		1276	while (len)
970	{	1277	{
971	if (sizeof (text_t) == sizeof (FcChar16))	1278	int cwidth = r->TermWin.fwidth;
972	XftDrawString16 (d, &r->pix_colors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	1279	FcChar32 fc = *text++; len--;
		1280
		1281	while (len && *text == NOCHAR)
		1282	text++, len--, cwidth += r->TermWin.fwidth;
		1283
		1284	if (fc == ' ' && ep == enc) // skip leading spaces
		1285	x += cwidth;
973	else	1286	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	{	1287	{
980	if (text != NOCHAR && text != ' ')	1288	FT_UInt gl = XftCharIndex (d.display->display, f, fc);
		1289	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
		1290
		1291	if (extents.xOff != cwidth)
981	{	1292	{
982	int fwidth = r->TermWin.fwidth;
983	if (len >= 2 && text[1] == NOCHAR)
984	fwidth *= 2;	1293	if (ewidth)
985
986	XGlyphInfo extents;
987	if (sizeof (text_t) == sizeof (FcChar16))
988	{	1294	{
989	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);	1295	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
990	XftDrawString16 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,	1296	x, y + base, enc, ep - enc);
991	y + r->TermWin.fbase, (const FcChar16 *)text, 1);	1297	x += ewidth;
		1298
		1299	ep = enc;
		1300	ewidth = 0;
992	}	1301	}
993	else	1302
994	{	1303	if (extents.xOff > cwidth)
995	XGlyphInfo extents;	1304	extents.xOff = cwidth;
996	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);	1305
997	XftDrawString32 (d, &r->pix_colors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,	1306	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
998	y + r->TermWin.fbase, (const FcChar32 *)text, 1);	1307	x + (cwidth - extents.xOff >> 1),
999	}	1308	y + base, &gl, 1);
		1309	x += cwidth;
1000	}	1310	}
1001
1002	x += r->TermWin.fwidth;
1003	text++;
1004	len--;	1311	else
		1312	{
		1313	*ep++ = gl;
		1314	ewidth += cwidth;
1005	}	1315	}
		1316	}
1006	}	1317	}
		1318
		1319	if (ep != enc)
		1320	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
		1321	x, y + base, enc, ep - enc);
1007	}	1322	}
1008	#endif	1323	#endif
1009		1324
1010	/////////////////////////////////////////////////////////////////////////////	1325	/////////////////////////////////////////////////////////////////////////////
1011		1326
1012	rxvt_fontset::rxvt_fontset (rxvt_t r)	1327	rxvt_fontset::rxvt_fontset (rxvt_t r)
1013	: r (r), fontdesc (0)	1328	: fontdesc (0), r (r)
1014	{	1329	{
1015	clear ();	1330	clear ();
1016	}	1331	}
1017		1332
1018	rxvt_fontset::~rxvt_fontset ()	1333	rxvt_fontset::~rxvt_fontset ()
…		…
1021	}	1336	}
1022		1337
1023	void	1338	void
1024	rxvt_fontset::clear ()	1339	rxvt_fontset::clear ()
1025	{	1340	{
		1341	prop.width = prop.height = prop.weight = prop.slant
		1342	= rxvt_fontprop::unset;
		1343
1026	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1344	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1027	FONT_UNREF (*i);	1345	FONT_UNREF (*i);
1028		1346
		1347	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
		1348	delete *p;
		1349
1029	free (fontdesc); fontdesc = 0;	1350	free (fontdesc); fontdesc = 0;
1030		1351
1031	fonts.clear ();	1352	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		1353
1037	fallback = fallback_fonts;	1354	fallback = fallback_fonts;
1038	}	1355	}
1039		1356
1040	rxvt_font *	1357	rxvt_font *
…		…
1043	rxvt_font *f;	1360	rxvt_font *f;
1044		1361
1045	if (!name \|\| !*name)	1362	if (!name \|\| !*name)
1046	{	1363	{
1047	name = "";	1364	name = "";
1048	f = new rxvt_font_default;	1365	f = new rxvt_font_default (this);
1049	}	1366	}
1050	#if XFT	1367	#if XFT
1051	else if (!strncmp (name, "xft:", 4))	1368	else if (!strncmp (name, "xft:", 4))
1052	{	1369	{
1053	name += 4;	1370	name += 4;
1054	f = new rxvt_font_xft;	1371	f = new rxvt_font_xft ();
1055	}	1372	}
1056	#endif	1373	#endif
1057	else if (!strncmp (name, "x:", 2))	1374	else if (!strncmp (name, "x:", 2))
1058	{	1375	{
1059	name += 2;	1376	name += 2;
1060	f = new rxvt_font_x11;	1377	f = new rxvt_font_x11;
1061	}	1378	}
1062	else	1379	else
1063	f = new rxvt_font_x11;	1380	f = new rxvt_font_x11;
1064		1381
1065	f->fs = this;
1066	f->set_term (r);	1382	f->set_term (r);
1067	f->set_name (strdup (name));	1383	f->set_name (strdup (name));
1068		1384
1069	f->cs = cs;	1385	f->cs = cs;
1070	f->loaded = false;	1386	f->loaded = false;
…		…
1082	char buf[512];	1398	char buf[512];
1083	const char *end;	1399	const char *end;
1084		1400
1085	do	1401	do
1086	{	1402	{
1087	while (*desc <= ' ') desc++;	1403	while (desc && desc <= ' ')
		1404	desc++;
		1405
		1406	codeset cs = CS_UNICODE;
1088		1407
1089	if (*desc == '[')	1408	if (*desc == '[')
1090	{	1409	{
1091	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1410	char spec[256];
1092
1093	//const char *extra = desc++; // not yet used	1411	const char *extra = ++desc; // not yet used
1094		1412
1095	desc = strchr (desc, ']');	1413	desc = strchr (desc, ']');
1096		1414
1097	if (!desc)	1415	if (!desc)
1098	{	1416	{
1099	fprintf (stderr, "ERROR: opening '[' without closing ']' in font specification.\n");	1417	rxvt_warn ("ERROR: opening '[' without closing ']' in font specification, trying to continue.\n");
1100	break;	1418	break;
1101	}	1419	}
		1420
		1421	memcpy (spec, extra, min (desc - extra, 255));
		1422	spec[min (desc - extra, 255)] = 0;
		1423
		1424	if (!strncmp (extra, "codeset=", sizeof ("codeset=") - 1))
		1425	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
		1426	else
		1427	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1102		1428
1103	desc++;	1429	desc++;
1104	while (*desc <= ' ') desc++;	1430	while (*desc <= ' ') desc++;
1105	}	1431	}
1106		1432
…		…
1111	if (end - desc < 511)	1437	if (end - desc < 511)
1112	{	1438	{
1113	strncpy (buf, desc, end - desc);	1439	strncpy (buf, desc, end - desc);
1114	buf[end - desc] = 0;	1440	buf[end - desc] = 0;
1115		1441
1116	fonts.push_back (new_font (buf, CS_UNICODE));	1442	fonts.push_back (new_font (buf, cs));
1117	}	1443	}
		1444	else
		1445	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1118		1446
1119	desc = end + 1;	1447	desc = end + 1;
1120	}	1448	}
1121	while (*end);	1449	while (*end);
1122	}	1450	}
1123	}	1451	}
1124		1452
1125	bool	1453	bool
1126	rxvt_fontset::realize_font (int i)	1454	rxvt_fontset::realize_font (int i)
1127	{	1455	{
		1456	if (i < 0 \|\| i >= fonts.size ())
		1457	return false;
		1458
1128	if (fonts[i]->loaded)	1459	if (fonts[i]->loaded)
1129	return true;	1460	return true;
1130		1461
1131	fonts[i]->loaded = true;	1462	fonts[i]->loaded = true;
1132		1463
1133	if (!fonts[i]->load (base_prop))	1464	if (!fonts[i]->load (prop))
1134	{	1465	{
1135	fonts[i]->cs = CS_UNKNOWN;	1466	fonts[i]->cs = CS_UNKNOWN;
1136	return false;	1467	return false;
1137	}	1468	}
1138		1469
…		…
1148		1479
1149	fonts.push_back (new_font (0, CS_UNICODE));	1480	fonts.push_back (new_font (0, CS_UNICODE));
1150	realize_font (0);	1481	realize_font (0);
1151		1482
1152	add_fonts (desc);	1483	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		1484
1170	return true;	1485	return true;
1171	}	1486	}
1172		1487
1173	int	1488	int
…		…
1179		1494
1180	return -1;	1495	return -1;
1181	}	1496	}
1182		1497
1183	int	1498	int
1184	rxvt_fontset::find_font (unicode_t unicode, bool bold)	1499	rxvt_fontset::find_font (unicode_t unicode)
1185	{	1500	{
		1501	if (unicode >= 1<<20)
		1502	return 0;
1186		1503
1187	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii	1504	unicode_t hi = unicode >> 8;
1188	i < fonts.size ();	1505
1189	i++)	1506	if (hi < fmap.size ()
		1507	&& fmap[hi]
		1508	&& (*fmap[hi])[unicode & 0xff] != 0xff)
		1509	return (*fmap[hi])[unicode & 0xff];
		1510
		1511	unsigned int i;
		1512
		1513	for (i = 0; i < fonts.size (); i++)
1190	{	1514	{
1191	rxvt_font *f = fonts[i];	1515	rxvt_font *f = fonts[i];
1192		1516
1193	if (!f->loaded)	1517	if (!f->loaded)
1194	{	1518	{
…		…
1200	}	1524	}
1201		1525
1202	if (f->cs == CS_UNKNOWN)	1526	if (f->cs == CS_UNKNOWN)
1203	goto next_font;	1527	goto next_font;
1204		1528
1205	if (bold && f->properties ().weight < rxvt_fontprop::bold)	1529	bool careful;
		1530	if (f->has_char (unicode, &prop, careful))
		1531	{
		1532	if (careful)
		1533	i \|= 128;
		1534
1206	goto next_font;	1535	goto found;
1207		1536	}
1208	if (f->has_codepoint (unicode))
1209	return i;
1210		1537
1211	next_font:	1538	next_font:
1212	if (i == fonts.size () - 1)	1539	if (i == fonts.size () - 1)
1213	{	1540	{
1214	if (fallback->name)	1541	if (fallback->name)
…		…
1221	{	1548	{
1222	// try to find a new font.	1549	// try to find a new font.
1223	// only xft currently supported, as there is no	1550	// only xft currently supported, as there is no
1224	// way to configure this and xft is easier to hack in,	1551	// way to configure this and xft is easier to hack in,
1225	// while x11 has more framework in place already.	1552	// while x11 has more framework in place already.
1226	#if XFT	1553	// TODO: this is a real resource hog, xft takes ages(?)
		1554	#if XFT && USE_SLOW_LOOKUP
1227	// grab the first xft font that seems suitable	1555	// grab the first xft font that seems suitable
1228	FcPattern *p = FcPatternCreate ();	1556	FcPattern *p = FcPatternCreate ();
1229		1557
1230	FcCharSet *s = FcCharSetCreate ();	1558	FcCharSet *s = FcCharSetCreate ();
1231	FcCharSetAddChar (s, unicode);	1559	FcCharSetAddChar (s, unicode);
1232	FcPatternAddCharSet (p, FC_CHARSET, s);	1560	FcPatternAddCharSet (p, FC_CHARSET, s);
1233	// charsets don't help that much, as xft might return	1561	// charsets don't help that much, as xft might return
1234	// a non-matching font even if a better font is available :/	1562	// a non-matching font even if a better font is available :/
1235		1563
		1564	x x x x TODO prop might have unset contents
1236	FcPatternAddInteger (p, FC_PIXEL_SIZE, base_prop.height);	1565	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1237	FcPatternAddInteger (p, FC_WEIGHT, base_prop.weight);	1566	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1238	FcPatternAddInteger (p, FC_SLANT, base_prop.slant);	1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1239	FcPatternAddBool (p, FC_MINSPACE, 1);	1568	FcPatternAddBool (p, FC_MINSPACE, 1);
1240	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1241		1570
1242	XftResult result;	1571	XftResult result;
1243	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1572	FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);
1244		1573
1245	FcPatternDestroy (p);	1574	FcPatternDestroy (p);
1246		1575
1247	if (match)	1576	if (match)
1248	{	1577	{
…		…
1263	#endif	1592	#endif
1264	}	1593	}
1265	}	1594	}
1266	}	1595	}
1267		1596
1268	// if no bold font found, use a regular one	1597	/* we must return SOME font */
1269	if (bold)	1598	i = 0;
1270	return find_font (unicode);
1271		1599
1272	return 0; /* we must return SOME font */	1600	found:
1273	}	1601	// found a font, cache it
		1602	if (i < 255)
		1603	{
		1604	while (hi >= fmap.size ())
		1605	fmap.push_back (0);
1274		1606
		1607	if (!fmap[hi])
		1608	{
		1609	fmap[hi] = (pagemap *)new pagemap;
		1610	memset (fmap[hi], 0xff, sizeof (pagemap));
		1611	}
1275		1612
		1613	(*fmap[hi])[unicode & 0xff] = i;
		1614	}
1276		1615
		1616	return i;
		1617	}
		1618
		1619
		1620

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.3 by root, Sun Aug 15 21:55:45 2004 UTC vs. Revision 1.74 by root, Tue Dec 6 15:41:26 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.3 by root, Sun Aug 15 21:55:45 2004 UTC vs.
Revision 1.74 by root, Tue Dec 6 15:41:26 2005 UTC