[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.47 by pcg, Tue Mar 16 06:04:28 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;
		234
237	if (unicode >= 0x0080 && unicode <= 0x009f)	235	if (unicode >= 0x0080 && unicode <= 0x009f)
238	return true;	236	return true;
239		237
240	if (unicode >= 0x2500 && unicode <= 0x257f	238	if (unicode >= 0x2500 && unicode <= 0x259f)
241	&& linedraw_cmds[unicode - 0x2500])	239	return true;
		240
		241	if (IS_COMPOSE (unicode))
242	return true;	242	return true;
243		243
244	switch (unicode)	244	switch (unicode)
245	{	245	{
246	case ZERO_WIDTH_CHAR:	246	case ZERO_WIDTH_CHAR:
…		…
248	}	248	}
249		249
250	return false;	250	return false;
251	}	251	}
252		252
253	void draw (int x, int y,	253	void draw (rxvt_drawable &d, int x, int y,
254	const text_t *text, int len,	254	const text_t *text, int len,
255	int fg, int bg);	255	int fg, int bg);
256	};	256	};
257		257
258	void	258	void
259	rxvt_font_default::draw (int x, int y,	259	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
260	const text_t *text, int len,	260	const text_t *text, int len,
261	int fg, int bg)	261	int fg, int bg)
262	{	262	{
263	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	263	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
264		264
265	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	265	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
266		266
267	while (len--)	267	while (len--)
268	{	268	{
		269	#if ENABLE_COMBINING
		270	compose_char *cc;
		271	#endif
269	text_t t = *text++;	272	text_t t = *text++;
270		273
271	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	274	if (0x2500 <= t && t <= 0x259f)
		275	{
		276	uint16_t offs = linedraw_offs[t - 0x2500];
		277	uint32_t *a = linedraw_command + (offs >> 4);
		278	uint32_t *b = a + (offs & 15);
		279
		280	int W = r->TermWin.fwidth;
		281	int H = r->TermWin.fheight;
		282
		283	int x_[16];
		284	int y_[16];
		285
		286	for (int i = 0; i <= 8; i++)
272	{	287	{
273	const char *p = linedraw_cmds[t - 0x2500];	288	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		289	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		290	}
274		291
275	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	292	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;	293	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
277		294
278	XGCValues gcv;	295	XGCValues gcv;
279		296
		297	gcv.cap_style = CapButt;
		298	gcv.line_width = 0;
		299	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		300
280	while (*p)	301	while (a < b)
281	{	302	{
		303	uint32_t command = *a++;
		304
		305	int op = (command >> 24) & 255;
		306	int a = (command >> 20) & 15;
		307	int b = (command >> 16) & 15;
		308	int x1 = x_[(command >> 12) & 15];
		309	int y1 = y_[(command >> 8) & 15];
		310	int x2 = x_[(command >> 4) & 15];
		311	int y2 = y_[(command >> 0) & 15];
		312
282	switch (*p++)	313	switch (op)
283	{	314	{
284	case '1':	315	case 0: // line
285	gcv.line_width = 0;	316	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
286	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
287	break;	317	break;
288		318
289	case '2':	319	case 1: // rectangle, possibly stippled
		320	if (a)
		321	{
		322	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		323
		324	gcv.fill_style = FillStippled;
		325	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		326	gcv.ts_x_origin = x;
		327	gcv.ts_y_origin = y;
		328
		329	XChangeGC (d.display->display, TGC,
		330	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		331	&gcv);
		332	}
		333
		334	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		335
		336	if (a)
		337	{
		338	XFreePixmap (d.display->display, gcv.stipple);
290	gcv.line_width = 2;	339	gcv.stipple = 0;
291	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	340	gcv.fill_style = FillSolid;
		341	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		342	}
292	break;	343	break;
293		344	case 2: // arc
294	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	345	XDrawArc (d.display->display, d, TGC,
295	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	346	x1 - W/2, y1 - H/2, W-1, H-1,
296	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	347	(a - 1) * 9064, (b - 1) 90*64);
297	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	348	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	}	349	}
301	}	350	}
302		351	}
303	gcv.line_width = 0;	352	#if ENABLE_COMBINING
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	353	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
305	}	354	{
		355	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		356	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		357	if (cc->c2 != NOCHAR)
		358	{
		359	// prefer font of first character, for no good reasons
		360	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		361	? f1
		362	: (*fs)[fs->find_font (cc->c2)];
		363
		364	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		365	}
		366	}
		367	#endif
306	else	368	else
307	switch (*text++)	369	switch (t)
308	{	370	{
309	case NOCHAR:
310	case ZERO_WIDTH_CHAR:	371	case ZERO_WIDTH_CHAR:
311	break;	372	break;
		373
312	default:	374	default:
313	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	375	int w = 0;
		376	while (len > 0 && *text == NOCHAR)
		377	{
		378	++text;
		379	--len;
		380	w += r->TermWin.fwidth;
		381	}
		382
		383	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
		384	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
		385	x += w;
314	}	386	}
315		387
316	x += r->TermWin.fwidth;	388	x += r->TermWin.fwidth;
317	}	389	}
318	}	390	}
…		…
322	struct rxvt_font_x11 : rxvt_font {	394	struct rxvt_font_x11 : rxvt_font {
323	rxvt_font_x11 () { f = 0; }	395	rxvt_font_x11 () { f = 0; }
324		396
325	void clear ();	397	void clear ();
326		398
327	bool load (int maxheight);	399	rxvt_fontprop properties ();
328		400
		401	bool load (const rxvt_fontprop &prop);
		402
329	bool has_codepoint (uint32_t unicode);	403	bool has_codepoint (unicode_t unicode);
330		404
331	void draw (int x, int y,	405	void draw (rxvt_drawable &d, int x, int y,
332	const text_t *text, int len,	406	const text_t *text, int len,
333	int fg, int bg);	407	int fg, int bg);
334		408
335	XFontStruct *f;	409	XFontStruct *f;
336	codeset cs;	410	codeset cs;
337	bool enc2b, encm;	411	bool enc2b, encm;
338		412
339	const char get_property (const char property, const char *repl) const;	413	const char get_property (XFontStruct f, const char property, const char repl) const;
		414	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		415	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		416	bool set_properties (rxvt_fontprop &p, const char *name);
340	};	417	};
341		418
342	const char *	419	const char *
343	rxvt_font_x11::get_property (const char property, const char repl) const	420	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
344	{	421	{
345	unsigned long value;	422	unsigned long value;
346		423
347	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	424	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
348	return XGetAtomName (DISPLAY, value);	425	return XGetAtomName (DISPLAY, value);
349	else	426	else
350	return repl;	427	return repl;
351	}	428	}
352		429
		430	rxvt_fontprop
		431	rxvt_font_x11::properties ()
		432	{
		433	rxvt_fontprop p;
		434	set_properties (p, f);
		435	return p;
		436	}
		437
353	bool	438	bool
354	rxvt_font_x11::load (int maxheight)	439	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		440	{
		441	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		442	p.height = height;
		443	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		444	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		445
		446	return true;
		447	}
		448
		449	bool
		450	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		451	{
		452	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		453	const char *slant = get_property (f, "SLANT", "r");
		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	return set_properties (p, height, weight, slant, avgwidth);
		464	}
		465
		466	bool
		467	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		468	{
		469	int slashes = 0;
		470	const char *comp[13];
		471
		472	for (const char c = name; c; c++)
		473	if (*c == '-')
		474	{
		475	comp[slashes++] = c + 1;
		476	if (slashes >= 13)
		477	break;
		478	}
		479
		480	/* can we short-circuit the costly XLoadQueryFont? */
		481	if (slashes >= 13
		482	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		483	&& (comp[11] >= '0' && comp[11] <= '9'))
		484	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		485
		486	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		487
		488	if (f)
		489	{
		490	// the font should really exist now. if not, we have a problem
		491	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		492	// in that case, just return garbage.
		493	bool ret = set_properties (p, f);
		494	XFreeFont (DISPLAY, f);
		495	return ret;
		496	}
		497	else
		498	return false;
		499	}
		500
		501	// fix the size of scalable fonts
		502	static void
		503	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		504	{
		505	int slashes = 0;
		506	const char *size;
		507
		508	for (const char c = name; c; c++)
		509	if (*c == '-')
		510	{
		511	if (slashes == 6)
		512	size = c + 1;
		513
		514	if (++slashes >= 13)
		515	break;
		516	}
		517
		518	if (slashes >= 13 && size[0] == '0')
		519	{
		520	strncpy (buf, name, size - name);
		521	buf += size - name;
		522	buf += sprintf (buf, "%d", prop.height);
		523	strcpy (buf, size + 1);
		524	}
		525	else
		526	strcpy (buf, name);
		527	}
		528
		529	bool
		530	rxvt_font_x11::load (const rxvt_fontprop &prop)
355	{	531	{
356	clear ();	532	clear ();
		533
		534	char **list;
		535	int count;
		536	list = XListFonts (DISPLAY, name, 512, &count);
		537	set_name (0);
		538
		539	if (!list)
		540	return false;
		541
		542	int bestdiff = 0x7fffffff;
		543	for (int i = 0; i < count; i++)
		544	{
		545	rxvt_fontprop p;
		546	char fname[1024];
		547	fix_scalable (fname, list[i], prop);
		548
		549	if (!set_properties (p, fname))
		550	continue;
		551
		552	if (p.height > prop.height) // weed out too large fonts
		553	continue;
		554
		555	int diff = (prop.height - p.height) * 32
		556	+ abs (prop.weight - p.weight)
		557	+ abs (prop.slant - p.slant );
		558
		559	if (!name // compare against best found so far
		560	\|\| diff < bestdiff)
		561	{
		562	set_name (strdup (fname));
		563	bestdiff = diff;
		564	}
		565	}
		566
		567	XFreeFontNames (list);
		568
		569	if (!name)
		570	return false;
357		571
358	f = XLoadQueryFont (DISPLAY, name);	572	f = XLoadQueryFont (DISPLAY, name);
359		573
360	if (!f)	574	if (!f)
361	return false;	575	return false;
362		576
363	unsigned long value;
364
365	const char *registry = get_property ("CHARSET_REGISTRY", 0);	577	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
366	const char *encoding = get_property ("CHARSET_ENCODING", 0);	578	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
367		579
368	if (registry && encoding)	580	if (registry && encoding)
369	{	581	{
370	char charset[64];	582	char charset[64];
371	snprintf (charset, 64, "%s-%s", registry, encoding);	583	snprintf (charset, 64, "%s-%s", registry, encoding);
372		584
373	cs = codeset_from_name (charset);	585	cs = codeset_from_name (charset);
374	}	586	}
375	else	587	else
376	{	588	{
377	const char *charset = get_property ("FONT", 0);	589	const char *charset = get_property (f, "FONT", 0);
378		590
379	if (!charset)	591	if (!charset)
380	charset = name;	592	charset = name;
381		593
382	int count = 13;	594	int count = 13;
…		…
395		607
396	ascent = f->ascent;	608	ascent = f->ascent;
397	descent = f->descent;	609	descent = f->descent;
398	height = ascent + descent;	610	height = ascent + descent;
399		611
400	prop = false;	612	slow = false;
401		613
402	if (f->min_bounds.width == f->max_bounds.width)	614	if (f->min_bounds.width == f->max_bounds.width)
403	width = f->min_bounds.width;	615	width = f->min_bounds.width;
404	else if (f->per_char == NULL)	616	else if (f->per_char == NULL)
405	width = f->max_bounds.width;	617	width = f->max_bounds.width;
406	else	618	else
407	{	619	{
408	prop = true;	620	slow = true;
409		621
410	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	622	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
411		623
412	if (encm)	624	if (encm)
413	N += (f->max_byte1 - f->min_byte1)	625	N += (f->max_byte1 - f->min_byte1)
…		…
443	f = 0;	655	f = 0;
444	}	656	}
445	}	657	}
446		658
447	bool	659	bool
448	rxvt_font_x11::has_codepoint (uint32_t unicode)	660	rxvt_font_x11::has_codepoint (unicode_t unicode)
449	{	661	{
450	uint32_t ch = FROM_UNICODE (cs, unicode);	662	uint32_t ch = FROM_UNICODE (cs, unicode);
451		663
452	if (ch == NOCHAR)	664	if (ch == NOCHAR)
453	return false;	665	return false;
…		…
455	/* check wether the character exists in _this_ font. horrible. */	667	/* check wether the character exists in _this_ font. horrible. */
456	XCharStruct *xcs;	668	XCharStruct *xcs;
457		669
458	if (encm)	670	if (encm)
459	{	671	{
460	int byte1 = ch >> 8;	672	unsigned char byte1 = ch >> 8;
461	int byte2 = ch & 255;	673	unsigned char byte2 = ch & 255;
462		674
463	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	675	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
464	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	676	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
465	return false;	677	return false;
466		678
…		…
489		701
490	return true;	702	return true;
491	}	703	}
492		704
493	void	705	void
494	rxvt_font_x11::draw (int x, int y,	706	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
495	const text_t *text, int len,	707	const text_t *text, int len,
496	int fg, int bg)	708	int fg, int bg)
497	{	709	{
498	// this looks like a mess /.	710	// this looks like a mess /.
499	// and it is a mess /.	711	// and it is a mess /.
500	// yet we are trying to be perfect /.	712	// yet we are trying to be perfect /.
501	// but the result still isn't perfect /.	713	// but the result still isn't perfect /.
502		714
503	bool slow = prop	715	bool slow = this->slow
504	\|\| width != r->TermWin.fwidth	716	\|\| width != r->TermWin.fwidth
505	\|\| height != r->TermWin.fheight;	717	\|\| height != r->TermWin.fheight;
506		718
507	int base = r->TermWin.fbase;	719	int base = r->TermWin.fbase;
508		720
…		…
515	{	727	{
516	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	728	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
517		729
518	if (bg == Color_bg && !slow)	730	if (bg == Color_bg && !slow)
519	{	731	{
520	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	732	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
521	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	733	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
522	}	734	}
523	else	735	else
524	{	736	{
525	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	737	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
526		738
527	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	739	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
528		740
529	if (slow)	741	if (slow)
530	{	742	{
531	do	743	do
532	{	744	{
533	if (xc->byte1 \|\| xc->byte2)	745	if (xc->byte1 \|\| xc->byte2)
534	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	746	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
535		747
536	x += r->TermWin.fwidth;	748	x += r->TermWin.fwidth;
537	xc++; len--;	749	xc++; len--;
538	}	750	}
539	while (len);	751	while (len);
540	}	752	}
541	else	753	else
542	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	754	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
543	}	755	}
544	}	756	}
545	else	757	else
546	{	758	{
547	const char *xc = enc_char (text, len, cs, slow);	759	const char *xc = enc_char (text, len, cs, slow);
548		760
549	if (bg == Color_bg && !slow)	761	if (bg == Color_bg && !slow)
550	{	762	{
551	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	763	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
552	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	764	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
553	}	765	}
554	else	766	else
555	{	767	{
556	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	768	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
557		769
558	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	770	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
559		771
560	if (slow)	772	if (slow)
561	{	773	{
562	do	774	do
563	{	775	{
564	if (*xc)	776	if (*xc)
565	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	777	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
566		778
567	x += r->TermWin.fwidth;	779	x += r->TermWin.fwidth;
568	xc++; len--;	780	xc++; len--;
569	}	781	}
570	while (len);	782	while (len);
571	}	783	}
572	else	784	else
573	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	785	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
574	}	786	}
575	}	787	}
576	}	788	}
577		789
578	/////////////////////////////////////////////////////////////////////////////	790	/////////////////////////////////////////////////////////////////////////////
…		…
583	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	795	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
584	#define SWATHBITS 8	796	#define SWATHBITS 8
585	#endif	797	#endif
586		798
587	struct rxvt_font_xft : rxvt_font {	799	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; }	800	rxvt_font_xft () { f = 0; }
615		801
616	void clear ();	802	void clear ();
617		803
618	bool load (int maxheight);	804	rxvt_fontprop properties ();
619		805
620	void draw (int x, int y,	806	bool load (const rxvt_fontprop &prop);
		807
		808	void draw (rxvt_drawable &d, int x, int y,
621	const text_t *text, int len,	809	const text_t *text, int len,
622	int fg, int bg);	810	int fg, int bg);
623		811
624	bool has_codepoint (uint32_t unicode);	812	bool has_codepoint (unicode_t unicode);
625		813
626	protected:	814	protected:
627	XftFont *f;	815	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	};	816	};
638		817
639	void	818	void
640	rxvt_font_xft::clear ()	819	rxvt_font_xft::clear ()
641	{	820	{
642	if (f)	821	if (f)
643	{	822	{
644	XftFontClose (DISPLAY, f);	823	XftFontClose (DISPLAY, f);
645	f = 0;	824	f = 0;
646	}	825	}
		826	}
647		827
648	if (d)	828	rxvt_fontprop
649	{	829	rxvt_font_xft::properties ()
650	XftDrawDestroy (d);	830	{
651	d = 0;	831	rxvt_fontprop p;
652	}
653		832
654	#if 0	833	FT_Face face = XftLockFace (f);
655	for (int i = 0; i < SWATHCOUNT; i++)	834
656	delete cvr[i];	835	p.width = width; p.height = height;
657	#endif	836	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		837	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		838
		839	XftUnlockFace (f);
		840
		841	return p;
658	}	842	}
659		843
660	bool	844	bool
661	rxvt_font_xft::load (int maxheight)	845	rxvt_font_xft::load (const rxvt_fontprop &prop)
662	{	846	{
663	#if 0	847	#if 0
664	for (int i = 0; i < SWATHCOUNT; i++)	848	for (int i = 0; i < SWATHCOUNT; i++)
665	cvr[i] = 0;	849	cvr[i] = 0;
666	#endif	850	#endif
667		851
668	clear ();	852	clear ();
669		853
670	f = XftFontOpenName (DISPLAY, DefaultScreen (DISPLAY), name);	854	FcPattern p = FcNameParse ((FcChar8 ) name);
		855
		856	if (!p)
		857	return false;
		858
		859	FcValue v;
		860
		861	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		862	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		863
		864	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		865	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		866
		867	#if 0 // clipping unfortunately destroys our precious double-width-characters
		868	// clip width, we can't do better, or can we?
		869	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		870	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		871	#endif
		872
		873	//FcPatternAddBool (p, FC_MINSPACE, 1);
		874
		875	XftResult result;
		876	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		877
		878	FcPatternDestroy (p);
		879
		880	if (!match)
		881	return false;
		882
		883	f = XftFontOpenPattern (DISPLAY, match);
671		884
672	if (!f)	885	if (!f)
		886	{
		887	FcPatternDestroy (match);
673	return false;	888	return false;
		889	}
674		890
675	FT_Face face = XftLockFace (f);	891	FT_Face face = XftLockFace (f);
676		892
677	prop = !FT_IS_FIXED_WIDTH (face);	893	slow = !FT_IS_FIXED_WIDTH (face);
678		894
679	int ftheight = 0;	895	int ftheight = 0;
680		896
681	for (;;)	897	for (;;)
682	{	898	{
…		…
684	FcChar8 c;	900	FcChar8 c;
685		901
686	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);	902	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
687	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);	903	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
688		904
689	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	905	if (g1.xOff != g2.xOff) // don't simply trust the font
		906	slow = true;
690		907
691	width = g2.xOff;	908	width = g2.xOff;
692	ascent = (face->size->metrics.ascender + 63) >> 6;	909	ascent = (face->size->metrics.ascender + 63) >> 6;
693	descent = (-face->size->metrics.descender + 63) >> 6;	910	descent = (-face->size->metrics.descender + 63) >> 6;
694	height = ascent + descent;	911	height = ascent + descent;
695		912
696	if (height <= maxheight \|\| !maxheight)	913	if (height <= prop.height \|\| !prop.height)
697	break;	914	break;
698		915
699	if (ftheight)	916	if (ftheight)
700	{	917	{
701	// take smaller steps near the end	918	// take smaller steps near the end
702	if (height > maxheight + 1) ftheight++;	919	if (height > prop.height + 1) ftheight++;
703	if (height > maxheight + 2) ftheight++;	920	if (height > prop.height + 2) ftheight++;
704	if (height > maxheight + 3) ftheight++;	921	if (height > prop.height + 3) ftheight++;
705		922
706	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	923	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
707	}	924	}
708	else	925	else
709	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	926	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
710	}	927	}
711		928
712	XftUnlockFace (f);	929	XftUnlockFace (f);
713		930
714	return true;	931	return true;
715	}	932	}
716		933
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	934	bool
730	rxvt_font_xft::has_codepoint (uint32_t unicode)	935	rxvt_font_xft::has_codepoint (unicode_t unicode)
731	{	936	{
732	return XftCharExists (DISPLAY, f, unicode);	937	return XftCharExists (DISPLAY, f, unicode);
733	}	938	}
734		939
735	void	940	void
736	rxvt_font_xft::draw (int x, int y,	941	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
737	const text_t *text, int len,	942	const text_t *text, int len,
738	int fg, int bg)	943	int fg, int bg)
739	{	944	{
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);	945	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
750		946
751	if (!prop && width == r->TermWin.fwidth)	947	if (!slow && width == r->TermWin.fwidth && 0)
752	{	948	{
753	if (sizeof (text_t) == sizeof (FcChar16))	949	if (sizeof (text_t) == sizeof (FcChar16))
754	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	950	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
755	else	951	else
756	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	952	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
759	{	955	{
760	while (len)	956	while (len)
761	{	957	{
762	if (text != NOCHAR && text != ' ')	958	if (text != NOCHAR && text != ' ')
763	{	959	{
		960	int fwidth = r->TermWin.fwidth;
		961	if (len >= 2 && text[1] == NOCHAR)
		962	fwidth *= 2;
		963
		964	XGlyphInfo extents;
764	if (sizeof (text_t) == sizeof (FcChar16))	965	if (sizeof (text_t) == sizeof (FcChar16))
765	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	966	{
		967	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		968	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		969	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		970	}
766	else	971	else
767	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	972	{
		973	XGlyphInfo extents;
		974	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		975	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		976	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		977	}
768	}	978	}
769		979
770	x += r->TermWin.fwidth;	980	x += r->TermWin.fwidth;
771	text++;	981	text++;
772	len--;	982	len--;
…		…
776	#endif	986	#endif
777		987
778	/////////////////////////////////////////////////////////////////////////////	988	/////////////////////////////////////////////////////////////////////////////
779		989
780	rxvt_fontset::rxvt_fontset (rxvt_t r)	990	rxvt_fontset::rxvt_fontset (rxvt_t r)
781	#ifdef EXPLICIT_CONTEXT
782	: r(r)	991	: r (r)
783	#endif
784	{	992	{
785	clear ();	993	clear ();
786	}	994	}
787		995
788	rxvt_fontset::~rxvt_fontset ()	996	rxvt_fontset::~rxvt_fontset ()
…		…
791	}	999	}
792		1000
793	void	1001	void
794	rxvt_fontset::clear ()	1002	rxvt_fontset::clear ()
795	{	1003	{
796	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1004	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
797	FONT_UNREF (*i);	1005	FONT_UNREF (*i);
798		1006
799	fonts.clear ();	1007	fonts.clear ();
800	base_id = 0;	1008	base_id = 0;
801	height = 0x7fffffff;	1009	base_prop.height = 0x7fffffff;
		1010	base_prop.weight = rxvt_fontprop::medium;
		1011	base_prop.slant = rxvt_fontprop::roman;
802		1012
803	fallback = fallback_fonts;	1013	fallback = fallback_fonts;
804	}	1014	}
805		1015
806	rxvt_font *	1016	rxvt_font *
…		…
826	f = new rxvt_font_x11;	1036	f = new rxvt_font_x11;
827	}	1037	}
828	else	1038	else
829	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
830		1040
		1041	f->fs = this;
831	f->set_term (r);	1042	f->set_term (r);
832	f->set_name (strdup (name));	1043	f->set_name (strdup (name));
833		1044
834	f->cs = cs;	1045	f->cs = cs;
835	f->loaded = false;	1046	f->loaded = false;
…		…
853		1064
854	if (*desc == '[')	1065	if (*desc == '[')
855	{	1066	{
856	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1067	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
857		1068
858	const char *extra = desc++;	1069	//const char *extra = desc++; // not yet used
859		1070
860	desc = strchr (desc, ']');	1071	desc = strchr (desc, ']');
861		1072
862	if (!desc)	1073	if (!desc)
863	{	1074	{
…		…
891	rxvt_fontset::realize_font (int i)	1102	rxvt_fontset::realize_font (int i)
892	{	1103	{
893	if (fonts[i]->loaded)	1104	if (fonts[i]->loaded)
894	return true;	1105	return true;
895		1106
896	if (fonts[i]->load (height))
897	return fonts[i]->loaded = true;	1107	fonts[i]->loaded = true;
898		1108
899	delete fonts[i];	1109	if (!fonts[i]->load (base_prop))
900	fonts.erase (fonts.begin () + i);	1110	{
901		1111	fonts[i]->cs = CS_UNKNOWN;
902	return false;	1112	return false;
903	}	1113	}
904		1114
905	void	1115	return true;
		1116	}
		1117
		1118	bool
906	rxvt_fontset::populate (const char *desc)	1119	rxvt_fontset::populate (const char *desc)
907	{	1120	{
908	clear ();	1121	clear ();
909		1122
910	fonts.push_back (new_font (0, CS_UNICODE));	1123	fonts.push_back (new_font (0, CS_UNICODE));
…		…
914		1127
915	if (!base_id)	1128	if (!base_id)
916	base_id = 1;	1129	base_id = 1;
917		1130
918	// we currently need a base-font, no matter what	1131	// we currently need a base-font, no matter what
919	if (fonts.size () <= base_id)	1132	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
920	{	1133	{
		1134	puts ("unable to load specified font (s), falling back to 'fixed'\n");
921	add_fonts ("fixed");	1135	add_fonts ("fixed");
922	base_id = 1;	1136	base_id = fonts.size () - 1;
923	}	1137	}
924		1138
925	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1139	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
926	{	1140	return false;
927	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
928	exit (1);
929	}
930		1141
931	height = fonts[base_id]->height;	1142	base_prop = fonts[base_id]->properties ();
932		1143
933	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/	1144	return true;
934	}	1145	}
935		1146
936	int	1147	int
937	rxvt_fontset::find_font (uint32_t unicode)	1148	rxvt_fontset::find_font (unicode_t unicode)
938	{	1149	{
939	for (int i = 0; i < fonts.size (); i++)	1150	for (unsigned int i = 0; i < fonts.size (); i++)
940	{	1151	{
941	rxvt_font *f = fonts[i];	1152	rxvt_font *f = fonts[i];
942		1153
943	if (!f->loaded)	1154	if (!f->loaded)
944	{	1155	{
945	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1156	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
946	goto next_font;	1157	goto next_font;
947		1158
948	if (!realize_font (i))	1159	if (!realize_font (i))
949	{
950	--i;
951	goto next_font;	1160	goto next_font;
952	}	1161	}
953		1162
954	//printf ("added font %s for %04lx\n", f->name, unicode);
955	}
956
957	if (f->has_codepoint (unicode))	1163	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
958	return i;	1164	return i;
959		1165
960	next_font:	1166	next_font:
961	if (i == fonts.size () - 1 && fallback->name)	1167	if (i == fonts.size () - 1 && fallback->name)
962	{	1168	{
963	fonts.push_back (new_font (fallback->name, fallback->cs));	1169	fonts.push_back (new_font (fallback->name, fallback->cs));
964	fallback++;	1170	fallback++;
		1171	i = 0;
965	}	1172	}
966	}	1173	}
967		1174
968	return 0; /* we must return SOME font */	1175	return 0; /* we must return SOME font */
969	}	1176	}

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.47 by pcg, Tue Mar 16 06:04:28 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.47 by pcg, Tue Mar 16 06:04:28 2004 UTC