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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs. Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC