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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs. Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC