[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.26 by pcg, Fri Feb 27 02:52:51 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_1983_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_CNS11643_1992_1, "-----------c--gb2312-0" },
76	{ CS_CNS11643_1992_1, "----r-------c--cns11643.1992-1" },	78	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
77	{ CS_CNS11643_1992_2, "----r-------c--cns11643.1992-2" },	79	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
78	{ CS_CNS11643_1992_3, "----r-------c--cns11643.1992-3" },	80	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
79	{ CS_CNS11643_1992_4, "----r-------c--cns11643.1992-4" },	81	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
80	{ CS_CNS11643_1992_5, "----r-------c--cns11643.1992-5" },	82	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
81	{ CS_CNS11643_1992_6, "----r-------c--cns11643.1992-6" },	83	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
82	{ CS_CNS11643_1992_7, "----r-------c--cns11643.1992-7" },	84	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
83	{ CS_CNS11643_1992_F, "----r-------c--cns11643.1992-f" },	85	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
84	#endif	86	#endif
85		87
86	#if XFT	88	#if XFT
87	{ CS_UNICODE, "xft:Andale Mono" },	89	{ CS_UNICODE, "xft:Andale Mono" },
88	{ CS_UNICODE, "xft:Arial Unicode MS" },	90	{ CS_UNICODE, "xft:Arial Unicode MS" },
89	#endif	91	#endif
90	{ CS_UNICODE, "--lucidatypewriter--r-------m-*-iso10646-1" },	92	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
		93	{ CS_UNICODE, "xft:FreeMono" },
		94	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
		95	{ CS_UNICODE, "----r-------c--iso10646-1" },
91	{ CS_UNICODE, "----r-------m--iso10646-1" },	96	{ CS_UNICODE, "----r-------m--iso10646-1" },
92	{ CS_UNICODE, "----r-------m--iso10646-1" },
93	{ CS_UNICODE, "----r-------m--iso10646-1" },
94		97
95	{ CS_UNKNOWN, 0 }	98	{ CS_UNKNOWN, 0 }
96	};	99	};
97		100
98	/////////////////////////////////////////////////////////////////////////////	101	/////////////////////////////////////////////////////////////////////////////
99		102
		103	#if XFT
		104	rxvt_drawable::~rxvt_drawable ()
		105	{
		106	if (xftdrawable)
		107	XftDrawDestroy (xftdrawable);
		108	}
		109
		110	rxvt_drawable::operator XftDraw *()
		111	{
		112	if (!xftdrawable)
		113	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		114
		115	return xftdrawable;
		116	}
		117	#endif
		118
		119	/////////////////////////////////////////////////////////////////////////////
		120
100	static void *enc_buf;	121	static void *enc_buf;
101	static uint32_t enc_len;	122	static uint32_t enc_len;
102		123
103	static inline void *	124	static inline void *
104	get_enc_buf (int len)	125	get_enc_buf (uint32_t len)
105	{	126	{
106	if (len > enc_len)	127	if (len > enc_len)
107	{	128	{
108	free (enc_buf);	129	free (enc_buf);
109	enc_buf = malloc (len);	130	enc_buf = malloc (len);
…		…
111		132
112	return enc_buf;	133	return enc_buf;
113	}	134	}
114		135
115	static const char *	136	static const char *
116	enc_char (const text_t *text, int len, codeset cs, bool &zero)	137	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
117	{	138	{
118	uint8_t buf = (uint8_t )get_enc_buf (len);	139	uint8_t buf = (uint8_t )get_enc_buf (len);
119		140
120	while (len--)	141	while (len--)
121	{	142	{
…		…
132		153
133	return (const char *)enc_buf;	154	return (const char *)enc_buf;
134	}	155	}
135		156
136	static const XChar2b *	157	static const XChar2b *
137	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	158	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
138	{	159	{
139	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	160	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
140		161
141	while (len--)	162	while (len--)
142	{	163	{
…		…
157	}	178	}
158		179
159	/////////////////////////////////////////////////////////////////////////////	180	/////////////////////////////////////////////////////////////////////////////
160		181
161	void	182	void
162	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	183	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
163	{	184	{
164	if (color == Color_bg)	185	if (color == Color_bg)
165	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	186	XClearArea (d.display->display, d, x, y, w, h, FALSE);
166	else if (color >= 0)	187	else if (color >= 0)
167	{	188	{
		189	#if XFT
		190	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		191	#else
168	XSetForeground (DISPLAY, GC, R->PixColors[color]);	192	XSetForeground (d.display->display, GC, r->PixColors[color]);
169	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	193	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		194	#endif
170	}	195	}
171	}	196	}
		197
		198	static const char *linedraw_cmds[128] = {
		199	"1hH", "2hH", "1vV", "2vV",
		200	0, 0, 0, 0,
		201	0, 0, 0, 0,
		202	"1HV", "2H1V", "1H2V", "2HV",
		203
		204	// 2510
		205	"1hV", "2h1V", "1h2V", "2hV",
		206	"1Hv", "2H1v", "1H2v", "2Hv",
		207	"1hv", "2h1v", "1h2v", "2hv",
		208	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
		209
		210	// 2520
		211	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
		212	"1hvV", "2h1vV", "1hV2v", "1hv2V",
		213	"1h2vV", "2hv1V", "1v2hV", "2hvV",
		214	"1hHV", "2h1HV", "2H1hV", "2hH1V",
		215
		216	// 2530
		217	"1hH2V", "2hV1H", "1h2HV", "2hHV",
		218	"1hHv", "1vH2h", "1hv2H", "1v2hH",
		219	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
		220	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
		221
		222	// 2540
		223	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
		224	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
		225	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
		226	0, 0, 0, 0,
		227
		228	// 2550
		229	0, 0, 0, 0,
		230	0, 0, 0, 0,
		231	0, 0, 0, 0,
		232	0, 0, 0, 0,
		233
		234	// 2560
		235	0, 0, 0, 0,
		236	0, 0, 0, 0,
		237	0, 0, 0, 0,
		238	0, 0, 0, 0,
		239
		240	// 2570
		241	0, "1a", "1b", "1ab",
		242	"1h", "1v", "1H", "1V",
		243	"2h", "2v", "2H", "2V",
		244	"1h2H", "1v2V", "1H2h", "1V2v"
		245
		246	// to be done
		247	};
172		248
173	struct rxvt_font_default : rxvt_font {	249	struct rxvt_font_default : rxvt_font {
174	bool load (int maxheight)	250	rxvt_fontprop properties ()
		251	{
		252	rxvt_fontprop p;
		253
		254	p.width = p.height = 1;
		255	p.weight = rxvt_fontprop::medium;
		256	p.slant = rxvt_fontprop::roman;
		257
		258	return p;
		259	}
		260
		261	bool load (const rxvt_fontprop &prop)
175	{	262	{
176	width = 1; height = 1;	263	width = 1; height = 1;
177	ascent = 1; descent = 0;	264	ascent = 1; descent = 0;
178		265
179	return true;	266	return true;
180	}	267	}
181		268
182	bool has_codepoint (uint32_t unicode)	269	bool has_codepoint (uint32_t unicode)
183	{	270	{
184	if (unicode <= 0x001f	271	if (unicode <= 0x001f)
		272	return true;
185	\|\| (unicode >= 0x80 && unicode <= 0x9f))	273	if (unicode >= 0x0080 && unicode <= 0x009f)
		274	return true;
		275
		276	if (unicode >= 0x2500 && unicode <= 0x257f
		277	&& linedraw_cmds[unicode - 0x2500])
186	return true;	278	return true;
187		279
188	switch (unicode)	280	switch (unicode)
189	{	281	{
190	case ZERO_WIDTH_CHAR:	282	case ZERO_WIDTH_CHAR:
…		…
192	}	284	}
193		285
194	return false;	286	return false;
195	}	287	}
196		288
197	void draw (int x, int y,	289	void draw (rxvt_drawable &d, int x, int y,
198	const text_t *text, int len,	290	const text_t *text, int len,
199	int fg, int bg);	291	int fg, int bg);
200	};	292	};
201		293
202	void	294	void
203	rxvt_font_default::draw (int x, int y,	295	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
204	const text_t *text, int len,	296	const text_t *text, int len,
205	int fg, int bg)	297	int fg, int bg)
206	{	298	{
207	clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg);	299	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
		300
		301	XSetForeground (d.display->display, GC, r->PixColors[fg]);
208		302
209	while (len--)	303	while (len--)
210	{	304	{
		305	text_t t = *text++;
		306
		307	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
		308	{
		309	const char *p = linedraw_cmds[t - 0x2500];
		310
		311	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
		312	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
		313
		314	XGCValues gcv;
		315
		316	while (*p)
		317	{
		318	switch (*p++)
		319	{
		320	case '1':
		321	gcv.line_width = 0;
		322	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		323	break;
		324
		325	case '2':
		326	gcv.line_width = 2;
		327	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		328	break;
		329
		330	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
		331	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
		332	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
		333	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
		334	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
		335	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
		336	}
		337	}
		338
		339	gcv.line_width = 0;
		340	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		341	}
		342	else
211	switch (*text++)	343	switch (*text++)
212	{	344	{
213	case NOCHAR:	345	case NOCHAR:
214	case ZERO_WIDTH_CHAR:	346	case ZERO_WIDTH_CHAR:
215	break;	347	break;
216	default:	348	default:
217	XSetForeground (DISPLAY, GC, R->PixColors[fg]);
218	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, R->TermWin.fwidth - 5, R->TermWin.fheight - 5);	349	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
219	}	350	}
220		351
221	x += R->TermWin.fwidth;	352	x += r->TermWin.fwidth;
222	}	353	}
223	}	354	}
224		355
225	/////////////////////////////////////////////////////////////////////////////	356	/////////////////////////////////////////////////////////////////////////////
226		357
227	struct rxvt_font_x11 : rxvt_font {	358	struct rxvt_font_x11 : rxvt_font {
228	rxvt_font_x11 () { f = 0; }	359	rxvt_font_x11 () { f = 0; }
229		360
230	void clear ();	361	void clear ();
231		362
232	bool load (int maxheight);	363	rxvt_fontprop properties ();
		364
		365	bool load (const rxvt_fontprop &prop);
233		366
234	bool has_codepoint (uint32_t unicode);	367	bool has_codepoint (uint32_t unicode);
235		368
236	void draw (int x, int y,	369	void draw (rxvt_drawable &d, int x, int y,
237	const text_t *text, int len,	370	const text_t *text, int len,
238	int fg, int bg);	371	int fg, int bg);
239		372
240	XFontStruct *f;	373	XFontStruct *f;
241	codeset cs;	374	codeset cs;
242	bool enc2b, encm;	375	bool enc2b, encm;
243		376
244	const char get_property (const char property, const char *repl) const;	377	const char get_property (XFontStruct f, const char property, const char repl) const;
		378	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		379	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		380	bool set_properties (rxvt_fontprop &p, const char *name);
245	};	381	};
246		382
247	const char *	383	const char *
248	rxvt_font_x11::get_property (const char property, const char repl) const	384	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
249	{	385	{
250	unsigned long value;	386	unsigned long value;
251		387
252	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	388	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
253	return XGetAtomName (DISPLAY, value);	389	return XGetAtomName (DISPLAY, value);
254	else	390	else
255	return repl;	391	return repl;
256	}	392	}
257		393
		394	rxvt_fontprop
		395	rxvt_font_x11::properties ()
		396	{
		397	rxvt_fontprop p;
		398	set_properties (p, f);
		399	return p;
		400	}
		401
258	bool	402	bool
259	rxvt_font_x11::load (int maxheight)	403	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		404	{
		405	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		406	p.height = height;
		407	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		408	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		409
		410	return true;
		411	}
		412
		413	bool
		414	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		415	{
		416	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
		417	const char *slant = get_property (f, "SLANT", "r");
		418
		419	unsigned long height;
		420	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		421	return false;
		422
		423	unsigned long avgwidth;
		424	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		425	avgwidth = 0;
		426
		427	return set_properties (p, height, weight, slant, avgwidth);
		428	}
		429
		430	bool
		431	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		432	{
		433	int slashes = 0;
		434	const char *comp[12];
		435
		436	for (const char c = name; c; c++)
		437	if (*c == '-')
		438	{
		439	comp[slashes++] = c + 1;
		440	if (slashes >= 13)
		441	break;
		442	}
		443
		444	/* can we short-circuit the costly XLoadQueryFont? */
		445	if (slashes >= 13
		446	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		447	&& (comp[11] >= '0' && comp[11] <= '9'))
		448	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		449
		450	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		451
		452	if (f)
		453	{
		454	// the font should really exist now. if not, we have a problem
		455	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		456	// in that case, just return garbage.
		457	bool ret = set_properties (p, f);
		458	XFreeFont (DISPLAY, f);
		459	return ret;
		460	}
		461	else
		462	return false;
		463	}
		464
		465	// fix the size of scalable fonts
		466	static void
		467	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		468	{
		469	int slashes = 0;
		470	const char *size;
		471
		472	for (const char c = name; c; c++)
		473	if (*c == '-')
		474	{
		475	if (slashes == 6)
		476	size = c + 1;
		477
		478	if (++slashes >= 13)
		479	break;
		480	}
		481
		482	if (slashes >= 13 && size[0] == '0')
		483	{
		484	strncpy (buf, name, size - name);
		485	buf += size - name;
		486	buf += sprintf (buf, "%d", prop.height);
		487	strcpy (buf, size + 1);
		488	}
		489	else
		490	strcpy (buf, name);
		491	}
		492
		493	bool
		494	rxvt_font_x11::load (const rxvt_fontprop &prop)
260	{	495	{
261	clear ();	496	clear ();
		497
		498	char **list;
		499	int count;
		500	list = XListFonts (DISPLAY, name, 512, &count);
		501	set_name (0);
		502
		503	if (!list)
		504	return false;
		505
		506	int bestdiff = 0x7fffffff;
		507	for (int i = 0; i < count; i++)
		508	{
		509	rxvt_fontprop p;
		510	char fname[1024];
		511	fix_scalable (fname, list[i], prop);
		512
		513	if (!set_properties (p, fname))
		514	continue;
		515
		516	if (p.height > prop.height) // weed out too large fonts
		517	continue;
		518
		519	int diff = (prop.height - p.height) * 32
		520	+ abs (prop.weight - p.weight)
		521	+ abs (prop.slant - p.slant );
		522
		523	if (!name // compare against best found so far
		524	\|\| diff < bestdiff)
		525	{
		526	set_name (strdup (fname));
		527	bestdiff = diff;
		528	}
		529	}
		530
		531	XFreeFontNames (list);
		532
		533	if (!name)
		534	return false;
262		535
263	f = XLoadQueryFont (DISPLAY, name);	536	f = XLoadQueryFont (DISPLAY, name);
264		537
265	if (!f)	538	if (!f)
266	return false;	539	return false;
267		540
268	unsigned long value;
269
270	const char *registry = get_property ("CHARSET_REGISTRY", 0);	541	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
271	const char *encoding = get_property ("CHARSET_ENCODING", 0);	542	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
272		543
273	if (registry && encoding)	544	if (registry && encoding)
274	{	545	{
275	char charset[64];	546	char charset[64];
276	snprintf (charset, 64, "%s-%s", registry, encoding);	547	snprintf (charset, 64, "%s-%s", registry, encoding);
277		548
278	cs = codeset_from_name (charset);	549	cs = codeset_from_name (charset);
279	}	550	}
280	else	551	else
281	{	552	{
282	const char *charset = get_property ("FONT", 0);	553	const char *charset = get_property (f, "FONT", 0);
283		554
284	if (!charset)	555	if (!charset)
285	charset = name;	556	charset = name;
286		557
287	int count = 13;	558	int count = 13;
…		…
300		571
301	ascent = f->ascent;	572	ascent = f->ascent;
302	descent = f->descent;	573	descent = f->descent;
303	height = ascent + descent;	574	height = ascent + descent;
304		575
305	prop = false;	576	slow = false;
306		577
307	if (f->min_bounds.width == f->max_bounds.width)	578	if (f->min_bounds.width == f->max_bounds.width)
308	width = f->min_bounds.width;	579	width = f->min_bounds.width;
309	else if (f->per_char == NULL)	580	else if (f->per_char == NULL)
310	width = f->max_bounds.width;	581	width = f->max_bounds.width;
311	else	582	else
312	{	583	{
313	prop = true;	584	slow = true;
314		585
315	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	586	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
316		587
317	if (encm)	588	if (encm)
318	N += (f->max_byte1 - f->min_byte1)	589	N += (f->max_byte1 - f->min_byte1)
…		…
360	/* check wether the character exists in _this_ font. horrible. */	631	/* check wether the character exists in _this_ font. horrible. */
361	XCharStruct *xcs;	632	XCharStruct *xcs;
362		633
363	if (encm)	634	if (encm)
364	{	635	{
365	int byte1 = ch >> 8;	636	unsigned char byte1 = ch >> 8;
366	int byte2 = ch & 255;	637	unsigned char byte2 = ch & 255;
367		638
368	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	639	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
369	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	640	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
370	return false;	641	return false;
371		642
…		…
394		665
395	return true;	666	return true;
396	}	667	}
397		668
398	void	669	void
399	rxvt_font_x11::draw (int x, int y,	670	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
400	const text_t *text, int len,	671	const text_t *text, int len,
401	int fg, int bg)	672	int fg, int bg)
402	{	673	{
403	// this looks like a mess /.	674	// this looks like a mess /.
404	// and it is a mess /.	675	// and it is a mess /.
405	// yet we are trying to be perfect /.	676	// yet we are trying to be perfect /.
406	// but the result still isn't perfect /.	677	// but the result still isn't perfect /.
407		678
408	bool slow = prop	679	bool slow = this->slow
409	\|\| width != R->TermWin.fwidth	680	\|\| width != r->TermWin.fwidth
410	\|\| height != R->TermWin.fheight;	681	\|\| height != r->TermWin.fheight;
411		682
412	int base = R->TermWin.fbase;	683	int base = r->TermWin.fbase;
413		684
414	XGCValues v;	685	XGCValues v;
415	v.foreground = R->PixColors[fg];	686	v.foreground = r->PixColors[fg];
416	v.background = R->PixColors[bg];	687	v.background = r->PixColors[bg];
417	v.font = f->fid;	688	v.font = f->fid;
418		689
419	if (enc2b)	690	if (enc2b)
420	{	691	{
421	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	692	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
422		693
423	if (bg == Color_bg && !slow)	694	if (bg == Color_bg && !slow)
424	{	695	{
425	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	696	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
426	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	697	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
427	}	698	}
428	else	699	else
429	{	700	{
430	clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg);	701	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
431		702
432	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	703	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
433		704
434	if (slow)	705	if (slow)
435	{	706	{
436	do	707	do
437	{	708	{
438	if (xc->byte1 \|\| xc->byte2)	709	if (xc->byte1 \|\| xc->byte2)
439	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	710	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
440		711
441	x += R->TermWin.fwidth;	712	x += r->TermWin.fwidth;
442	xc++; len--;	713	xc++; len--;
443	}	714	}
444	while (len);	715	while (len);
445	}	716	}
446	else	717	else
447	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	718	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
448	}	719	}
449	}	720	}
450	else	721	else
451	{	722	{
452	const char *xc = enc_char (text, len, cs, slow);	723	const char *xc = enc_char (text, len, cs, slow);
453		724
454	if (bg == Color_bg && !slow)	725	if (bg == Color_bg && !slow)
455	{	726	{
456	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	727	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
457	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	728	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
458	}	729	}
459	else	730	else
460	{	731	{
461	clear_rect (x, y, R->TermWin.fwidth * len, R->TermWin.fheight, bg);	732	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
462		733
463	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	734	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
464		735
465	if (slow)	736	if (slow)
466	{	737	{
467	do	738	do
468	{	739	{
469	if (*xc)	740	if (*xc)
470	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	741	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
471		742
472	x += R->TermWin.fwidth;	743	x += r->TermWin.fwidth;
473	xc++; len--;	744	xc++; len--;
474	}	745	}
475	while (len);	746	while (len);
476	}	747	}
477	else	748	else
478	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	749	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
479	}	750	}
480	}	751	}
481	}	752	}
482		753
483	/////////////////////////////////////////////////////////////////////////////	754	/////////////////////////////////////////////////////////////////////////////
…		…
488	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	759	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
489	#define SWATHBITS 8	760	#define SWATHBITS 8
490	#endif	761	#endif
491		762
492	struct rxvt_font_xft : rxvt_font {	763	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; }	764	rxvt_font_xft () { f = 0; }
520		765
521	void clear ();	766	void clear ();
522		767
523	bool load (int maxheight);	768	rxvt_fontprop properties ();
524		769
525	void draw (int x, int y,	770	bool load (const rxvt_fontprop &prop);
		771
		772	void draw (rxvt_drawable &d, int x, int y,
526	const text_t *text, int len,	773	const text_t *text, int len,
527	int fg, int bg);	774	int fg, int bg);
528		775
529	bool has_codepoint (uint32_t unicode);	776	bool has_codepoint (uint32_t unicode);
530		777
531	protected:	778	protected:
532	XftFont *f;	779	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	};	780	};
543		781
544	void	782	void
545	rxvt_font_xft::clear ()	783	rxvt_font_xft::clear ()
546	{	784	{
547	if (f)	785	if (f)
548	{	786	{
549	XftFontClose (R->Xdisplay, f);	787	XftFontClose (DISPLAY, f);
550	f = 0;	788	f = 0;
551	}	789	}
		790	}
552		791
553	if (d)	792	rxvt_fontprop
554	{	793	rxvt_font_xft::properties ()
555	XftDrawDestroy (d);	794	{
556	d = 0;	795	rxvt_fontprop p;
557	}
558		796
559	#if 0	797	FT_Face face = XftLockFace (f);
560	for (int i = 0; i < SWATHCOUNT; i++)	798
561	delete cvr[i];	799	p.width = width; p.height = height;
562	#endif	800	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		801	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
		802
		803	XftUnlockFace (f);
		804
		805	return p;
563	}	806	}
564		807
565	bool	808	bool
566	rxvt_font_xft::load (int maxheight)	809	rxvt_font_xft::load (const rxvt_fontprop &prop)
567	{	810	{
568	#if 0	811	#if 0
569	for (int i = 0; i < SWATHCOUNT; i++)	812	for (int i = 0; i < SWATHCOUNT; i++)
570	cvr[i] = 0;	813	cvr[i] = 0;
571	#endif	814	#endif
572		815
573	clear ();	816	clear ();
574		817
575	f = XftFontOpenName (R->Xdisplay, DefaultScreen (R->Xdisplay), name);	818	FcPattern p = FcNameParse ((FcChar8 ) name);
		819
		820	if (!p)
		821	return false;
		822
		823	FcValue v;
		824
		825	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
		826	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
		827
		828	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
		829	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		830
		831	#if 0 // clipping unfortunately destroys our precious double-width-characters
		832	// clip width, we can't do better, or can we?
		833	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		834	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		835	#endif
		836
		837	//FcPatternAddBool (p, FC_MINSPACE, 1);
		838
		839	XftResult result;
		840	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
		841
		842	FcPatternDestroy (p);
		843
		844	if (!match)
		845	return false;
		846
		847	f = XftFontOpenPattern (DISPLAY, match);
576		848
577	if (!f)	849	if (!f)
		850	{
		851	FcPatternDestroy (match);
578	return false;	852	return false;
		853	}
579		854
580	FT_Face face = XftLockFace (f);	855	FT_Face face = XftLockFace (f);
581		856
582	prop = !FT_IS_FIXED_WIDTH (face);	857	slow = !FT_IS_FIXED_WIDTH (face);
583		858
584	int ftheight = 0;	859	int ftheight = 0;
585		860
586	for (;;)	861	for (;;)
587	{	862	{
588	XGlyphInfo g1, g2;	863	XGlyphInfo g1, g2;
589	FcChar8 c;	864	FcChar8 c;
590		865
591	c = 'i'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g1);	866	c = 'i'; XftTextExtents8 (DISPLAY, f, &c, 1, &g1);
592	c = 'W'; XftTextExtents8 (R->Xdisplay, f, &c, 1, &g2);	867	c = 'W'; XftTextExtents8 (DISPLAY, f, &c, 1, &g2);
593		868
594	prop = prop \|\| g1.xOff != g2.xOff; // don't simply trust the font	869	if (g1.xOff != g2.xOff) // don't simply trust the font
		870	slow = true;
595		871
596	width = g2.xOff;	872	width = g2.xOff;
597	ascent = (face->size->metrics.ascender + 63) >> 6;	873	ascent = (face->size->metrics.ascender + 63) >> 6;
598	descent = (-face->size->metrics.descender + 63) >> 6;	874	descent = (-face->size->metrics.descender + 63) >> 6;
599	height = ascent + descent;	875	height = ascent + descent;
600		876
601	if (height <= maxheight \|\| !maxheight)	877	if (height <= prop.height \|\| !prop.height)
602	break;	878	break;
603		879
604	if (ftheight)	880	if (ftheight)
605	{	881	{
606	// take smaller steps near the end	882	// take smaller steps near the end
607	if (height > maxheight + 1) ftheight++;	883	if (height > prop.height + 1) ftheight++;
608	if (height > maxheight + 2) ftheight++;	884	if (height > prop.height + 2) ftheight++;
609	if (height > maxheight + 3) ftheight++;	885	if (height > prop.height + 3) ftheight++;
610		886
611	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - maxheight);	887	FT_Set_Pixel_Sizes (face, 0, ftheight -= height - prop.height);
612	}	888	}
613	else	889	else
614	FT_Set_Pixel_Sizes (face, 0, ftheight = maxheight);	890	FT_Set_Pixel_Sizes (face, 0, ftheight = prop.height);
615	}	891	}
616		892
617	XftUnlockFace (f);	893	XftUnlockFace (f);
618		894
619	return true;	895	return true;
620	}	896	}
621
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		897
634	bool	898	bool
635	rxvt_font_xft::has_codepoint (uint32_t unicode)	899	rxvt_font_xft::has_codepoint (uint32_t unicode)
636	{	900	{
637	return XftCharExists (R->Xdisplay, f, unicode);	901	return XftCharExists (DISPLAY, f, unicode);
638	}	902	}
639		903
640	void	904	void
641	rxvt_font_xft::draw (int x, int y,	905	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
642	const text_t *text, int len,	906	const text_t *text, int len,
643	int fg, int bg)	907	int fg, int bg)
644	{	908	{
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);	909	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
652		910
653	if (!prop && width == R->TermWin.fwidth)	911	if (!slow && width == r->TermWin.fwidth && 0)
654	{	912	{
655	if (sizeof (text_t) == sizeof (FcChar16))	913	if (sizeof (text_t) == sizeof (FcChar16))
656	XftDrawString16 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar16 *)text, len);	914	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
657	else	915	else
658	XftDrawString32 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar32 *)text, len);	916	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
659	}	917	}
660	else	918	else
661	{	919	{
662	while (len)	920	while (len)
663	{	921	{
664	if (text != NOCHAR && text != ' ')	922	if (text != NOCHAR && text != ' ')
665	{	923	{
		924	int fwidth = r->TermWin.fwidth;
		925	if (len >= 2 && text[1] == NOCHAR)
		926	fwidth *= 2;
		927
		928	XGlyphInfo extents;
666	if (sizeof (text_t) == sizeof (FcChar16))	929	if (sizeof (text_t) == sizeof (FcChar16))
667	XftDrawString16 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar16 *)text, 1);	930	{
		931	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		932	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		933	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		934	}
668	else	935	else
669	XftDrawString32 (d, &R->PixColors[fg].c, f, x, y + R->TermWin.fbase, (const FcChar32 *)text, 1);	936	{
		937	XGlyphInfo extents;
		938	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		939	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		940	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		941	}
670	}	942	}
671		943
672	x += R->TermWin.fwidth;	944	x += r->TermWin.fwidth;
673	text++;	945	text++;
674	len--;	946	len--;
675	}	947	}
676	}	948	}
677	}	949	}
678	#endif	950	#endif
679		951
680	/////////////////////////////////////////////////////////////////////////////	952	/////////////////////////////////////////////////////////////////////////////
681		953
682	rxvt_fontset::rxvt_fontset (pR)	954	rxvt_fontset::rxvt_fontset (rxvt_t r)
683	#ifdef EXPLICIT_CONTEXT	955	: r (r)
684	: rxvt_term(R)
685	#endif
686	{	956	{
687	clear ();	957	clear ();
688	}	958	}
689		959
690	rxvt_fontset::~rxvt_fontset ()	960	rxvt_fontset::~rxvt_fontset ()
…		…
693	}	963	}
694		964
695	void	965	void
696	rxvt_fontset::clear ()	966	rxvt_fontset::clear ()
697	{	967	{
698	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	968	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
699	FONT_UNREF (*i);	969	FONT_UNREF (*i);
700		970
701	fonts.clear ();	971	fonts.clear ();
702	base_id = 0;	972	base_id = 0;
703	height = 0x7fffffff;	973	base_prop.height = 0x7fffffff;
		974	base_prop.weight = rxvt_fontprop::medium;
		975	base_prop.slant = rxvt_fontprop::roman;
704		976
705	fallback = fallback_fonts;	977	fallback = fallback_fonts;
706	}	978	}
707		979
708	rxvt_font *	980	rxvt_font *
…		…
728	f = new rxvt_font_x11;	1000	f = new rxvt_font_x11;
729	}	1001	}
730	else	1002	else
731	f = new rxvt_font_x11;	1003	f = new rxvt_font_x11;
732		1004
733	f->set_term (aR);	1005	f->set_term (r);
734	f->set_name (strdup (name));	1006	f->set_name (strdup (name));
735		1007
736	f->cs = cs;	1008	f->cs = cs;
737	f->loaded = false;	1009	f->loaded = false;
738		1010
…		…
755		1027
756	if (*desc == '[')	1028	if (*desc == '[')
757	{	1029	{
758	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1030	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
759		1031
760	const char *extra = desc++;	1032	//const char *extra = desc++; // not yet used
761		1033
762	desc = strchr (desc, ']');	1034	desc = strchr (desc, ']');
763		1035
764	if (!desc)	1036	if (!desc)
765	{	1037	{
…		…
793	rxvt_fontset::realize_font (int i)	1065	rxvt_fontset::realize_font (int i)
794	{	1066	{
795	if (fonts[i]->loaded)	1067	if (fonts[i]->loaded)
796	return true;	1068	return true;
797		1069
798	if (fonts[i]->load (height))
799	return fonts[i]->loaded = true;	1070	fonts[i]->loaded = true;
800		1071
801	delete fonts[i];	1072	if (!fonts[i]->load (base_prop))
802	fonts.erase (fonts.begin () + i);	1073	{
803		1074	fonts[i]->cs = CS_UNKNOWN;
804	return false;	1075	return false;
805	}	1076	}
806		1077
807	void	1078	return true;
		1079	}
		1080
		1081	bool
808	rxvt_fontset::populate (const char *desc)	1082	rxvt_fontset::populate (const char *desc)
809	{	1083	{
810	clear ();	1084	clear ();
811		1085
812	fonts.push_back (new_font (0, CS_UNICODE));	1086	fonts.push_back (new_font (0, CS_UNICODE));
…		…
816		1090
817	if (!base_id)	1091	if (!base_id)
818	base_id = 1;	1092	base_id = 1;
819		1093
820	// we currently need a base-font, no matter what	1094	// we currently need a base-font, no matter what
821	if (fonts.size () <= base_id)	1095	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
822	{	1096	{
		1097	puts ("unable to load specified font (s), falling back to 'fixed'\n");
823	add_fonts ("fixed");	1098	add_fonts ("fixed");
824	base_id = 1;	1099	base_id = fonts.size () - 1;
825	}	1100	}
826		1101
827	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1102	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
828	{	1103	return false;
829	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
830	exit (1);
831	}
832		1104
833	height = fonts[base_id]->height;	1105	base_prop = fonts[base_id]->properties ();
834		1106
835	/add_fonts ("-efont-fixed-medium-r-normal--14------iso10646-1,"/	1107	return true;
836	}	1108	}
837		1109
838	int	1110	int
839	rxvt_fontset::find_font (uint32_t unicode)	1111	rxvt_fontset::find_font (uint32_t unicode)
840	{	1112	{
841	for (int i = 0; i < fonts.size (); i++)	1113	for (unsigned int i = 0; i < fonts.size (); i++)
842	{	1114	{
843	rxvt_font *f = fonts[i];	1115	rxvt_font *f = fonts[i];
844		1116
845	if (!f->loaded)	1117	if (!f->loaded)
846	{	1118	{
847	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1119	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
848	goto next_font;	1120	goto next_font;
849		1121
850	if (!realize_font (i))	1122	if (!realize_font (i))
851	{
852	--i;
853	goto next_font;	1123	goto next_font;
854	}	1124	}
855		1125
856	//printf ("added font %s for %04lx\n", f->name, unicode);
857	}
858
859	if (f->has_codepoint (unicode))	1126	if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode))
860	return i;	1127	return i;
861		1128
862	next_font:	1129	next_font:
863	if (i == fonts.size () - 1 && fallback->name)	1130	if (i == fonts.size () - 1 && fallback->name)
864	{	1131	{
865	fonts.push_back (new_font (fallback->name, fallback->cs));	1132	fonts.push_back (new_font (fallback->name, fallback->cs));
866	fallback++;	1133	fallback++;
		1134	i = 0;
867	}	1135	}
868	}	1136	}
869		1137
870	return 0; /* we must return SOME font */	1138	return 0; /* we must return SOME font */
871	}	1139	}

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.26 by pcg, Fri Feb 27 02:52:51 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.26 by pcg, Fri Feb 27 02:52:51 2004 UTC