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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs.
Revision 1.38 by pcg, Fri Mar 5 21:26:01 2004 UTC

…		…
1	/---------------------------------C----------------------------------;	1	/---------------------------------C----------------------------------;
2	* File: defaultfont.C	2	* File: defaultfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003 Marc Lehmann rxvt@plan9.de>	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
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
		26	#include <cstdlib>
		27
26	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
27	#define DRAWABLE r->TermWin.vt
28	#define GC r->TermWin.gc	29	#define GC r->TermWin.gc
29		30
30	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
31	codeset cs;	32	codeset cs;
32	const char *name;	33	const char *name;
…		…
57		58
58	// japanese	59	// japanese
59	#if ENCODING_JP \|\| ENCODING_JP_EXT	60	#if ENCODING_JP \|\| ENCODING_JP_EXT
60	# if XFT	61	# if XFT
61	// prefer xft for complex scripts	62	// prefer xft for complex scripts
62	{ CS_UNICODE, "xft:Kochi Gothic" },	63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
63	# endif	64	# endif
64	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
65	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	66	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },
66	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
67	#endif	68	#endif
68		69
69	#if ENCODING_CN \|\| ENCODING_CN_EXT	70	#if ENCODING_CN \|\| ENCODING_CN_EXT
70	# if XFT	71	# if XFT
71	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
72	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
73	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
74	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
75	# endif	76	# endif
		77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
		80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
76	{ CS_CNS11643_1992_1, "----r-------c--cns11643.1992-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
77	{ CS_CNS11643_1992_2, "----r-------c--cns11643.1992-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
78	{ CS_CNS11643_1992_3, "----r-------c--cns11643.1992-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
79	{ CS_CNS11643_1992_4, "----r-------c--cns11643.1992-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
80	{ CS_CNS11643_1992_5, "----r-------c--cns11643.1992-5" },	85	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
81	{ CS_CNS11643_1992_6, "----r-------c--cns11643.1992-6" },	86	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
82	{ CS_CNS11643_1992_7, "----r-------c--cns11643.1992-7" },	87	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
83	{ CS_CNS11643_1992_F, "----r-------c--cns11643.1992-f" },	88	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
84	#endif	89	#endif
85		90
86	#if XFT	91	#if XFT
87	{ CS_UNICODE, "xft:Andale Mono" },	92	{ CS_UNICODE, "xft:Andale Mono" },
88	{ CS_UNICODE, "xft:Arial Unicode MS" },	93	{ CS_UNICODE, "xft:Arial Unicode MS" },
89	#endif	94	#endif
90	{ CS_UNICODE, "--lucidatypewriter--r-------m-*-iso10646-1" },	95	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
		96	{ CS_UNICODE, "xft:FreeMono" },
		97	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
		98	{ CS_UNICODE, "----r-------c--iso10646-1" },
91	{ CS_UNICODE, "----r-------m--iso10646-1" },	99	{ CS_UNICODE, "----r-------m--iso10646-1" },
92	{ CS_UNICODE, "----r-------m--iso10646-1" },	100
93	{ CS_UNICODE, "----r-------m--iso10646-1" },	101	#if UNICODE_3 && XFT
		102	{ CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
		103	#endif
94		104
95	{ CS_UNKNOWN, 0 }	105	{ CS_UNKNOWN, 0 }
96	};	106	};
97		107
98	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
99		109
		110	#if XFT
		111	rxvt_drawable::~rxvt_drawable ()
		112	{
		113	if (xftdrawable)
		114	XftDrawDestroy (xftdrawable);
		115	}
		116
		117	rxvt_drawable::operator XftDraw *()
		118	{
		119	if (!xftdrawable)
		120	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		121
		122	return xftdrawable;
		123	}
		124	#endif
		125
		126	/////////////////////////////////////////////////////////////////////////////
		127
100	static void *enc_buf;	128	static void *enc_buf;
101	static uint32_t enc_len;	129	static uint32_t enc_len;
102		130
103	static inline void *	131	static inline void *
104	get_enc_buf (int len)	132	get_enc_buf (uint32_t len)
105	{	133	{
106	if (len > enc_len)	134	if (len > enc_len)
107	{	135	{
108	free (enc_buf);	136	free (enc_buf);
109	enc_buf = malloc (len);	137	enc_buf = malloc (len);
…		…
111		139
112	return enc_buf;	140	return enc_buf;
113	}	141	}
114		142
115	static const char *	143	static const char *
116	enc_char (const text_t *text, int len, codeset cs, bool &zero)	144	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117	{	145	{
118	uint8_t buf = (uint8_t )get_enc_buf (len);	146	uint8_t buf = (uint8_t )get_enc_buf (len);
119		147
120	while (len--)	148	while (len--)
121	{	149	{
…		…
132		160
133	return (const char *)enc_buf;	161	return (const char *)enc_buf;
134	}	162	}
135		163
136	static const XChar2b *	164	static const XChar2b *
137	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	165	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138	{	166	{
139	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	167	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
140		168
141	while (len--)	169	while (len--)
142	{	170	{
…		…
157	}	185	}
158		186
159	/////////////////////////////////////////////////////////////////////////////	187	/////////////////////////////////////////////////////////////////////////////
160		188
161	void	189	void
162	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	190	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
163	{	191	{
164	if (color == Color_bg)	192	if (color == Color_bg)
165	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	193	XClearArea (d.display->display, d, x, y, w, h, FALSE);
166	else if (color >= 0)	194	else if (color >= 0)
167	{	195	{
		196	#if XFT
		197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		198	#else
168	XSetForeground (DISPLAY, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, GC, r->PixColors[color]);
169	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		201	#endif
170	}	202	}
171	}	203	}
172		204
173	static const char *linedraw_cmds[128] = {	205	static const char *linedraw_cmds[128] = {
174	"1hH", "2hH", "1vV", "2vV",	206	"1hH", "2hH", "1vV", "2vV",
…		…
220		252
221	// to be done	253	// to be done
222	};	254	};
223		255
224	struct rxvt_font_default : rxvt_font {	256	struct rxvt_font_default : rxvt_font {
225	bool load (int maxheight)	257	rxvt_fontprop properties ()
		258	{
		259	rxvt_fontprop p;
		260
		261	p.width = p.height = 1;
		262	p.weight = rxvt_fontprop::medium;
		263	p.slant = rxvt_fontprop::roman;
		264
		265	return p;
		266	}
		267
		268	bool load (const rxvt_fontprop &prop)
226	{	269	{
227	width = 1; height = 1;	270	width = 1; height = 1;
228	ascent = 1; descent = 0;	271	ascent = 1; descent = 0;
		272
		273	set_name ("built-in pseudofont");
229		274
230	return true;	275	return true;
231	}	276	}
232		277
233	bool has_codepoint (uint32_t unicode)	278	bool has_codepoint (uint32_t unicode)
234	{	279	{
235	if (unicode <= 0x001f)	280	if (unicode <= 0x001f)
236	return true;	281	return true;
		282
237	if (unicode >= 0x0080 && unicode <= 0x009f)	283	if (unicode >= 0x0080 && unicode <= 0x009f)
238	return true;	284	return true;
239		285
240	if (unicode >= 0x2500 && unicode <= 0x257f	286	if (unicode >= 0x2500 && unicode <= 0x257f
241	&& linedraw_cmds[unicode - 0x2500])	287	&& linedraw_cmds[unicode - 0x2500])
		288	return true;
		289
		290	if (IS_COMPOSE (unicode))
242	return true;	291	return true;
243		292
244	switch (unicode)	293	switch (unicode)
245	{	294	{
246	case ZERO_WIDTH_CHAR:	295	case ZERO_WIDTH_CHAR:
…		…
248	}	297	}
249		298
250	return false;	299	return false;
251	}	300	}
252		301
253	void draw (int x, int y,	302	void draw (rxvt_drawable &d, int x, int y,
254	const text_t *text, int len,	303	const text_t *text, int len,
255	int fg, int bg);	304	int fg, int bg);
256	};	305	};
257		306
258	void	307	void
259	rxvt_font_default::draw (int x, int y,	308	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260	const text_t *text, int len,	309	const text_t *text, int len,
261	int fg, int bg)	310	int fg, int bg)
262	{	311	{
263	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	312	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
264		313
265	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	314	XSetForeground (d.display->display, GC, r->PixColors[fg]);
266		315
267	while (len--)	316	while (len--)
268	{	317	{
		318	compose_char *cc;
269	text_t t = *text++;	319	text_t t = *text++;
270		320
		321	// is it in our linedrawing table?
271	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	322	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
272	{	323	{
273	const char *p = linedraw_cmds[t - 0x2500];	324	const char *p = linedraw_cmds[t - 0x2500];
274		325
275	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	326	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
276	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	327	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
277		328
278	XGCValues gcv;	329	XGCValues gcv;
279		330
280	while (*p)	331	while (*p)
281	{	332	{
282	switch (*p++)	333	switch (*p++)
283	{	334	{
284	case '1':	335	case '1':
285	gcv.line_width = 0;	336	gcv.line_width = 0;
286	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	337	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
287	break;	338	break;
288		339
289	case '2':	340	case '2':
290	gcv.line_width = 2;	341	gcv.line_width = 2;
291	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	342	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
292	break;	343	break;
293		344
294	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	345	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
295	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	346	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
296	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	347	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
297	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	348	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
298	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;	349	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
299	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;	350	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
300	}	351	}
301	}	352	}
302		353
303	gcv.line_width = 0;	354	gcv.line_width = 0;
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	355	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		356	}
		357	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
		358	{
		359	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		360	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		361	if (cc->c2 != NOCHAR)
		362	{
		363	// prefer font of first character, for no good reasons
		364	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		365	? f1
		366	: (*fs)[fs->find_font (cc->c2)];
		367
		368	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		369	}
305	}	370	}
306	else	371	else
307	switch (*text++)	372	switch (t)
308	{	373	{
309	case NOCHAR:
310	case ZERO_WIDTH_CHAR:	374	case ZERO_WIDTH_CHAR:
311	break;	375	break;
312	default:	376	default:
313	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	377	int w = 0;
		378	while (len > 0 && *text == NOCHAR)
		379	{
		380	++text;
		381	--len;
		382	w += r->TermWin.fwidth;
		383	}
		384
		385	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		386	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		387	x += w;
314	}	388	}
315		389
316	x += r->TermWin.fwidth;	390	x += r->TermWin.fwidth;
317	}	391	}
318	}	392	}
…		…
322	struct rxvt_font_x11 : rxvt_font {	396	struct rxvt_font_x11 : rxvt_font {
323	rxvt_font_x11 () { f = 0; }	397	rxvt_font_x11 () { f = 0; }
324		398
325	void clear ();	399	void clear ();
326		400
327	bool load (int maxheight);	401	rxvt_fontprop properties ();
		402
		403	bool load (const rxvt_fontprop &prop);
328		404
329	bool has_codepoint (uint32_t unicode);	405	bool has_codepoint (uint32_t unicode);
330		406
331	void draw (int x, int y,	407	void draw (rxvt_drawable &d, int x, int y,
332	const text_t *text, int len,	408	const text_t *text, int len,
333	int fg, int bg);	409	int fg, int bg);
334		410
335	XFontStruct *f;	411	XFontStruct *f;
336	codeset cs;	412	codeset cs;
337	bool enc2b, encm;	413	bool enc2b, encm;
338		414
339	const char get_property (const char property, const char *repl) const;	415	const char get_property (XFontStruct f, const char property, const char repl) const;
		416	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		417	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		418	bool set_properties (rxvt_fontprop &p, const char *name);
340	};	419	};
341		420
342	const char *	421	const char *
343	rxvt_font_x11::get_property (const char property, const char repl) const	422	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
344	{	423	{
345	unsigned long value;	424	unsigned long value;
346		425
347	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	426	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348	return XGetAtomName (DISPLAY, value);	427	return XGetAtomName (DISPLAY, value);
349	else	428	else
350	return repl;	429	return repl;
351	}	430	}
352		431
		432	rxvt_fontprop
		433	rxvt_font_x11::properties ()
		434	{
		435	rxvt_fontprop p;
		436	set_properties (p, f);
		437	return p;
		438	}
		439
353	bool	440	bool
354	rxvt_font_x11::load (int maxheight)	441	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		442	{
		443	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		444	p.height = height;
		445	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		446	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		447
		448	return true;
		449	}
		450
		451	bool
		452	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		453	{
		454	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		455	const char *slant = get_property (f, "SLANT", "r");
		456
		457	unsigned long height;
		458	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		459	return false;
		460
		461	unsigned long avgwidth;
		462	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		463	avgwidth = 0;
		464
		465	return set_properties (p, height, weight, slant, avgwidth);
		466	}
		467
		468	bool
		469	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		470	{
		471	int slashes = 0;
		472	const char *comp[13];
		473
		474	for (const char c = name; c; c++)
		475	if (*c == '-')
		476	{
		477	comp[slashes++] = c + 1;
		478	if (slashes >= 13)
		479	break;
		480	}
		481
		482	/* can we short-circuit the costly XLoadQueryFont? */
		483	if (slashes >= 13
		484	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		485	&& (comp[11] >= '0' && comp[11] <= '9'))
		486	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		487
		488	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		489
		490	if (f)
		491	{
		492	// the font should really exist now. if not, we have a problem
		493	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		494	// in that case, just return garbage.
		495	bool ret = set_properties (p, f);
		496	XFreeFont (DISPLAY, f);
		497	return ret;
		498	}
		499	else
		500	return false;
		501	}
		502
		503	// fix the size of scalable fonts
		504	static void
		505	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		506	{
		507	int slashes = 0;
		508	const char *size;
		509
		510	for (const char c = name; c; c++)
		511	if (*c == '-')
		512	{
		513	if (slashes == 6)
		514	size = c + 1;
		515
		516	if (++slashes >= 13)
		517	break;
		518	}
		519
		520	if (slashes >= 13 && size[0] == '0')
		521	{
		522	strncpy (buf, name, size - name);
		523	buf += size - name;
		524	buf += sprintf (buf, "%d", prop.height);
		525	strcpy (buf, size + 1);
		526	}
		527	else
		528	strcpy (buf, name);
		529	}
		530
		531	bool
		532	rxvt_font_x11::load (const rxvt_fontprop &prop)
355	{	533	{
356	clear ();	534	clear ();
357		535
358	char **list;	536	char **list;
359	int count;	537	int count;
360	XFontStruct *info;
361	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	538	list = XListFonts (DISPLAY, name, 512, &count);
		539	set_name (0);
362		540
363	if (!list)	541	if (!list)
364	return false;	542	return false;
365		543
366	XFontStruct *best = 0;	544	int bestdiff = 0x7fffffff;
367	for (int i = 0; i < count; i++)	545	for (int i = 0; i < count; i++)
368	{	546	{
369	XFontStruct *f = info + i;	547	rxvt_fontprop p;
370	if (f->ascent + f->descent <= maxheight) // weed out too large fonts	548	char fname[1024];
		549	fix_scalable (fname, list[i], prop);
		550
		551	if (!set_properties (p, fname))
		552	continue;
		553
		554	if (p.height > prop.height) // weed out too large fonts
		555	continue;
		556
		557	int diff = (prop.height - p.height) * 32
		558	+ abs (prop.weight - p.weight)
		559	+ abs (prop.slant - p.slant );
		560
371	if (!best // compare against best found so far	561	if (!name // compare against best found so far
372	\|\| best->ascent + best->descent < f->ascent + f->descent)	562	\|\| diff < bestdiff)
		563	{
		564	set_name (strdup (fname));
373	best = f;	565	bestdiff = diff;
		566	}
374	}	567	}
375		568
376	set_name (strdup (list[best - info]));	569	XFreeFontNames (list);
377		570
378	XFreeFontInfo (list, info, count);	571	if (!name)
		572	return false;
379		573
380	f = XLoadQueryFont (DISPLAY, name);	574	f = XLoadQueryFont (DISPLAY, name);
381		575
382	if (!f)	576	if (!f)
383	return false;	577	return false;
384		578
385	unsigned long value;
386
387	const char *registry = get_property ("CHARSET_REGISTRY", 0);	579	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
388	const char *encoding = get_property ("CHARSET_ENCODING", 0);	580	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
389		581
390	if (registry && encoding)	582	if (registry && encoding)
391	{	583	{
392	char charset[64];	584	char charset[64];
393	snprintf (charset, 64, "%s-%s", registry, encoding);	585	snprintf (charset, 64, "%s-%s", registry, encoding);
394		586
395	cs = codeset_from_name (charset);	587	cs = codeset_from_name (charset);
396	}	588	}
397	else	589	else
398	{	590	{
399	const char *charset = get_property ("FONT", 0);	591	const char *charset = get_property (f, "FONT", 0);
400		592
401	if (!charset)	593	if (!charset)
402	charset = name;	594	charset = name;
403		595
404	int count = 13;	596	int count = 13;
…		…
417		609
418	ascent = f->ascent;	610	ascent = f->ascent;
419	descent = f->descent;	611	descent = f->descent;
420	height = ascent + descent;	612	height = ascent + descent;
421		613
422	prop = false;	614	slow = false;
423		615
424	if (f->min_bounds.width == f->max_bounds.width)	616	if (f->min_bounds.width == f->max_bounds.width)
425	width = f->min_bounds.width;	617	width = f->min_bounds.width;
426	else if (f->per_char == NULL)	618	else if (f->per_char == NULL)
427	width = f->max_bounds.width;	619	width = f->max_bounds.width;
428	else	620	else
429	{	621	{
430	prop = true;	622	slow = true;
431		623
432	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	624	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
433		625
434	if (encm)	626	if (encm)
435	N += (f->max_byte1 - f->min_byte1)	627	N += (f->max_byte1 - f->min_byte1)
…		…
477	/* check wether the character exists in _this_ font. horrible. */	669	/* check wether the character exists in _this_ font. horrible. */
478	XCharStruct *xcs;	670	XCharStruct *xcs;
479		671
480	if (encm)	672	if (encm)
481	{	673	{
482	int byte1 = ch >> 8;	674	unsigned char byte1 = ch >> 8;
483	int byte2 = ch & 255;	675	unsigned char byte2 = ch & 255;
484		676
485	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	677	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
486	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	678	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
487	return false;	679	return false;
488		680
…		…
511		703
512	return true;	704	return true;
513	}	705	}
514		706
515	void	707	void
516	rxvt_font_x11::draw (int x, int y,	708	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
517	const text_t *text, int len,	709	const text_t *text, int len,
518	int fg, int bg)	710	int fg, int bg)
519	{	711	{
520	// this looks like a mess /.	712	// this looks like a mess /.
521	// and it is a mess /.	713	// and it is a mess /.
522	// yet we are trying to be perfect /.	714	// yet we are trying to be perfect /.
523	// but the result still isn't perfect /.	715	// but the result still isn't perfect /.
524		716
525	bool slow = prop	717	bool slow = this->slow
526	\|\| width != r->TermWin.fwidth	718	\|\| width != r->TermWin.fwidth
527	\|\| height != r->TermWin.fheight;	719	\|\| height != r->TermWin.fheight;
528		720
529	int base = r->TermWin.fbase;	721	int base = r->TermWin.fbase;
530		722
…		…
537	{	729	{
538	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	730	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
539		731
540	if (bg == Color_bg && !slow)	732	if (bg == Color_bg && !slow)
541	{	733	{
542	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	734	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
543	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	735	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
544	}	736	}
545	else	737	else
546	{	738	{
547	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	739	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
548		740
549	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	741	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
550		742
551	if (slow)	743	if (slow)
552	{	744	{
553	do	745	do
554	{	746	{
555	if (xc->byte1 \|\| xc->byte2)	747	if (xc->byte1 \|\| xc->byte2)
556	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	748	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
557		749
558	x += r->TermWin.fwidth;	750	x += r->TermWin.fwidth;
559	xc++; len--;	751	xc++; len--;
560	}	752	}
561	while (len);	753	while (len);
562	}	754	}
563	else	755	else
564	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	756	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
565	}	757	}
566	}	758	}
567	else	759	else
568	{	760	{
569	const char *xc = enc_char (text, len, cs, slow);	761	const char *xc = enc_char (text, len, cs, slow);
570		762
571	if (bg == Color_bg && !slow)	763	if (bg == Color_bg && !slow)
572	{	764	{
573	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	765	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
574	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	766	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
575	}	767	}
576	else	768	else
577	{	769	{
578	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	770	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
579		771
580	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	772	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
581		773
582	if (slow)	774	if (slow)
583	{	775	{
584	do	776	do
585	{	777	{
586	if (*xc)	778	if (*xc)
587	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	779	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
588		780
589	x += r->TermWin.fwidth;	781	x += r->TermWin.fwidth;
590	xc++; len--;	782	xc++; len--;
591	}	783	}
592	while (len);	784	while (len);
593	}	785	}
594	else	786	else
595	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	787	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
596	}	788	}
597	}	789	}
598	}	790	}
599		791
600	/////////////////////////////////////////////////////////////////////////////	792	/////////////////////////////////////////////////////////////////////////////
…		…
605	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	797	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
606	#define SWATHBITS 8	798	#define SWATHBITS 8
607	#endif	799	#endif
608		800
609	struct rxvt_font_xft : rxvt_font {	801	struct rxvt_font_xft : rxvt_font {
610	#if 0
611	enum {
612	SWATHCOUNT = 1 << (21 - UNIBITS),
613	SWATHSIZE = 1 << (SWATHBITS - 5)
614	};
615	typedef uint32_t swath[SWATHSIZE];
616
617	swath *cvr[SWATHCOUNT];
618	#endif
619
620	#if 0
621	void gen_coverage_swath (unsigned int page);
622
623	bool has_char (uint32_t ch)
624	{
625	unsigned int page = ch >> SWATHBITS;
626	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
627
628	if (page >= SWATHCOUNT)
629	return false;
630
631	if (!cvr[page]) gen_coverage_swath (page);
632
633	return cvr[page][idx >> 5] & (1 << (idx & 31));
634	}
635	#endif
636	rxvt_font_xft () { f = 0; d = 0; }	802	rxvt_font_xft () { f = 0; }
637		803
638	void clear ();	804	void clear ();
639		805
640	bool load (int maxheight);	806	rxvt_fontprop properties ();
641		807
642	void draw (int x, int y,	808	bool load (const rxvt_fontprop &prop);
		809
		810	void draw (rxvt_drawable &d, int x, int y,
643	const text_t *text, int len,	811	const text_t *text, int len,
644	int fg, int bg);	812	int fg, int bg);
645		813
646	bool has_codepoint (uint32_t unicode);	814	bool has_codepoint (uint32_t unicode);
647		815
648	protected:	816	protected:
649	XftFont *f;	817	XftFont *f;
650	XftDraw *d;
651
652	#if 0
653	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
654	void set_swath (uint32_t ch)
655	{
656	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
657	}
658	#endif
659	};	818	};
660		819
661	void	820	void
662	rxvt_font_xft::clear ()	821	rxvt_font_xft::clear ()
663	{	822	{
664	if (f)	823	if (f)
665	{	824	{
666	XftFontClose (DISPLAY, f);	825	XftFontClose (DISPLAY, f);
667	f = 0;	826	f = 0;
668	}	827	}
		828	}
669		829
670	if (d)	830	rxvt_fontprop
671	{	831	rxvt_font_xft::properties ()
672	XftDrawDestroy (d);	832	{
673	d = 0;	833	rxvt_fontprop p;
674	}
675		834
676	#if 0	835	FT_Face face = XftLockFace (f);
677	for (int i = 0; i < SWATHCOUNT; i++)	836
678	delete cvr[i];	837	p.width = width; p.height = height;
679	#endif	838	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		839	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		840
		841	XftUnlockFace (f);
		842
		843	return p;
680	}	844	}
681		845
682	bool	846	bool
683	rxvt_font_xft::load (int maxheight)	847	rxvt_font_xft::load (const rxvt_fontprop &prop)
684	{	848	{
685	#if 0	849	#if 0
686	for (int i = 0; i < SWATHCOUNT; i++)	850	for (int i = 0; i < SWATHCOUNT; i++)
687	cvr[i] = 0;	851	cvr[i] = 0;
688	#endif	852	#endif
689		853
690	clear ();	854	clear ();
691		855
692	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	856	FcPattern p = FcNameParse ((FcChar8 ) name);
		857
		858	if (!p)
		859	return false;
		860
		861	FcValue v;
		862
		863	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		864	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		865
		866	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		867	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		868
		869	#if 0 // clipping unfortunately destroys our precious double-width-characters
		870	// clip width, we can't do better, or can we?
		871	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		872	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		873	#endif
		874
		875	//FcPatternAddBool (p, FC_MINSPACE, 1);
		876
		877	XftResult result;
		878	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		879
		880	FcPatternDestroy (p);
		881
		882	if (!match)
		883	return false;
		884
		885	f = XftFontOpenPattern (DISPLAY, match);
693		886
694	if (!f)	887	if (!f)
		888	{
		889	FcPatternDestroy (match);
695	return false;	890	return false;
		891	}
696		892
697	FT_Face face = XftLockFace (f);	893	FT_Face face = XftLockFace (f);
698		894
699	prop = !FT_IS_FIXED_WIDTH (face);	895	slow = !FT_IS_FIXED_WIDTH (face);
700		896
701	int ftheight = 0;	897	int ftheight = 0;
702		898
703	for (;;)	899	for (;;)
704	{	900	{
…		…
706	FcChar8 c;	902	FcChar8 c;
707		903
708	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	904	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
709	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	905	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
710		906
711	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	907	if (g1.xOff != g2.xOff) // don't simply trust the font
		908	slow = true;
712		909
713	width = g2.xOff;	910	width = g2.xOff;
714	ascent = (face->size->metrics.ascender + 63) >> 6;	911	ascent = (face->size->metrics.ascender + 63) >> 6;
715	descent = (-face->size->metrics.descender + 63) >> 6;	912	descent = (-face->size->metrics.descender + 63) >> 6;
716	height = ascent + descent;	913	height = ascent + descent;
717		914
718	if (height <= maxheight \|\| !maxheight)	915	if (height <= prop.height \|\| !prop.height)
719	break;	916	break;
720		917
721	if (ftheight)	918	if (ftheight)
722	{	919	{
723	// take smaller steps near the end	920	// take smaller steps near the end
724	if (height > maxheight + 1) ftheight++;	921	if (height > prop.height + 1) ftheight++;
725	if (height > maxheight + 2) ftheight++;	922	if (height > prop.height + 2) ftheight++;
726	if (height > maxheight + 3) ftheight++;	923	if (height > prop.height + 3) ftheight++;
727		924
728	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	925	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
729	}	926	}
730	else	927	else
731	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	928	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
732	}	929	}
733		930
734	XftUnlockFace (f);	931	XftUnlockFace (f);
735		932
736	return true;	933	return true;
737	}	934	}
738
739	#if 0
740	void rxvt_font::gen_coverage_swath (unsigned int page)
741	{
742	cvr[page] = new swath;
743
744	for (int i = 0; i < SWATHSIZE; i++)
745	cvr[page][i] = 0;
746
747	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
748	}
749	#endif
750		935
751	bool	936	bool
752	rxvt_font_xft::has_codepoint (uint32_t unicode)	937	rxvt_font_xft::has_codepoint (uint32_t unicode)
753	{	938	{
754	return XftCharExists (DISPLAY, f, unicode);	939	return XftCharExists (DISPLAY, f, unicode);
755	}	940	}
756		941
757	void	942	void
758	rxvt_font_xft::draw (int x, int y,	943	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
759	const text_t *text, int len,	944	const text_t *text, int len,
760	int fg, int bg)	945	int fg, int bg)
761	{	946	{
762	if (!d)
763	{
764	dR;
765	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
766	}
767
768	if (bg >= 0 && bg != Color_bg)
769	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
770	else
771	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	947	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
772		948
773	if (!prop && width == r->TermWin.fwidth)	949	if (!slow && width == r->TermWin.fwidth && 0)
774	{	950	{
775	if (sizeof (text_t) == sizeof (FcChar16))	951	if (sizeof (text_t) == sizeof (FcChar16))
776	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	952	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
777	else	953	else
778	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	954	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
781	{	957	{
782	while (len)	958	while (len)
783	{	959	{
784	if (text != NOCHAR && text != ' ')	960	if (text != NOCHAR && text != ' ')
785	{	961	{
		962	int fwidth = r->TermWin.fwidth;
		963	if (len >= 2 && text[1] == NOCHAR)
		964	fwidth *= 2;
		965
		966	XGlyphInfo extents;
786	if (sizeof (text_t) == sizeof (FcChar16))	967	if (sizeof (text_t) == sizeof (FcChar16))
787	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	968	{
		969	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		970	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		971	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		972	}
788	else	973	else
789	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	974	{
		975	XGlyphInfo extents;
		976	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		977	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		978	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		979	}
790	}	980	}
791		981
792	x += r->TermWin.fwidth;	982	x += r->TermWin.fwidth;
793	text++;	983	text++;
794	len--;	984	len--;
…		…
798	#endif	988	#endif
799		989
800	/////////////////////////////////////////////////////////////////////////////	990	/////////////////////////////////////////////////////////////////////////////
801		991
802	rxvt_fontset::rxvt_fontset (rxvt_t r)	992	rxvt_fontset::rxvt_fontset (rxvt_t r)
803	#ifdef EXPLICIT_CONTEXT
804	: r(r)	993	: r (r)
805	#endif
806	{	994	{
807	clear ();	995	clear ();
808	}	996	}
809		997
810	rxvt_fontset::~rxvt_fontset ()	998	rxvt_fontset::~rxvt_fontset ()
…		…
813	}	1001	}
814		1002
815	void	1003	void
816	rxvt_fontset::clear ()	1004	rxvt_fontset::clear ()
817	{	1005	{
818	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1006	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
819	FONT_UNREF (*i);	1007	FONT_UNREF (*i);
820		1008
821	fonts.clear ();	1009	fonts.clear ();
822	base_id = 0;	1010	base_id = 0;
823	height = 0x7fffffff;	1011	base_prop.height = 0x7fffffff;
		1012	base_prop.weight = rxvt_fontprop::medium;
		1013	base_prop.slant = rxvt_fontprop::roman;
824		1014
825	fallback = fallback_fonts;	1015	fallback = fallback_fonts;
826	}	1016	}
827		1017
828	rxvt_font *	1018	rxvt_font *
…		…
848	f = new rxvt_font_x11;	1038	f = new rxvt_font_x11;
849	}	1039	}
850	else	1040	else
851	f = new rxvt_font_x11;	1041	f = new rxvt_font_x11;
852		1042
		1043	f->fs = this;
853	f->set_term (r);	1044	f->set_term (r);
854	f->set_name (strdup (name));	1045	f->set_name (strdup (name));
855		1046
856	f->cs = cs;	1047	f->cs = cs;
857	f->loaded = false;	1048	f->loaded = false;
…		…
875		1066
876	if (*desc == '[')	1067	if (*desc == '[')
877	{	1068	{
878	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1069	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
879		1070
880	const char *extra = desc++;	1071	//const char *extra = desc++; // not yet used
881		1072
882	desc = strchr (desc, ']');	1073	desc = strchr (desc, ']');
883		1074
884	if (!desc)	1075	if (!desc)
885	{	1076	{
…		…
915	if (fonts[i]->loaded)	1106	if (fonts[i]->loaded)
916	return true;	1107	return true;
917		1108
918	fonts[i]->loaded = true;	1109	fonts[i]->loaded = true;
919		1110
920	if (!fonts[i]->load (height))	1111	if (!fonts[i]->load (base_prop))
921	{	1112	{
922	fonts[i]->cs = CS_UNKNOWN;	1113	fonts[i]->cs = CS_UNKNOWN;
923	return false;	1114	return false;
924	}	1115	}
925		1116
926	return true;	1117	return true;
927	}	1118	}
928		1119
929	void	1120	bool
930	rxvt_fontset::populate (const char *desc)	1121	rxvt_fontset::populate (const char *desc)
931	{	1122	{
932	clear ();	1123	clear ();
933		1124
934	fonts.push_back (new_font (0, CS_UNICODE));	1125	fonts.push_back (new_font (0, CS_UNICODE));
…		…
938		1129
939	if (!base_id)	1130	if (!base_id)
940	base_id = 1;	1131	base_id = 1;
941		1132
942	// we currently need a base-font, no matter what	1133	// we currently need a base-font, no matter what
943	if (fonts.size () <= base_id)	1134	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
944	{	1135	{
		1136	puts ("unable to load specified font (s), falling back to 'fixed'\n");
945	add_fonts ("fixed");	1137	add_fonts ("fixed");
946	base_id = 1;	1138	base_id = fonts.size () - 1;
947	}	1139	}
948		1140
949	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1141	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
950	{	1142	return false;
951	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
952	exit (1);
953	}
954		1143
955	height = fonts[base_id]->height;	1144	base_prop = fonts[base_id]->properties ();
956		1145
957	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/	1146	return true;
958	}	1147	}
959		1148
960	int	1149	int
961	rxvt_fontset::find_font (uint32_t unicode)	1150	rxvt_fontset::find_font (uint32_t unicode)
962	{	1151	{
963	for (int i = 0; i < fonts.size (); i++)	1152	for (unsigned int i = 0; i < fonts.size (); i++)
964	{	1153	{
965	rxvt_font *f = fonts[i];	1154	rxvt_font *f = fonts[i];
966		1155
967	if (!f->loaded)	1156	if (!f->loaded)
968	{	1157	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs. Revision 1.38 by pcg, Fri Mar 5 21:26:01 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs.
Revision 1.38 by pcg, Fri Mar 5 21:26:01 2004 UTC