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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.48 by pcg, Tue Mar 16 11:07:44 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 TGC 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;
33	} fallback_fonts[] = {	34	} fallback_fonts[] = {
…		…
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_1990_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, TGC, r->PixColors[color]);
169	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
		201	#endif
170	}	202	}
171	}	203	}
172		204
173	static const char *linedraw_cmds[128] = {	205	#include "table/linedraw.h"
174	"1hH", "2hH", "1vV", "2vV",
175	0, 0, 0, 0,
176	0, 0, 0, 0,
177	"1HV", "2H1V", "1H2V", "2HV",
178
179	// 2510
180	"1hV", "2h1V", "1h2V", "2hV",
181	"1Hv", "2H1v", "1H2v", "2Hv",
182	"1hv", "2h1v", "1h2v", "2hv",
183	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
184
185	// 2520
186	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
187	"1hvV", "2h1vV", "1hV2v", "1hv2V",
188	"1h2vV", "2hv1V", "1v2hV", "2hvV",
189	"1hHV", "2h1HV", "2H1hV", "2hH1V",
190
191	// 2530
192	"1hH2V", "2hV1H", "1h2HV", "2hHV",
193	"1hHv", "1vH2h", "1hv2H", "1v2hH",
194	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
195	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
196
197	// 2540
198	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
199	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
200	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
201	0, 0, 0, 0,
202
203	// 2550
204	0, 0, 0, 0,
205	0, 0, 0, 0,
206	0, 0, 0, 0,
207	0, 0, 0, 0,
208
209	// 2560
210	0, 0, 0, 0,
211	0, 0, 0, 0,
212	0, 0, 0, 0,
213	0, 0, 0, 0,
214
215	// 2570
216	0, "1a", "1b", "1ab",
217	"1h", "1v", "1H", "1V",
218	"2h", "2v", "2H", "2V",
219	"1h2H", "1v2V", "1H2h", "1V2v"
220
221	// to be done
222	};
223		206
224	struct rxvt_font_default : rxvt_font {	207	struct rxvt_font_default : rxvt_font {
225	bool load (int maxheight)	208
		209	rxvt_fontprop properties ()
		210	{
		211	rxvt_fontprop p;
		212
		213	p.width = p.height = 1;
		214	p.weight = rxvt_fontprop::medium;
		215	p.slant = rxvt_fontprop::roman;
		216
		217	return p;
		218	}
		219
		220	bool load (const rxvt_fontprop &prop)
226	{	221	{
227	width = 1; height = 1;	222	width = 1; height = 1;
228	ascent = 1; descent = 0;	223	ascent = 1; descent = 0;
229		224
		225	set_name (strdup ("built-in pseudofont"));
		226
230	return true;	227	return true;
231	}	228	}
232		229
233	bool has_codepoint (uint32_t unicode)	230	bool has_codepoint (unicode_t unicode)
234	{	231	{
235	if (unicode <= 0x001f)	232	if (unicode <= 0x001f)
236	return true;	233	return true;
237	if (unicode >= 0x0080 && unicode <= 0x009f)	234
		235	if (unicode <= 0x007f)
		236	return false;
		237
		238	if (unicode <= 0x009f)
238	return true;	239	return true;
239		240
240	if (unicode >= 0x2500 && unicode <= 0x257f	241	if (unicode >= 0x2500 && unicode <= 0x259f)
241	&& linedraw_cmds[unicode - 0x2500])	242	return true;
		243
		244	if (IS_COMPOSE (unicode))
242	return true;	245	return true;
243		246
244	switch (unicode)	247	switch (unicode)
245	{	248	{
246	case ZERO_WIDTH_CHAR:	249	case ZERO_WIDTH_CHAR:
…		…
248	}	251	}
249		252
250	return false;	253	return false;
251	}	254	}
252		255
253	void draw (int x, int y,	256	void draw (rxvt_drawable &d, int x, int y,
254	const text_t *text, int len,	257	const text_t *text, int len,
255	int fg, int bg);	258	int fg, int bg);
256	};	259	};
257		260
258	void	261	void
259	rxvt_font_default::draw (int x, int y,	262	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260	const text_t *text, int len,	263	const text_t *text, int len,
261	int fg, int bg)	264	int fg, int bg)
262	{	265	{
263	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);
264		267
265	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	268	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
266		269
267	while (len--)	270	while (len--)
268	{	271	{
		272	#if ENABLE_COMBINING
		273	compose_char *cc;
		274	#endif
269	text_t t = *text++;	275	text_t t = *text++;
270		276
271	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++)
272	{	290	{
273	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	}
274		294
275	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;
276	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;
277		297
278	XGCValues gcv;	298	XGCValues gcv;
279		299
		300	gcv.cap_style = CapButt;
		301	gcv.line_width = 0;
		302	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		303
280	while (*p)	304	while (a < b)
281	{	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
282	switch (*p++)	316	switch (op)
283	{	317	{
284	case '1':	318	case 0: // line
285	gcv.line_width = 0;	319	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
286	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
287	break;	320	break;
288		321
289	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);
290	gcv.line_width = 2;	342	gcv.stipple = 0;
291	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	343	gcv.fill_style = FillSolid;
		344	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		345	}
292	break;	346	break;
293		347	case 2: // arc
294	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	348	XDrawArc (d.display->display, d, TGC,
295	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	349	x1 - W/2, y1 - H/2, W-1, H-1,
296	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	350	(a - 1) * 9064, (b - 1) 90*64);
297	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	351	break;
298	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
299	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
300	}	352	}
301	}	353	}
302		354	}
303	gcv.line_width = 0;	355	#if ENABLE_COMBINING
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	356	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
305	}	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
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;
		376
312	default:	377	default:
313	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;
314	}	389	}
315		390
316	x += r->TermWin.fwidth;	391	x += r->TermWin.fwidth;
317	}	392	}
318	}	393	}
…		…
322	struct rxvt_font_x11 : rxvt_font {	397	struct rxvt_font_x11 : rxvt_font {
323	rxvt_font_x11 () { f = 0; }	398	rxvt_font_x11 () { f = 0; }
324		399
325	void clear ();	400	void clear ();
326		401
327	bool load (int maxheight);	402	rxvt_fontprop properties ();
328		403
		404	bool load (const rxvt_fontprop &prop);
		405
329	bool has_codepoint (uint32_t unicode);	406	bool has_codepoint (unicode_t unicode);
330		407
331	void draw (int x, int y,	408	void draw (rxvt_drawable &d, int x, int y,
332	const text_t *text, int len,	409	const text_t *text, int len,
333	int fg, int bg);	410	int fg, int bg);
334		411
335	XFontStruct *f;	412	XFontStruct *f;
336	codeset cs;	413	codeset cs;
337	bool enc2b, encm;	414	bool enc2b, encm;
338		415
339	const char get_property (const char property, const char *repl) const;	416	const 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);
340	};	420	};
341		421
342	const char *	422	const char *
343	rxvt_font_x11::get_property (const char property, const char repl) const	423	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
344	{	424	{
345	unsigned long value;	425	unsigned long value;
346		426
347	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	427	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348	return XGetAtomName (DISPLAY, value);	428	return XGetAtomName (DISPLAY, value);
349	else	429	else
350	return repl;	430	return repl;
351	}	431	}
352		432
		433	rxvt_fontprop
		434	rxvt_font_x11::properties ()
		435	{
		436	rxvt_fontprop p;
		437	set_properties (p, f);
		438	return p;
		439	}
		440
353	bool	441	bool
354	rxvt_font_x11::load (int maxheight)	442	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		443	{
		444	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		445	p.height = height;
		446	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		447	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		448
		449	return true;
		450	}
		451
		452	bool
		453	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		454	{
		455	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		456	const char *slant = get_property (f, "SLANT", "r");
		457
		458	unsigned long height;
		459	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		460	return false;
		461
		462	unsigned long avgwidth;
		463	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		464	avgwidth = 0;
		465
		466	return set_properties (p, height, weight, slant, avgwidth);
		467	}
		468
		469	bool
		470	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		471	{
		472	int slashes = 0;
		473	const char *comp[13];
		474
		475	for (const char c = name; c; c++)
		476	if (*c == '-')
		477	{
		478	comp[slashes++] = c + 1;
		479	if (slashes >= 13)
		480	break;
		481	}
		482
		483	/* can we short-circuit the costly XLoadQueryFont? */
		484	if (slashes >= 13
		485	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		486	&& (comp[11] >= '0' && comp[11] <= '9'))
		487	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		488
		489	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		490
		491	if (f)
		492	{
		493	// the font should really exist now. if not, we have a problem
		494	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		495	// in that case, just return garbage.
		496	bool ret = set_properties (p, f);
		497	XFreeFont (DISPLAY, f);
		498	return ret;
		499	}
		500	else
		501	return false;
		502	}
		503
		504	// fix the size of scalable fonts
		505	static void
		506	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		507	{
		508	int slashes = 0;
		509	const char *size;
		510
		511	for (const char c = name; c; c++)
		512	if (*c == '-')
		513	{
		514	if (slashes == 6)
		515	size = c + 1;
		516
		517	if (++slashes >= 13)
		518	break;
		519	}
		520
		521	if (slashes >= 13 && size[0] == '0')
		522	{
		523	strncpy (buf, name, size - name);
		524	buf += size - name;
		525	buf += sprintf (buf, "%d", prop.height);
		526	strcpy (buf, size + 1);
		527	}
		528	else
		529	strcpy (buf, name);
		530	}
		531
		532	bool
		533	rxvt_font_x11::load (const rxvt_fontprop &prop)
355	{	534	{
356	clear ();	535	clear ();
		536
		537	char **list;
		538	int count;
		539	list = XListFonts (DISPLAY, name, 512, &count);
		540	set_name (0);
		541
		542	if (!list)
		543	return false;
		544
		545	int bestdiff = 0x7fffffff;
		546	for (int i = 0; i < count; i++)
		547	{
		548	rxvt_fontprop p;
		549	char fname[1024];
		550	fix_scalable (fname, list[i], prop);
		551
		552	if (!set_properties (p, fname))
		553	continue;
		554
		555	if (p.height > prop.height) // weed out too large fonts
		556	continue;
		557
		558	int diff = (prop.height - p.height) * 32
		559	+ abs (prop.weight - p.weight)
		560	+ abs (prop.slant - p.slant );
		561
		562	if (!name // compare against best found so far
		563	\|\| diff < bestdiff)
		564	{
		565	set_name (strdup (fname));
		566	bestdiff = diff;
		567	}
		568	}
		569
		570	XFreeFontNames (list);
		571
		572	if (!name)
		573	return false;
357		574
358	f = XLoadQueryFont (DISPLAY, name);	575	f = XLoadQueryFont (DISPLAY, name);
359		576
360	if (!f)	577	if (!f)
361	return false;	578	return false;
362		579
363	unsigned long value;
364
365	const char *registry = get_property ("CHARSET_REGISTRY", 0);	580	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366	const char *encoding = get_property ("CHARSET_ENCODING", 0);	581	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367		582
368	if (registry && encoding)	583	if (registry && encoding)
369	{	584	{
370	char charset[64];	585	char charset[64];
371	snprintf (charset, 64, "%s-%s", registry, encoding);	586	snprintf (charset, 64, "%s-%s", registry, encoding);
372		587
373	cs = codeset_from_name (charset);	588	cs = codeset_from_name (charset);
374	}	589	}
375	else	590	else
376	{	591	{
377	const char *charset = get_property ("FONT", 0);	592	const char *charset = get_property (f, "FONT", 0);
378		593
379	if (!charset)	594	if (!charset)
380	charset = name;	595	charset = name;
381		596
382	int count = 13;	597	int count = 13;
…		…
395		610
396	ascent = f->ascent;	611	ascent = f->ascent;
397	descent = f->descent;	612	descent = f->descent;
398	height = ascent + descent;	613	height = ascent + descent;
399		614
400	prop = false;	615	slow = false;
401		616
402	if (f->min_bounds.width == f->max_bounds.width)	617	if (f->min_bounds.width == f->max_bounds.width)
403	width = f->min_bounds.width;	618	width = f->min_bounds.width;
404	else if (f->per_char == NULL)	619	else if (f->per_char == NULL)
405	width = f->max_bounds.width;	620	width = f->max_bounds.width;
406	else	621	else
407	{	622	{
408	prop = true;	623	slow = true;
409		624
410	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	625	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411		626
412	if (encm)	627	if (encm)
413	N += (f->max_byte1 - f->min_byte1)	628	N += (f->max_byte1 - f->min_byte1)
…		…
443	f = 0;	658	f = 0;
444	}	659	}
445	}	660	}
446		661
447	bool	662	bool
448	rxvt_font_x11::has_codepoint (uint32_t unicode)	663	rxvt_font_x11::has_codepoint (unicode_t unicode)
449	{	664	{
450	uint32_t ch = FROM_UNICODE (cs, unicode);	665	uint32_t ch = FROM_UNICODE (cs, unicode);
451		666
452	if (ch == NOCHAR)	667	if (ch == NOCHAR)
453	return false;	668	return false;
…		…
455	/* check wether the character exists in _this_ font. horrible. */	670	/* check wether the character exists in _this_ font. horrible. */
456	XCharStruct *xcs;	671	XCharStruct *xcs;
457		672
458	if (encm)	673	if (encm)
459	{	674	{
460	int byte1 = ch >> 8;	675	unsigned char byte1 = ch >> 8;
461	int byte2 = ch & 255;	676	unsigned char byte2 = ch & 255;
462		677
463	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	678	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
464	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	679	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
465	return false;	680	return false;
466		681
…		…
489		704
490	return true;	705	return true;
491	}	706	}
492		707
493	void	708	void
494	rxvt_font_x11::draw (int x, int y,	709	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
495	const text_t *text, int len,	710	const text_t *text, int len,
496	int fg, int bg)	711	int fg, int bg)
497	{	712	{
498	// this looks like a mess /.	713	// this looks like a mess /.
499	// and it is a mess /.	714	// and it is a mess /.
500	// yet we are trying to be perfect /.	715	// yet we are trying to be perfect /.
501	// but the result still isn't perfect /.	716	// but the result still isn't perfect /.
502		717
503	bool slow = prop	718	bool slow = this->slow
504	\|\| width != r->TermWin.fwidth	719	\|\| width != r->TermWin.fwidth
505	\|\| height != r->TermWin.fheight;	720	\|\| height != r->TermWin.fheight;
506		721
507	int base = r->TermWin.fbase;	722	int base = r->TermWin.fbase;
508		723
…		…
515	{	730	{
516	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	731	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
517		732
518	if (bg == Color_bg && !slow)	733	if (bg == Color_bg && !slow)
519	{	734	{
520	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	735	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
521	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	736	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
522	}	737	}
523	else	738	else
524	{	739	{
525	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	740	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
526		741
527	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	742	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
528		743
529	if (slow)	744	if (slow)
530	{	745	{
531	do	746	do
532	{	747	{
533	if (xc->byte1 \|\| xc->byte2)	748	if (xc->byte1 \|\| xc->byte2)
534	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	749	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
535		750
536	x += r->TermWin.fwidth;	751	x += r->TermWin.fwidth;
537	xc++; len--;	752	xc++; len--;
538	}	753	}
539	while (len);	754	while (len);
540	}	755	}
541	else	756	else
542	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	757	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
543	}	758	}
544	}	759	}
545	else	760	else
546	{	761	{
547	const char *xc = enc_char (text, len, cs, slow);	762	const char *xc = enc_char (text, len, cs, slow);
548		763
549	if (bg == Color_bg && !slow)	764	if (bg == Color_bg && !slow)
550	{	765	{
551	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	766	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
552	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	767	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
553	}	768	}
554	else	769	else
555	{	770	{
556	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	771	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
557		772
558	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	773	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
559		774
560	if (slow)	775	if (slow)
561	{	776	{
562	do	777	do
563	{	778	{
564	if (*xc)	779	if (*xc)
565	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	780	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
566		781
567	x += r->TermWin.fwidth;	782	x += r->TermWin.fwidth;
568	xc++; len--;	783	xc++; len--;
569	}	784	}
570	while (len);	785	while (len);
571	}	786	}
572	else	787	else
573	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	788	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
574	}	789	}
575	}	790	}
576	}	791	}
577		792
578	/////////////////////////////////////////////////////////////////////////////	793	/////////////////////////////////////////////////////////////////////////////
…		…
583	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	798	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
584	#define SWATHBITS 8	799	#define SWATHBITS 8
585	#endif	800	#endif
586		801
587	struct rxvt_font_xft : rxvt_font {	802	struct rxvt_font_xft : rxvt_font {
588	#if 0
589	enum {
590	SWATHCOUNT = 1 << (21 - UNIBITS),
591	SWATHSIZE = 1 << (SWATHBITS - 5)
592	};
593	typedef uint32_t swath[SWATHSIZE];
594
595	swath *cvr[SWATHCOUNT];
596	#endif
597
598	#if 0
599	void gen_coverage_swath (unsigned int page);
600
601	bool has_char (uint32_t ch)
602	{
603	unsigned int page = ch >> SWATHBITS;
604	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
605
606	if (page >= SWATHCOUNT)
607	return false;
608
609	if (!cvr[page]) gen_coverage_swath (page);
610
611	return cvr[page][idx >> 5] & (1 << (idx & 31));
612	}
613	#endif
614	rxvt_font_xft () { f = 0; d = 0; }	803	rxvt_font_xft () { f = 0; }
615		804
616	void clear ();	805	void clear ();
617		806
618	bool load (int maxheight);	807	rxvt_fontprop properties ();
619		808
620	void draw (int x, int y,	809	bool load (const rxvt_fontprop &prop);
		810
		811	void draw (rxvt_drawable &d, int x, int y,
621	const text_t *text, int len,	812	const text_t *text, int len,
622	int fg, int bg);	813	int fg, int bg);
623		814
624	bool has_codepoint (uint32_t unicode);	815	bool has_codepoint (unicode_t unicode);
625		816
626	protected:	817	protected:
627	XftFont *f;	818	XftFont *f;
628	XftDraw *d;
629
630	#if 0
631	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
632	void set_swath (uint32_t ch)
633	{
634	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
635	}
636	#endif
637	};	819	};
638		820
639	void	821	void
640	rxvt_font_xft::clear ()	822	rxvt_font_xft::clear ()
641	{	823	{
642	if (f)	824	if (f)
643	{	825	{
644	XftFontClose (DISPLAY, f);	826	XftFontClose (DISPLAY, f);
645	f = 0;	827	f = 0;
646	}	828	}
		829	}
647		830
648	if (d)	831	rxvt_fontprop
649	{	832	rxvt_font_xft::properties ()
650	XftDrawDestroy (d);	833	{
651	d = 0;	834	rxvt_fontprop p;
652	}
653		835
654	#if 0	836	FT_Face face = XftLockFace (f);
655	for (int i = 0; i < SWATHCOUNT; i++)	837
656	delete cvr[i];	838	p.width = width; p.height = height;
657	#endif	839	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		840	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		841
		842	XftUnlockFace (f);
		843
		844	return p;
658	}	845	}
659		846
660	bool	847	bool
661	rxvt_font_xft::load (int maxheight)	848	rxvt_font_xft::load (const rxvt_fontprop &prop)
662	{	849	{
663	#if 0	850	#if 0
664	for (int i = 0; i < SWATHCOUNT; i++)	851	for (int i = 0; i < SWATHCOUNT; i++)
665	cvr[i] = 0;	852	cvr[i] = 0;
666	#endif	853	#endif
667		854
668	clear ();	855	clear ();
669		856
670	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	857	FcPattern p = FcNameParse ((FcChar8 ) name);
		858
		859	if (!p)
		860	return false;
		861
		862	FcValue v;
		863
		864	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		865	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		866
		867	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		868	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		869
		870	#if 0 // clipping unfortunately destroys our precious double-width-characters
		871	// clip width, we can't do better, or can we?
		872	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		873	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		874	#endif
		875
		876	//FcPatternAddBool (p, FC_MINSPACE, 1);
		877
		878	XftResult result;
		879	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		880
		881	FcPatternDestroy (p);
		882
		883	if (!match)
		884	return false;
		885
		886	f = XftFontOpenPattern (DISPLAY, match);
671		887
672	if (!f)	888	if (!f)
		889	{
		890	FcPatternDestroy (match);
673	return false;	891	return false;
		892	}
674		893
675	FT_Face face = XftLockFace (f);	894	FT_Face face = XftLockFace (f);
676		895
677	prop = !FT_IS_FIXED_WIDTH (face);	896	slow = !FT_IS_FIXED_WIDTH (face);
678		897
679	int ftheight = 0;	898	int ftheight = 0;
680		899
681	for (;;)	900	for (;;)
682	{	901	{
…		…
684	FcChar8 c;	903	FcChar8 c;
685		904
686	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	905	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	906	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688		907
689	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	908	if (g1.xOff != g2.xOff) // don't simply trust the font
		909	slow = true;
690		910
691	width = g2.xOff;	911	width = g2.xOff;
692	ascent = (face->size->metrics.ascender + 63) >> 6;	912	ascent = (face->size->metrics.ascender + 63) >> 6;
693	descent = (-face->size->metrics.descender + 63) >> 6;	913	descent = (-face->size->metrics.descender + 63) >> 6;
694	height = ascent + descent;	914	height = ascent + descent;
695		915
696	if (height <= maxheight \|\| !maxheight)	916	if (height <= prop.height \|\| !prop.height)
697	break;	917	break;
698		918
699	if (ftheight)	919	if (ftheight)
700	{	920	{
701	// take smaller steps near the end	921	// take smaller steps near the end
702	if (height > maxheight + 1) ftheight++;	922	if (height > prop.height + 1) ftheight++;
703	if (height > maxheight + 2) ftheight++;	923	if (height > prop.height + 2) ftheight++;
704	if (height > maxheight + 3) ftheight++;	924	if (height > prop.height + 3) ftheight++;
705		925
706	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	926	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707	}	927	}
708	else	928	else
709	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	929	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710	}	930	}
711		931
712	XftUnlockFace (f);	932	XftUnlockFace (f);
713		933
714	return true;	934	return true;
715	}	935	}
716		936
717	#if 0
718	void rxvt_font::gen_coverage_swath (unsigned int page)
719	{
720	cvr[page] = new swath;
721
722	for (int i = 0; i < SWATHSIZE; i++)
723	cvr[page][i] = 0;
724
725	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
726	}
727	#endif
728
729	bool	937	bool
730	rxvt_font_xft::has_codepoint (uint32_t unicode)	938	rxvt_font_xft::has_codepoint (unicode_t unicode)
731	{	939	{
732	return XftCharExists (DISPLAY, f, unicode);	940	return XftCharExists (DISPLAY, f, unicode);
733	}	941	}
734		942
735	void	943	void
736	rxvt_font_xft::draw (int x, int y,	944	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
737	const text_t *text, int len,	945	const text_t *text, int len,
738	int fg, int bg)	946	int fg, int bg)
739	{	947	{
740	if (!d)
741	{
742	dR;
743	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
744	}
745
746	if (bg >= 0 && bg != Color_bg)
747	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
748	else
749	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	948	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750		949
751	if (!prop && width == r->TermWin.fwidth)	950	if (!slow && width == r->TermWin.fwidth && 0)
752	{	951	{
753	if (sizeof (text_t) == sizeof (FcChar16))	952	if (sizeof (text_t) == sizeof (FcChar16))
754	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	953	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755	else	954	else
756	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	955	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
759	{	958	{
760	while (len)	959	while (len)
761	{	960	{
762	if (text != NOCHAR && text != ' ')	961	if (text != NOCHAR && text != ' ')
763	{	962	{
		963	int fwidth = r->TermWin.fwidth;
		964	if (len >= 2 && text[1] == NOCHAR)
		965	fwidth *= 2;
		966
		967	XGlyphInfo extents;
764	if (sizeof (text_t) == sizeof (FcChar16))	968	if (sizeof (text_t) == sizeof (FcChar16))
765	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	969	{
		970	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		971	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		972	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		973	}
766	else	974	else
767	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	975	{
		976	XGlyphInfo extents;
		977	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		978	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		979	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		980	}
768	}	981	}
769		982
770	x += r->TermWin.fwidth;	983	x += r->TermWin.fwidth;
771	text++;	984	text++;
772	len--;	985	len--;
…		…
776	#endif	989	#endif
777		990
778	/////////////////////////////////////////////////////////////////////////////	991	/////////////////////////////////////////////////////////////////////////////
779		992
780	rxvt_fontset::rxvt_fontset (rxvt_t r)	993	rxvt_fontset::rxvt_fontset (rxvt_t r)
781	#ifdef EXPLICIT_CONTEXT
782	: r(r)	994	: r (r)
783	#endif
784	{	995	{
785	clear ();	996	clear ();
786	}	997	}
787		998
788	rxvt_fontset::~rxvt_fontset ()	999	rxvt_fontset::~rxvt_fontset ()
…		…
791	}	1002	}
792		1003
793	void	1004	void
794	rxvt_fontset::clear ()	1005	rxvt_fontset::clear ()
795	{	1006	{
796	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1007	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
797	FONT_UNREF (*i);	1008	FONT_UNREF (*i);
798		1009
799	fonts.clear ();	1010	fonts.clear ();
800	base_id = 0;	1011	base_id = 0;
801	height = 0x7fffffff;	1012	base_prop.height = 0x7fffffff;
		1013	base_prop.weight = rxvt_fontprop::medium;
		1014	base_prop.slant = rxvt_fontprop::roman;
802		1015
803	fallback = fallback_fonts;	1016	fallback = fallback_fonts;
804	}	1017	}
805		1018
806	rxvt_font *	1019	rxvt_font *
…		…
826	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
827	}	1040	}
828	else	1041	else
829	f = new rxvt_font_x11;	1042	f = new rxvt_font_x11;
830		1043
		1044	f->fs = this;
831	f->set_term (r);	1045	f->set_term (r);
832	f->set_name (strdup (name));	1046	f->set_name (strdup (name));
833		1047
834	f->cs = cs;	1048	f->cs = cs;
835	f->loaded = false;	1049	f->loaded = false;
…		…
853		1067
854	if (*desc == '[')	1068	if (*desc == '[')
855	{	1069	{
856	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1070	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
857		1071
858	const char *extra = desc++;	1072	//const char *extra = desc++; // not yet used
859		1073
860	desc = strchr (desc, ']');	1074	desc = strchr (desc, ']');
861		1075
862	if (!desc)	1076	if (!desc)
863	{	1077	{
…		…
891	rxvt_fontset::realize_font (int i)	1105	rxvt_fontset::realize_font (int i)
892	{	1106	{
893	if (fonts[i]->loaded)	1107	if (fonts[i]->loaded)
894	return true;	1108	return true;
895		1109
896	if (fonts[i]->load (height))
897	return fonts[i]->loaded = true;	1110	fonts[i]->loaded = true;
898		1111
899	delete fonts[i];	1112	if (!fonts[i]->load (base_prop))
900	fonts.erase (fonts.begin () + i);	1113	{
901		1114	fonts[i]->cs = CS_UNKNOWN;
902	return false;	1115	return false;
903	}	1116	}
904		1117
905	void	1118	return true;
		1119	}
		1120
		1121	bool
906	rxvt_fontset::populate (const char *desc)	1122	rxvt_fontset::populate (const char *desc)
907	{	1123	{
908	clear ();	1124	clear ();
909		1125
910	fonts.push_back (new_font (0, CS_UNICODE));	1126	fonts.push_back (new_font (0, CS_UNICODE));
…		…
914		1130
915	if (!base_id)	1131	if (!base_id)
916	base_id = 1;	1132	base_id = 1;
917		1133
918	// we currently need a base-font, no matter what	1134	// we currently need a base-font, no matter what
919	if (fonts.size () <= base_id)	1135	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
920	{	1136	{
		1137	puts ("unable to load specified font (s), falling back to 'fixed'\n");
921	add_fonts ("fixed");	1138	add_fonts ("fixed");
922	base_id = 1;	1139	base_id = fonts.size () - 1;
923	}	1140	}
924		1141
925	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1142	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
926	{	1143	return false;
927	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
928	exit (1);
929	}
930		1144
931	height = fonts[base_id]->height;	1145	base_prop = fonts[base_id]->properties ();
932		1146
933	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/	1147	return true;
934	}	1148	}
935		1149
936	int	1150	int
937	rxvt_fontset::find_font (uint32_t unicode)	1151	rxvt_fontset::find_font (unicode_t unicode)
938	{	1152	{
939	for (int i = 0; i < fonts.size (); i++)	1153	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
		1154	i < fonts.size ();
		1155	i++)
940	{	1156	{
941	rxvt_font *f = fonts[i];	1157	rxvt_font *f = fonts[i];
942		1158
943	if (!f->loaded)	1159	if (!f->loaded)
944	{	1160	{
945	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1161	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
946	goto next_font;	1162	goto next_font;
947		1163
948	if (!realize_font (i))	1164	if (!realize_font (i))
949	{
950	--i;
951	goto next_font;	1165	goto next_font;
952	}	1166	}
953		1167
954	//printf ("added font %s for %04lx\n", f->name, unicode);
955	}
956
957	if (f->has_codepoint (unicode))	1168	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
958	return i;	1169	return i;
959		1170
960	next_font:	1171	next_font:
961	if (i == fonts.size () - 1 && fallback->name)	1172	if (i == fonts.size () - 1 && fallback->name)
962	{	1173	{
963	fonts.push_back (new_font (fallback->name, fallback->cs));	1174	fonts.push_back (new_font (fallback->name, fallback->cs));
964	fallback++;	1175	fallback++;
		1176	i = 0;
965	}	1177	}
966	}	1178	}
967		1179
968	return 0; /* we must return SOME font */	1180	return 0; /* we must return SOME font */
969	}	1181	}

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs. Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC