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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.49 by pcg, Mon Mar 22 15:15:04 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;
250	if (unicode >= 0x0080 && unicode <= 0x009f)	234
		235	if (unicode <= 0x007f)
		236	return false;
		237
		238	if (unicode <= 0x009f)
251	return true;	239	return true;
252		240
253	if (unicode >= 0x2500 && unicode <= 0x257f	241	if (unicode >= 0x2500 && unicode <= 0x259f)
254	&& linedraw_cmds[unicode - 0x2500])	242	return true;
		243
		244	if (IS_COMPOSE (unicode))
255	return true;	245	return true;
256		246
257	switch (unicode)	247	switch (unicode)
258	{	248	{
259	case ZERO_WIDTH_CHAR:	249	case ZERO_WIDTH_CHAR:
…		…
261	}	251	}
262		252
263	return false;	253	return false;
264	}	254	}
265		255
266	void draw (int x, int y,	256	void draw (rxvt_drawable &d, int x, int y,
267	const text_t *text, int len,	257	const text_t *text, int len,
268	int fg, int bg);	258	int fg, int bg);
269	};	259	};
270		260
271	void	261	void
272	rxvt_font_default::draw (int x, int y,	262	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
273	const text_t *text, int len,	263	const text_t *text, int len,
274	int fg, int bg)	264	int fg, int bg)
275	{	265	{
276	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	266	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
277		267
278	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	268	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
279		269
280	while (len--)	270	while (len--)
281	{	271	{
		272	#if ENABLE_COMBINING
		273	compose_char *cc;
		274	#endif
282	text_t t = *text++;	275	text_t t = *text++;
283		276
284	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	277	if (0x2500 <= t && t <= 0x259f)
		278	{
		279	uint16_t offs = linedraw_offs[t - 0x2500];
		280	uint32_t *a = linedraw_command + (offs >> 4);
		281	uint32_t *b = a + (offs & 15);
		282
		283	int W = r->TermWin.fwidth;
		284	int H = r->TermWin.fheight;
		285
		286	int x_[16];
		287	int y_[16];
		288
		289	for (int i = 0; i <= 8; i++)
285	{	290	{
286	const char *p = linedraw_cmds[t - 0x2500];	291	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		292	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		293	}
287		294
288	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	295	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
289	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	296	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
290		297
291	XGCValues gcv;	298	XGCValues gcv;
292		299
		300	gcv.cap_style = CapButt;
		301	gcv.line_width = 0;
		302	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		303
293	while (*p)	304	while (a < b)
294	{	305	{
		306	uint32_t command = *a++;
		307
		308	int op = (command >> 24) & 255;
		309	int a = (command >> 20) & 15;
		310	int b = (command >> 16) & 15;
		311	int x1 = x_[(command >> 12) & 15];
		312	int y1 = y_[(command >> 8) & 15];
		313	int x2 = x_[(command >> 4) & 15];
		314	int y2 = y_[(command >> 0) & 15];
		315
295	switch (*p++)	316	switch (op)
296	{	317	{
297	case '1':	318	case 0: // line
298	gcv.line_width = 0;	319	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
299	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
300	break;	320	break;
301		321
302	case '2':	322	case 1: // rectangle, possibly stippled
		323	if (a)
		324	{
		325	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		326
		327	gcv.fill_style = FillStippled;
		328	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		329	gcv.ts_x_origin = x;
		330	gcv.ts_y_origin = y;
		331
		332	XChangeGC (d.display->display, TGC,
		333	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		334	&gcv);
		335	}
		336
		337	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		338
		339	if (a)
		340	{
		341	XFreePixmap (d.display->display, gcv.stipple);
303	gcv.line_width = 2;	342	gcv.stipple = 0;
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	343	gcv.fill_style = FillSolid;
		344	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		345	}
305	break;	346	break;
306		347	case 2: // arc
307	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	348	XDrawArc (d.display->display, d, TGC,
308	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	349	x1 - W/2, y1 - H/2, W-1, H-1,
309	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	350	(a - 1) * 9064, (b - 1) 90*64);
310	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	351	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	}	352	}
314	}	353	}
315		354	}
316	gcv.line_width = 0;	355	#if ENABLE_COMBINING
317	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	356	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
318	}	357	{
		358	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		359	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		360	if (cc->c2 != NOCHAR)
		361	{
		362	// prefer font of first character, for no good reasons
		363	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		364	? f1
		365	: (*fs)[fs->find_font (cc->c2)];
		366
		367	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		368	}
		369	}
		370	#endif
319	else	371	else
320	switch (*text++)	372	switch (t)
321	{	373	{
322	case NOCHAR:
323	case ZERO_WIDTH_CHAR:	374	case ZERO_WIDTH_CHAR:
324	break;	375	break;
		376
325	default:	377	default:
326	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	378	int w = 0;
		379	while (len > 0 && *text == NOCHAR)
		380	{
		381	++text;
		382	--len;
		383	w += r->TermWin.fwidth;
		384	}
		385
		386	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
		387	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
		388	x += w;
327	}	389	}
328		390
329	x += r->TermWin.fwidth;	391	x += r->TermWin.fwidth;
330	}	392	}
331	}	393	}
…		…
336	rxvt_font_x11 () { f = 0; }	398	rxvt_font_x11 () { f = 0; }
337		399
338	void clear ();	400	void clear ();
339		401
340	rxvt_fontprop properties ();	402	rxvt_fontprop properties ();
341	rxvt_fontprop properties (XFontStruct *f);
342		403
343	bool load (const rxvt_fontprop &prop);	404	bool load (const rxvt_fontprop &prop);
344		405
345	bool has_codepoint (uint32_t unicode);	406	bool has_codepoint (unicode_t unicode);
346		407
347	void draw (int x, int y,	408	void draw (rxvt_drawable &d, int x, int y,
348	const text_t *text, int len,	409	const text_t *text, int len,
349	int fg, int bg);	410	int fg, int bg);
350		411
351	XFontStruct *f;	412	XFontStruct *f;
352	codeset cs;	413	codeset cs;
353	bool enc2b, encm;	414	bool enc2b, encm;
354		415
355	const char get_property (XFontStruct f, const char property, const char repl) const;	416	char get_property (XFontStruct f, const char property, const char repl) const;
		417	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		418	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		419	bool set_properties (rxvt_fontprop &p, const char *name);
356	};	420	};
357		421
358	const char *	422	char *
359	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	423	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
360	{	424	{
361	unsigned long value;	425	unsigned long value;
362		426
363	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	427	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
364	return XGetAtomName (DISPLAY, value);	428	return XGetAtomName (DISPLAY, value);
365	else	429	else
366	return repl;	430	return rxvt_strdup (repl);
367	}	431	}
368		432
369	rxvt_fontprop	433	rxvt_fontprop
370	rxvt_font_x11::properties ()	434	rxvt_font_x11::properties ()
371	{	435	{
372	return properties (f);
373	}
374
375	rxvt_fontprop
376	rxvt_font_x11::properties (XFontStruct *f)
377	{
378	rxvt_fontprop p;	436	rxvt_fontprop p;
		437	set_properties (p, f);
		438	return p;
		439	}
379		440
380	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	441	bool
381	const char *slant = get_property (f, "SLANT", "r");	442	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
382		443	{
		444	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
383	p.height = height;	445	p.height = height;
384	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	446	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
385	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	447	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
386		448
387	return p;	449	return true;
		450	}
		451
		452	bool
		453	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		454	{
		455	unsigned long height;
		456	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		457	return false;
		458
		459	unsigned long avgwidth;
		460	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		461	avgwidth = 0;
		462
		463	char *weight = get_property (f, "WEIGHT_NAME", "medium");
		464	char *slant = get_property (f, "SLANT", "r");
		465
		466	set_properties (p, height, weight, slant, avgwidth);
		467
		468	free (weight);
		469	free (slant);
		470
		471	return true;
		472	}
		473
		474	bool
		475	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		476	{
		477	int slashes = 0;
		478	const char *comp[13];
		479
		480	for (const char c = name; c; c++)
		481	if (*c == '-')
		482	{
		483	comp[slashes++] = c + 1;
		484	if (slashes >= 13)
		485	break;
		486	}
		487
		488	/* can we short-circuit the costly XLoadQueryFont? */
		489	if (slashes >= 13
		490	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		491	&& (comp[11] >= '0' && comp[11] <= '9'))
		492	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		493
		494	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		495
		496	if (f)
		497	{
		498	// the font should really exist now. if not, we have a problem
		499	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		500	// in that case, just return garbage.
		501	bool ret = set_properties (p, f);
		502	XFreeFont (DISPLAY, f);
		503	return ret;
		504	}
		505	else
		506	return false;
		507	}
		508
		509	// fix the size of scalable fonts
		510	static void
		511	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		512	{
		513	int slashes = 0;
		514	const char *size;
		515
		516	for (const char c = name; c; c++)
		517	if (*c == '-')
		518	{
		519	if (slashes == 6)
		520	size = c + 1;
		521
		522	if (++slashes >= 13)
		523	break;
		524	}
		525
		526	if (slashes >= 13 && size[0] == '0')
		527	{
		528	strncpy (buf, name, size - name);
		529	buf += size - name;
		530	buf += sprintf (buf, "%d", prop.height);
		531	strcpy (buf, size + 1);
		532	}
		533	else
		534	strcpy (buf, name);
388	}	535	}
389		536
390	bool	537	bool
391	rxvt_font_x11::load (const rxvt_fontprop &prop)	538	rxvt_font_x11::load (const rxvt_fontprop &prop)
392	{	539	{
393	clear ();	540	clear ();
394		541
395	char **list;	542	char **list;
396	int count;	543	int count;
397	XFontStruct *info;
398	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	544	list = XListFonts (DISPLAY, name, 512, &count);
		545	set_name (0);
399		546
400	if (!list)	547	if (!list)
401	return false;	548	return false;
402		549
403	int bestdiff = 0x7fffffff;	550	int bestdiff = 0x7fffffff;
404	XFontStruct *best = 0;
405	for (int i = 0; i < count; i++)	551	for (int i = 0; i < count; i++)
406	{	552	{
407	XFontStruct *f = info + i;	553	rxvt_fontprop p;
		554	char fname[1024];
		555	fix_scalable (fname, list[i], prop);
408		556
		557	if (!set_properties (p, fname))
		558	continue;
		559
409	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	560	if (p.height > prop.height) // weed out too large fonts
410	{	561	continue;
411	rxvt_fontprop p = properties (f);	562
412	int diff = (prop.height - f->ascent + f->descent) * 32	563	int diff = (prop.height - p.height) * 32
413	+ abs (prop.weight - p.weight)	564	+ abs (prop.weight - p.weight)
414	+ abs (prop.slant - p.slant );	565	+ abs (prop.slant - p.slant );
415		566
416	if (!best // compare against best found so far	567	if (!name // compare against best found so far
417	\|\| diff < bestdiff)	568	\|\| diff < bestdiff)
418	{	569	{
419	best = f;	570	set_name (strdup (fname));
420	bestdiff = diff;	571	bestdiff = diff;
421	}	572	}
422	}
423	}	573	}
424		574
425	set_name (strdup (list[best - info]));	575	XFreeFontNames (list);
426		576
427	XFreeFontInfo (list, info, count);	577	if (!name)
		578	return false;
428		579
429	f = XLoadQueryFont (DISPLAY, name);	580	f = XLoadQueryFont (DISPLAY, name);
430		581
431	if (!f)	582	if (!f)
432	return false;	583	return false;
433		584
434	unsigned long value;
435
436	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	585	char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	586	char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438		587
439	if (registry && encoding)	588	if (registry && encoding)
440	{	589	{
441	char charset[64];	590	char charset[64];
442	snprintf (charset, 64, "%s-%s", registry, encoding);	591	snprintf (charset, 64, "%s-%s", registry, encoding);
…		…
455	if (*charset++ == '-' && !--count)	604	if (*charset++ == '-' && !--count)
456	break;	605	break;
457		606
458	cs = codeset_from_name (charset);	607	cs = codeset_from_name (charset);
459	}	608	}
		609
		610	free (registry);
		611	free (encoding);
460		612
461	if (cs == CS_UNICODE)	613	if (cs == CS_UNICODE)
462	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	614	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
463		615
464	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	616	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
514	f = 0;	666	f = 0;
515	}	667	}
516	}	668	}
517		669
518	bool	670	bool
519	rxvt_font_x11::has_codepoint (uint32_t unicode)	671	rxvt_font_x11::has_codepoint (unicode_t unicode)
520	{	672	{
521	uint32_t ch = FROM_UNICODE (cs, unicode);	673	uint32_t ch = FROM_UNICODE (cs, unicode);
522		674
523	if (ch == NOCHAR)	675	if (ch == NOCHAR)
524	return false;	676	return false;
…		…
526	/* check wether the character exists in _this_ font. horrible. */	678	/* check wether the character exists in _this_ font. horrible. */
527	XCharStruct *xcs;	679	XCharStruct *xcs;
528		680
529	if (encm)	681	if (encm)
530	{	682	{
531	int byte1 = ch >> 8;	683	unsigned char byte1 = ch >> 8;
532	int byte2 = ch & 255;	684	unsigned char byte2 = ch & 255;
533		685
534	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	686	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
535	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	687	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
536	return false;	688	return false;
537		689
…		…
560		712
561	return true;	713	return true;
562	}	714	}
563		715
564	void	716	void
565	rxvt_font_x11::draw (int x, int y,	717	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
566	const text_t *text, int len,	718	const text_t *text, int len,
567	int fg, int bg)	719	int fg, int bg)
568	{	720	{
569	// this looks like a mess /.	721	// this looks like a mess /.
570	// and it is a mess /.	722	// and it is a mess /.
…		…
586	{	738	{
587	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	739	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
588		740
589	if (bg == Color_bg && !slow)	741	if (bg == Color_bg && !slow)
590	{	742	{
591	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	743	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
592	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	744	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
593	}	745	}
594	else	746	else
595	{	747	{
596	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	748	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
597		749
598	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	750	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
599		751
600	if (slow)	752	if (slow)
601	{	753	{
602	do	754	do
603	{	755	{
604	if (xc->byte1 \|\| xc->byte2)	756	if (xc->byte1 \|\| xc->byte2)
605	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	757	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
606		758
607	x += r->TermWin.fwidth;	759	x += r->TermWin.fwidth;
608	xc++; len--;	760	xc++; len--;
609	}	761	}
610	while (len);	762	while (len);
611	}	763	}
612	else	764	else
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	765	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
614	}	766	}
615	}	767	}
616	else	768	else
617	{	769	{
618	const char *xc = enc_char (text, len, cs, slow);	770	const char *xc = enc_char (text, len, cs, slow);
619		771
620	if (bg == Color_bg && !slow)	772	if (bg == Color_bg && !slow)
621	{	773	{
622	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	774	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
623	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	775	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
624	}	776	}
625	else	777	else
626	{	778	{
627	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	779	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
628		780
629	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	781	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
630		782
631	if (slow)	783	if (slow)
632	{	784	{
633	do	785	do
634	{	786	{
635	if (*xc)	787	if (*xc)
636	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	788	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
637		789
638	x += r->TermWin.fwidth;	790	x += r->TermWin.fwidth;
639	xc++; len--;	791	xc++; len--;
640	}	792	}
641	while (len);	793	while (len);
642	}	794	}
643	else	795	else
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	796	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
645	}	797	}
646	}	798	}
647	}	799	}
648		800
649	/////////////////////////////////////////////////////////////////////////////	801	/////////////////////////////////////////////////////////////////////////////
…		…
654	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	806	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655	#define SWATHBITS 8	807	#define SWATHBITS 8
656	#endif	808	#endif
657		809
658	struct rxvt_font_xft : rxvt_font {	810	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; }	811	rxvt_font_xft () { f = 0; }
686		812
687	void clear ();	813	void clear ();
688		814
689	rxvt_fontprop properties ();	815	rxvt_fontprop properties ();
690		816
691	bool load (const rxvt_fontprop &prop);	817	bool load (const rxvt_fontprop &prop);
692		818
693	void draw (int x, int y,	819	void draw (rxvt_drawable &d, int x, int y,
694	const text_t *text, int len,	820	const text_t *text, int len,
695	int fg, int bg);	821	int fg, int bg);
696		822
697	bool has_codepoint (uint32_t unicode);	823	bool has_codepoint (unicode_t unicode);
698		824
699	protected:	825	protected:
700	XftFont *f;	826	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	};	827	};
711		828
712	void	829	void
713	rxvt_font_xft::clear ()	830	rxvt_font_xft::clear ()
714	{	831	{
715	if (f)	832	if (f)
716	{	833	{
717	XftFontClose (DISPLAY, f);	834	XftFontClose (DISPLAY, f);
718	f = 0;	835	f = 0;
719	}	836	}
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	}	837	}
732		838
733	rxvt_fontprop	839	rxvt_fontprop
734	rxvt_font_xft::properties ()	840	rxvt_font_xft::properties ()
735	{	841	{
736	rxvt_fontprop p;	842	rxvt_fontprop p;
737		843
738	FT_Face face = XftLockFace (f);	844	FT_Face face = XftLockFace (f);
739		845
740	p.height = height;	846	p.width = width; p.height = height;
741	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	847	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;	848	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743		849
744	XftUnlockFace (f);	850	XftUnlockFace (f);
745		851
…		…
766	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	872	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
767	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	873	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768		874
769	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	875	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770	FcPatternAddInteger (p, FC_SLANT, prop.slant);	876	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		877
		878	#if 0 // clipping unfortunately destroys our precious double-width-characters
		879	// clip width, we can't do better, or can we?
		880	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		881	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		882	#endif
771		883
772	//FcPatternAddBool (p, FC_MINSPACE, 1);	884	//FcPatternAddBool (p, FC_MINSPACE, 1);
773		885
774	XftResult result;	886	XftResult result;
775	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	887	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
…		…
828	XftUnlockFace (f);	940	XftUnlockFace (f);
829		941
830	return true;	942	return true;
831	}	943	}
832		944
833	#if 0
834	void rxvt_font::gen_coverage_swath (unsigned int page)
835	{
836	cvr[page] = new swath;
837
838	for (int i = 0; i < SWATHSIZE; i++)
839	cvr[page][i] = 0;
840
841	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
842	}
843	#endif
844
845	bool	945	bool
846	rxvt_font_xft::has_codepoint (uint32_t unicode)	946	rxvt_font_xft::has_codepoint (unicode_t unicode)
847	{	947	{
848	return XftCharExists (DISPLAY, f, unicode);	948	return XftCharExists (DISPLAY, f, unicode);
849	}	949	}
850		950
851	void	951	void
852	rxvt_font_xft::draw (int x, int y,	952	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
853	const text_t *text, int len,	953	const text_t *text, int len,
854	int fg, int bg)	954	int fg, int bg)
855	{	955	{
856	if (!d)
857	{
858	dR;
859	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
860	}
861
862	if (bg >= 0 && bg != Color_bg)
863	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
864	else
865	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	956	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
866		957
867	if (!slow && width == r->TermWin.fwidth)	958	if (!slow && width == r->TermWin.fwidth && 0)
868	{	959	{
869	if (sizeof (text_t) == sizeof (FcChar16))	960	if (sizeof (text_t) == sizeof (FcChar16))
870	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	961	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
871	else	962	else
872	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	963	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
875	{	966	{
876	while (len)	967	while (len)
877	{	968	{
878	if (text != NOCHAR && text != ' ')	969	if (text != NOCHAR && text != ' ')
879	{	970	{
		971	int fwidth = r->TermWin.fwidth;
		972	if (len >= 2 && text[1] == NOCHAR)
		973	fwidth *= 2;
		974
		975	XGlyphInfo extents;
880	if (sizeof (text_t) == sizeof (FcChar16))	976	if (sizeof (text_t) == sizeof (FcChar16))
881	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	977	{
		978	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		979	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		980	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		981	}
882	else	982	else
883	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	983	{
		984	XGlyphInfo extents;
		985	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		986	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		987	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		988	}
884	}	989	}
885		990
886	x += r->TermWin.fwidth;	991	x += r->TermWin.fwidth;
887	text++;	992	text++;
888	len--;	993	len--;
…		…
892	#endif	997	#endif
893		998
894	/////////////////////////////////////////////////////////////////////////////	999	/////////////////////////////////////////////////////////////////////////////
895		1000
896	rxvt_fontset::rxvt_fontset (rxvt_t r)	1001	rxvt_fontset::rxvt_fontset (rxvt_t r)
897	#ifdef EXPLICIT_CONTEXT
898	: r(r)	1002	: r (r)
899	#endif
900	{	1003	{
901	clear ();	1004	clear ();
902	}	1005	}
903		1006
904	rxvt_fontset::~rxvt_fontset ()	1007	rxvt_fontset::~rxvt_fontset ()
…		…
907	}	1010	}
908		1011
909	void	1012	void
910	rxvt_fontset::clear ()	1013	rxvt_fontset::clear ()
911	{	1014	{
912	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1015	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
913	FONT_UNREF (*i);	1016	FONT_UNREF (*i);
914		1017
915	fonts.clear ();	1018	fonts.clear ();
916	base_id = 0;	1019	base_id = 0;
917	base_prop.height = 0x7fffffff;	1020	base_prop.height = 0x7fffffff;
…		…
944	f = new rxvt_font_x11;	1047	f = new rxvt_font_x11;
945	}	1048	}
946	else	1049	else
947	f = new rxvt_font_x11;	1050	f = new rxvt_font_x11;
948		1051
		1052	f->fs = this;
949	f->set_term (r);	1053	f->set_term (r);
950	f->set_name (strdup (name));	1054	f->set_name (strdup (name));
951		1055
952	f->cs = cs;	1056	f->cs = cs;
953	f->loaded = false;	1057	f->loaded = false;
…		…
971		1075
972	if (*desc == '[')	1076	if (*desc == '[')
973	{	1077	{
974	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1078	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
975		1079
976	const char *extra = desc++;	1080	//const char *extra = desc++; // not yet used
977		1081
978	desc = strchr (desc, ']');	1082	desc = strchr (desc, ']');
979		1083
980	if (!desc)	1084	if (!desc)
981	{	1085	{
…		…
1020	}	1124	}
1021		1125
1022	return true;	1126	return true;
1023	}	1127	}
1024		1128
1025	void	1129	bool
1026	rxvt_fontset::populate (const char *desc)	1130	rxvt_fontset::populate (const char *desc)
1027	{	1131	{
1028	clear ();	1132	clear ();
1029		1133
1030	fonts.push_back (new_font (0, CS_UNICODE));	1134	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1034		1138
1035	if (!base_id)	1139	if (!base_id)
1036	base_id = 1;	1140	base_id = 1;
1037		1141
1038	// we currently need a base-font, no matter what	1142	// we currently need a base-font, no matter what
1039	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1143	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1040	{	1144	{
		1145	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1041	add_fonts ("fixed");	1146	add_fonts ("fixed");
1042	base_id = fonts.size () - 1;	1147	base_id = fonts.size () - 1;
1043	}	1148	}
1044		1149
1045	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1150	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1046	{	1151	return false;
1047	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1048	exit (1);
1049	}
1050		1152
1051	base_prop = fonts[base_id]->properties ();	1153	base_prop = fonts[base_id]->properties ();
		1154
		1155	return true;
1052	}	1156	}
1053		1157
1054	int	1158	int
1055	rxvt_fontset::find_font (uint32_t unicode)	1159	rxvt_fontset::find_font (unicode_t unicode)
1056	{	1160	{
1057	for (int i = 0; i < fonts.size (); i++)	1161	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
		1162	i < fonts.size ();
		1163	i++)
1058	{	1164	{
1059	rxvt_font *f = fonts[i];	1165	rxvt_font *f = fonts[i];
1060		1166
1061	if (!f->loaded)	1167	if (!f->loaded)
1062	{	1168	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs. Revision 1.49 by pcg, Mon Mar 22 15:15:04 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.49 by pcg, Mon Mar 22 15:15:04 2004 UTC