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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs.
Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC

…		…
1	/---------------------------------C----------------------------------;	1	/---------------------------------C----------------------------------;
2	* File: defaultfont.C	2	* File: defaultfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003 Marc Lehmann rxvt@plan9.de>	4	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
29	#define DRAWABLE r->TermWin.vt
30	#define GC r->TermWin.gc	29	#define TGC r->TermWin.gc
31		30
32	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
33	codeset cs;	32	codeset cs;
34	const char *name;	33	const char *name;
35	} fallback_fonts[] = {	34	} fallback_fonts[] = {
…		…
62	# if XFT	61	# if XFT
63	// prefer xft for complex scripts	62	// prefer xft for complex scripts
64	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65	# endif	64	# endif
66	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
67	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	66	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
68	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
69	#endif	68	#endif
70		69
71	#if ENCODING_CN \|\| ENCODING_CN_EXT	70	#if ENCODING_CN \|\| ENCODING_CN_EXT
72	# if XFT	71	# if XFT
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	76	# endif
		77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
		80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },	85	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },	86	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },	87	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },	88	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	89	#endif
87		90
88	#if XFT	91	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	92	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	93	{ CS_UNICODE, "xft:Arial Unicode MS" },
…		…
93	{ CS_UNICODE, "xft:FreeMono" },	96	{ CS_UNICODE, "xft:FreeMono" },
94	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	97	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
95	{ CS_UNICODE, "----r-------c--iso10646-1" },	98	{ CS_UNICODE, "----r-------c--iso10646-1" },
96	{ CS_UNICODE, "----r-------m--iso10646-1" },	99	{ CS_UNICODE, "----r-------m--iso10646-1" },
97		100
		101	#if UNICODE_3 && XFT
		102	{ CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
		103	#endif
		104
98	{ CS_UNKNOWN, 0 }	105	{ CS_UNKNOWN, 0 }
99	};	106	};
100		107
101	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
102		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
103	static void *enc_buf;	128	static void *enc_buf;
104	static uint32_t enc_len;	129	static uint32_t enc_len;
105		130
106	static inline void *	131	static inline void *
107	get_enc_buf (int len)	132	get_enc_buf (uint32_t len)
108	{	133	{
109	if (len > enc_len)	134	if (len > enc_len)
110	{	135	{
111	free (enc_buf);	136	free (enc_buf);
112	enc_buf = malloc (len);	137	enc_buf = malloc (len);
…		…
114		139
115	return enc_buf;	140	return enc_buf;
116	}	141	}
117		142
118	static const char *	143	static const char *
119	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)
120	{	145	{
121	uint8_t buf = (uint8_t )get_enc_buf (len);	146	uint8_t buf = (uint8_t )get_enc_buf (len);
122		147
123	while (len--)	148	while (len--)
124	{	149	{
…		…
135		160
136	return (const char *)enc_buf;	161	return (const char *)enc_buf;
137	}	162	}
138		163
139	static const XChar2b *	164	static const XChar2b *
140	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)
141	{	166	{
142	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	167	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
143		168
144	while (len--)	169	while (len--)
145	{	170	{
…		…
160	}	185	}
161		186
162	/////////////////////////////////////////////////////////////////////////////	187	/////////////////////////////////////////////////////////////////////////////
163		188
164	void	189	void
165	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)
166	{	191	{
167	if (color == Color_bg)	192	if (color == Color_bg)
168	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	193	XClearArea (d.display->display, d, x, y, w, h, FALSE);
169	else if (color >= 0)	194	else if (color >= 0)
170	{	195	{
		196	#if XFT
		197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		198	#else
171	XSetForeground (DISPLAY, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, TGC, r->PixColors[color]);
172	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
		201	#endif
173	}	202	}
174	}	203	}
175		204
176	static const char *linedraw_cmds[128] = {	205	#include "table/linedraw.h"
177	"1hH", "2hH", "1vV", "2vV",
178	0, 0, 0, 0,
179	0, 0, 0, 0,
180	"1HV", "2H1V", "1H2V", "2HV",
181
182	// 2510
183	"1hV", "2h1V", "1h2V", "2hV",
184	"1Hv", "2H1v", "1H2v", "2Hv",
185	"1hv", "2h1v", "1h2v", "2hv",
186	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
187
188	// 2520
189	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
190	"1hvV", "2h1vV", "1hV2v", "1hv2V",
191	"1h2vV", "2hv1V", "1v2hV", "2hvV",
192	"1hHV", "2h1HV", "2H1hV", "2hH1V",
193
194	// 2530
195	"1hH2V", "2hV1H", "1h2HV", "2hHV",
196	"1hHv", "1vH2h", "1hv2H", "1v2hH",
197	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
198	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
199
200	// 2540
201	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
202	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
203	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
204	0, 0, 0, 0,
205
206	// 2550
207	0, 0, 0, 0,
208	0, 0, 0, 0,
209	0, 0, 0, 0,
210	0, 0, 0, 0,
211
212	// 2560
213	0, 0, 0, 0,
214	0, 0, 0, 0,
215	0, 0, 0, 0,
216	0, 0, 0, 0,
217
218	// 2570
219	0, "1a", "1b", "1ab",
220	"1h", "1v", "1H", "1V",
221	"2h", "2v", "2H", "2V",
222	"1h2H", "1v2V", "1H2h", "1V2v"
223
224	// to be done
225	};
226		206
227	struct rxvt_font_default : rxvt_font {	207	struct rxvt_font_default : rxvt_font {
		208
228	rxvt_fontprop properties ()	209	rxvt_fontprop properties ()
229	{	210	{
230	rxvt_fontprop p;	211	rxvt_fontprop p;
231		212
232	p.width = p.height = 1;	213	p.width = p.height = 1;
…		…
239	bool load (const rxvt_fontprop &prop)	220	bool load (const rxvt_fontprop &prop)
240	{	221	{
241	width = 1; height = 1;	222	width = 1; height = 1;
242	ascent = 1; descent = 0;	223	ascent = 1; descent = 0;
243		224
		225	set_name (strdup ("built-in pseudofont"));
		226
244	return true;	227	return true;
245	}	228	}
246		229
247	bool has_codepoint (uint32_t unicode)	230	bool has_codepoint (unicode_t unicode)
248	{	231	{
249	if (unicode <= 0x001f)	232	if (unicode <= 0x001f)
250	return true;	233	return true;
251	if (unicode >= 0x0080 && unicode <= 0x009f)	234
		235	if (unicode <= 0x007f)
		236	return false;
		237
		238	if (unicode <= 0x009f)
252	return true;	239	return true;
253		240
254	if (unicode >= 0x2500 && unicode <= 0x257f	241	if (unicode >= 0x2500 && unicode <= 0x259f)
255	&& linedraw_cmds[unicode - 0x2500])	242	return true;
		243
		244	if (IS_COMPOSE (unicode))
256	return true;	245	return true;
257		246
258	switch (unicode)	247	switch (unicode)
259	{	248	{
260	case ZERO_WIDTH_CHAR:	249	case ZERO_WIDTH_CHAR:
…		…
262	}	251	}
263		252
264	return false;	253	return false;
265	}	254	}
266		255
267	void draw (int x, int y,	256	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	257	const text_t *text, int len,
269	int fg, int bg);	258	int fg, int bg);
270	};	259	};
271		260
272	void	261	void
273	rxvt_font_default::draw (int x, int y,	262	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	263	const text_t *text, int len,
275	int fg, int bg)	264	int fg, int bg)
276	{	265	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	266	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		267
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	268	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280		269
281	while (len--)	270	while (len--)
282	{	271	{
		272	#if ENABLE_COMBINING
		273	compose_char *cc;
		274	#endif
283	text_t t = *text++;	275	text_t t = *text++;
284		276
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	277	if (0x2500 <= t && t <= 0x259f)
		278	{
		279	uint16_t offs = linedraw_offs[t - 0x2500];
		280	uint32_t *a = linedraw_command + (offs >> 4);
		281	uint32_t *b = a + (offs & 15);
		282
		283	int W = r->TermWin.fwidth;
		284	int H = r->TermWin.fheight;
		285
		286	int x_[16];
		287	int y_[16];
		288
		289	for (int i = 0; i <= 8; i++)
286	{	290	{
287	const char *p = linedraw_cmds[t - 0x2500];	291	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		292	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		293	}
288		294
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	295	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	296	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
291		297
292	XGCValues gcv;	298	XGCValues gcv;
293		299
		300	gcv.cap_style = CapButt;
		301	gcv.line_width = 0;
		302	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		303
294	while (*p)	304	while (a < b)
295	{	305	{
		306	uint32_t command = *a++;
		307
		308	int op = (command >> 24) & 255;
		309	int a = (command >> 20) & 15;
		310	int b = (command >> 16) & 15;
		311	int x1 = x_[(command >> 12) & 15];
		312	int y1 = y_[(command >> 8) & 15];
		313	int x2 = x_[(command >> 4) & 15];
		314	int y2 = y_[(command >> 0) & 15];
		315
296	switch (*p++)	316	switch (op)
297	{	317	{
298	case '1':	318	case 0: // line
299	gcv.line_width = 0;	319	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301	break;	320	break;
302		321
303	case '2':	322	case 1: // rectangle, possibly stippled
		323	if (a)
		324	{
		325	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		326
		327	gcv.fill_style = FillStippled;
		328	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		329	gcv.ts_x_origin = x;
		330	gcv.ts_y_origin = y;
		331
		332	XChangeGC (d.display->display, TGC,
		333	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		334	&gcv);
		335	}
		336
		337	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		338
		339	if (a)
		340	{
		341	XFreePixmap (d.display->display, gcv.stipple);
304	gcv.line_width = 2;	342	gcv.stipple = 0;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	343	gcv.fill_style = FillSolid;
		344	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		345	}
306	break;	346	break;
307		347	case 2: // arc
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	348	XDrawArc (d.display->display, d, TGC,
309	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	349	x1 - W/2, y1 - H/2, W-1, H-1,
310	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	350	(a - 1) * 9064, (b - 1) 90*64);
311	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	351	break;
312	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
313	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
314	}	352	}
315	}	353	}
316		354	}
317	gcv.line_width = 0;	355	#if ENABLE_COMBINING
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	356	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319	}	357	{
		358	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		359	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		360	if (cc->c2 != NOCHAR)
		361	{
		362	// prefer font of first character, for no good reasons
		363	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		364	? f1
		365	: (*fs)[fs->find_font (cc->c2)];
		366
		367	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		368	}
		369	}
		370	#endif
320	else	371	else
321	switch (*text++)	372	switch (t)
322	{	373	{
323	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	374	case ZERO_WIDTH_CHAR:
325	break;	375	break;
		376
326	default:	377	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	378	int w = 0;
		379	while (len > 0 && *text == NOCHAR)
		380	{
		381	++text;
		382	--len;
		383	w += r->TermWin.fwidth;
		384	}
		385
		386	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
		387	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
		388	x += w;
328	}	389	}
329		390
330	x += r->TermWin.fwidth;	391	x += r->TermWin.fwidth;
331	}	392	}
332	}	393	}
…		…
337	rxvt_font_x11 () { f = 0; }	398	rxvt_font_x11 () { f = 0; }
338		399
339	void clear ();	400	void clear ();
340		401
341	rxvt_fontprop properties ();	402	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		403
344	bool load (const rxvt_fontprop &prop);	404	bool load (const rxvt_fontprop &prop);
345		405
346	bool has_codepoint (uint32_t unicode);	406	bool has_codepoint (unicode_t unicode);
347		407
348	void draw (int x, int y,	408	void draw (rxvt_drawable &d, int x, int y,
349	const text_t *text, int len,	409	const text_t *text, int len,
350	int fg, int bg);	410	int fg, int bg);
351		411
352	XFontStruct *f;	412	XFontStruct *f;
353	codeset cs;	413	codeset cs;
354	bool enc2b, encm;	414	bool enc2b, encm;
355		415
356	const char get_property (XFontStruct f, const char property, const char repl) const;	416	const char get_property (XFontStruct f, const char property, const char repl) const;
		417	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		418	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		419	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	420	};
358		421
359	const char *	422	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	423	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	424	{
…		…
368	}	431	}
369		432
370	rxvt_fontprop	433	rxvt_fontprop
371	rxvt_font_x11::properties ()	434	rxvt_font_x11::properties ()
372	{	435	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	436	rxvt_fontprop p;
		437	set_properties (p, f);
		438	return p;
		439	}
380		440
		441	bool
		442	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		443	{
		444	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		445	p.height = height;
		446	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		447	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		448
		449	return true;
		450	}
		451
		452	bool
		453	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		454	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	455	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	456	const char *slant = get_property (f, "SLANT", "r");
383		457
		458	unsigned long height;
		459	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		460	return false;
		461
384	unsigned long avgwidth;	462	unsigned long avgwidth;
385	p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)	463	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
386	? avgwidth / 10	464	avgwidth = 0;
387	: (height + 1) / 2;
388	p.height = height;
389	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391		465
392	return p;	466	return set_properties (p, height, weight, slant, avgwidth);
		467	}
		468
		469	bool
		470	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		471	{
		472	int slashes = 0;
		473	const char *comp[13];
		474
		475	for (const char c = name; c; c++)
		476	if (*c == '-')
		477	{
		478	comp[slashes++] = c + 1;
		479	if (slashes >= 13)
		480	break;
		481	}
		482
		483	/* can we short-circuit the costly XLoadQueryFont? */
		484	if (slashes >= 13
		485	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		486	&& (comp[11] >= '0' && comp[11] <= '9'))
		487	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		488
		489	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		490
		491	if (f)
		492	{
		493	// the font should really exist now. if not, we have a problem
		494	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		495	// in that case, just return garbage.
		496	bool ret = set_properties (p, f);
		497	XFreeFont (DISPLAY, f);
		498	return ret;
		499	}
		500	else
		501	return false;
		502	}
		503
		504	// fix the size of scalable fonts
		505	static void
		506	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		507	{
		508	int slashes = 0;
		509	const char *size;
		510
		511	for (const char c = name; c; c++)
		512	if (*c == '-')
		513	{
		514	if (slashes == 6)
		515	size = c + 1;
		516
		517	if (++slashes >= 13)
		518	break;
		519	}
		520
		521	if (slashes >= 13 && size[0] == '0')
		522	{
		523	strncpy (buf, name, size - name);
		524	buf += size - name;
		525	buf += sprintf (buf, "%d", prop.height);
		526	strcpy (buf, size + 1);
		527	}
		528	else
		529	strcpy (buf, name);
393	}	530	}
394		531
395	bool	532	bool
396	rxvt_font_x11::load (const rxvt_fontprop &prop)	533	rxvt_font_x11::load (const rxvt_fontprop &prop)
397	{	534	{
398	clear ();	535	clear ();
399		536
400	char **list;	537	char **list;
401	int count;	538	int count;
402	XFontStruct *info;
403	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	539	list = XListFonts (DISPLAY, name, 512, &count);
		540	set_name (0);
404		541
405	if (!list)	542	if (!list)
406	return false;	543	return false;
407		544
408	int bestdiff = 0x7fffffff;	545	int bestdiff = 0x7fffffff;
409	XFontStruct *best = 0;
410	for (int i = 0; i < count; i++)	546	for (int i = 0; i < count; i++)
411	{	547	{
412	XFontStruct *f = info + i;	548	rxvt_fontprop p;
		549	char fname[1024];
		550	fix_scalable (fname, list[i], prop);
413		551
		552	if (!set_properties (p, fname))
		553	continue;
		554
414	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	555	if (p.height > prop.height) // weed out too large fonts
415	{	556	continue;
416	rxvt_fontprop p = properties (f);	557
417	int diff = (prop.height - f->ascent + f->descent) * 32	558	int diff = (prop.height - p.height) * 32
418	+ abs (prop.weight - p.weight)	559	+ abs (prop.weight - p.weight)
419	+ abs (prop.slant - p.slant );	560	+ abs (prop.slant - p.slant );
420		561
421	if (!best // compare against best found so far	562	if (!name // compare against best found so far
422	\|\| diff < bestdiff)	563	\|\| diff < bestdiff)
423	{	564	{
424	best = f;	565	set_name (strdup (fname));
425	bestdiff = diff;	566	bestdiff = diff;
426	}	567	}
427	}
428	}	568	}
429		569
		570	XFreeFontNames (list);
		571
430	if (!best)	572	if (!name)
431	return false;	573	return false;
432
433	set_name (strdup (list[best - info]));
434
435	XFreeFontInfo (list, info, count);
436		574
437	f = XLoadQueryFont (DISPLAY, name);	575	f = XLoadQueryFont (DISPLAY, name);
438		576
439	if (!f)	577	if (!f)
440	return false;	578	return false;
441
442	unsigned long value;
443		579
444	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	580	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	581	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446		582
447	if (registry && encoding)	583	if (registry && encoding)
…		…
522	f = 0;	658	f = 0;
523	}	659	}
524	}	660	}
525		661
526	bool	662	bool
527	rxvt_font_x11::has_codepoint (uint32_t unicode)	663	rxvt_font_x11::has_codepoint (unicode_t unicode)
528	{	664	{
529	uint32_t ch = FROM_UNICODE (cs, unicode);	665	uint32_t ch = FROM_UNICODE (cs, unicode);
530		666
531	if (ch == NOCHAR)	667	if (ch == NOCHAR)
532	return false;	668	return false;
…		…
534	/* check wether the character exists in _this_ font. horrible. */	670	/* check wether the character exists in _this_ font. horrible. */
535	XCharStruct *xcs;	671	XCharStruct *xcs;
536		672
537	if (encm)	673	if (encm)
538	{	674	{
539	int byte1 = ch >> 8;	675	unsigned char byte1 = ch >> 8;
540	int byte2 = ch & 255;	676	unsigned char byte2 = ch & 255;
541		677
542	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	678	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
543	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	679	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
544	return false;	680	return false;
545		681
…		…
568		704
569	return true;	705	return true;
570	}	706	}
571		707
572	void	708	void
573	rxvt_font_x11::draw (int x, int y,	709	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
574	const text_t *text, int len,	710	const text_t *text, int len,
575	int fg, int bg)	711	int fg, int bg)
576	{	712	{
577	// this looks like a mess /.	713	// this looks like a mess /.
578	// and it is a mess /.	714	// and it is a mess /.
…		…
594	{	730	{
595	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	731	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
596		732
597	if (bg == Color_bg && !slow)	733	if (bg == Color_bg && !slow)
598	{	734	{
599	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	735	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
600	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	736	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
601	}	737	}
602	else	738	else
603	{	739	{
604	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	740	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
605		741
606	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	742	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
607		743
608	if (slow)	744	if (slow)
609	{	745	{
610	do	746	do
611	{	747	{
612	if (xc->byte1 \|\| xc->byte2)	748	if (xc->byte1 \|\| xc->byte2)
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	749	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
614		750
615	x += r->TermWin.fwidth;	751	x += r->TermWin.fwidth;
616	xc++; len--;	752	xc++; len--;
617	}	753	}
618	while (len);	754	while (len);
619	}	755	}
620	else	756	else
621	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	757	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
622	}	758	}
623	}	759	}
624	else	760	else
625	{	761	{
626	const char *xc = enc_char (text, len, cs, slow);	762	const char *xc = enc_char (text, len, cs, slow);
627		763
628	if (bg == Color_bg && !slow)	764	if (bg == Color_bg && !slow)
629	{	765	{
630	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	766	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
631	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	767	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
632	}	768	}
633	else	769	else
634	{	770	{
635	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	771	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
636		772
637	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	773	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
638		774
639	if (slow)	775	if (slow)
640	{	776	{
641	do	777	do
642	{	778	{
643	if (*xc)	779	if (*xc)
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	780	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
645		781
646	x += r->TermWin.fwidth;	782	x += r->TermWin.fwidth;
647	xc++; len--;	783	xc++; len--;
648	}	784	}
649	while (len);	785	while (len);
650	}	786	}
651	else	787	else
652	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	788	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
653	}	789	}
654	}	790	}
655	}	791	}
656		792
657	/////////////////////////////////////////////////////////////////////////////	793	/////////////////////////////////////////////////////////////////////////////
…		…
662	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	798	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
663	#define SWATHBITS 8	799	#define SWATHBITS 8
664	#endif	800	#endif
665		801
666	struct rxvt_font_xft : rxvt_font {	802	struct rxvt_font_xft : rxvt_font {
667	rxvt_font_xft () { f = 0; d = 0; }	803	rxvt_font_xft () { f = 0; }
668		804
669	void clear ();	805	void clear ();
670		806
671	rxvt_fontprop properties ();	807	rxvt_fontprop properties ();
672		808
673	bool load (const rxvt_fontprop &prop);	809	bool load (const rxvt_fontprop &prop);
674		810
675	void draw (int x, int y,	811	void draw (rxvt_drawable &d, int x, int y,
676	const text_t *text, int len,	812	const text_t *text, int len,
677	int fg, int bg);	813	int fg, int bg);
678		814
679	bool has_codepoint (uint32_t unicode);	815	bool has_codepoint (unicode_t unicode);
680		816
681	protected:	817	protected:
682	XftFont *f;	818	XftFont *f;
683	XftDraw *d;
684	};	819	};
685		820
686	void	821	void
687	rxvt_font_xft::clear ()	822	rxvt_font_xft::clear ()
688	{	823	{
689	if (f)	824	if (f)
690	{	825	{
691	XftFontClose (DISPLAY, f);	826	XftFontClose (DISPLAY, f);
692	f = 0;	827	f = 0;
693	}
694
695	if (d)
696	{
697	XftDrawDestroy (d);
698	d = 0;
699	}	828	}
700	}	829	}
701		830
702	rxvt_fontprop	831	rxvt_fontprop
703	rxvt_font_xft::properties ()	832	rxvt_font_xft::properties ()
…		…
804		933
805	return true;	934	return true;
806	}	935	}
807		936
808	bool	937	bool
809	rxvt_font_xft::has_codepoint (uint32_t unicode)	938	rxvt_font_xft::has_codepoint (unicode_t unicode)
810	{	939	{
811	return XftCharExists (DISPLAY, f, unicode);	940	return XftCharExists (DISPLAY, f, unicode);
812	}	941	}
813		942
814	void	943	void
815	rxvt_font_xft::draw (int x, int y,	944	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
816	const text_t *text, int len,	945	const text_t *text, int len,
817	int fg, int bg)	946	int fg, int bg)
818	{	947	{
819	if (!d)
820	{
821	dR;
822	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
823	}
824
825	if (bg >= 0 && bg != Color_bg)
826	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
827	else
828	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	948	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
829		949
830	if (!slow && width == r->TermWin.fwidth)	950	if (!slow && width == r->TermWin.fwidth && 0)
831	{	951	{
832	if (sizeof (text_t) == sizeof (FcChar16))	952	if (sizeof (text_t) == sizeof (FcChar16))
833	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	953	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
834	else	954	else
835	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	955	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
838	{	958	{
839	while (len)	959	while (len)
840	{	960	{
841	if (text != NOCHAR && text != ' ')	961	if (text != NOCHAR && text != ' ')
842	{	962	{
		963	int fwidth = r->TermWin.fwidth;
		964	if (len >= 2 && text[1] == NOCHAR)
		965	fwidth *= 2;
		966
		967	XGlyphInfo extents;
843	if (sizeof (text_t) == sizeof (FcChar16))	968	if (sizeof (text_t) == sizeof (FcChar16))
844	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	969	{
		970	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		971	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		972	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		973	}
845	else	974	else
846	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	975	{
		976	XGlyphInfo extents;
		977	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		978	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		979	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		980	}
847	}	981	}
848		982
849	x += r->TermWin.fwidth;	983	x += r->TermWin.fwidth;
850	text++;	984	text++;
851	len--;	985	len--;
…		…
855	#endif	989	#endif
856		990
857	/////////////////////////////////////////////////////////////////////////////	991	/////////////////////////////////////////////////////////////////////////////
858		992
859	rxvt_fontset::rxvt_fontset (rxvt_t r)	993	rxvt_fontset::rxvt_fontset (rxvt_t r)
860	#ifdef EXPLICIT_CONTEXT
861	: r(r)	994	: r (r)
862	#endif
863	{	995	{
864	clear ();	996	clear ();
865	}	997	}
866		998
867	rxvt_fontset::~rxvt_fontset ()	999	rxvt_fontset::~rxvt_fontset ()
…		…
870	}	1002	}
871		1003
872	void	1004	void
873	rxvt_fontset::clear ()	1005	rxvt_fontset::clear ()
874	{	1006	{
875	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1007	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
876	FONT_UNREF (*i);	1008	FONT_UNREF (*i);
877		1009
878	fonts.clear ();	1010	fonts.clear ();
879	base_id = 0;	1011	base_id = 0;
880	base_prop.height = 0x7fffffff;	1012	base_prop.height = 0x7fffffff;
…		…
907	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
908	}	1040	}
909	else	1041	else
910	f = new rxvt_font_x11;	1042	f = new rxvt_font_x11;
911		1043
		1044	f->fs = this;
912	f->set_term (r);	1045	f->set_term (r);
913	f->set_name (strdup (name));	1046	f->set_name (strdup (name));
914		1047
915	f->cs = cs;	1048	f->cs = cs;
916	f->loaded = false;	1049	f->loaded = false;
…		…
934		1067
935	if (*desc == '[')	1068	if (*desc == '[')
936	{	1069	{
937	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1070	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
938		1071
939	const char *extra = desc++;	1072	//const char *extra = desc++; // not yet used
940		1073
941	desc = strchr (desc, ']');	1074	desc = strchr (desc, ']');
942		1075
943	if (!desc)	1076	if (!desc)
944	{	1077	{
…		…
983	}	1116	}
984		1117
985	return true;	1118	return true;
986	}	1119	}
987		1120
988	void	1121	bool
989	rxvt_fontset::populate (const char *desc)	1122	rxvt_fontset::populate (const char *desc)
990	{	1123	{
991	clear ();	1124	clear ();
992		1125
993	fonts.push_back (new_font (0, CS_UNICODE));	1126	fonts.push_back (new_font (0, CS_UNICODE));
…		…
997		1130
998	if (!base_id)	1131	if (!base_id)
999	base_id = 1;	1132	base_id = 1;
1000		1133
1001	// we currently need a base-font, no matter what	1134	// we currently need a base-font, no matter what
1002	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1135	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1003	{	1136	{
		1137	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1004	add_fonts ("fixed");	1138	add_fonts ("fixed");
1005	base_id = fonts.size () - 1;	1139	base_id = fonts.size () - 1;
1006	}	1140	}
1007		1141
1008	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1142	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1009	{	1143	return false;
1010	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1011	exit (1);
1012	}
1013		1144
1014	base_prop = fonts[base_id]->properties ();	1145	base_prop = fonts[base_id]->properties ();
		1146
		1147	return true;
1015	}	1148	}
1016		1149
1017	int	1150	int
1018	rxvt_fontset::find_font (uint32_t unicode)	1151	rxvt_fontset::find_font (unicode_t unicode)
1019	{	1152	{
1020	for (int i = 0; i < fonts.size (); i++)	1153	for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
		1154	i < fonts.size ();
		1155	i++)
1021	{	1156	{
1022	rxvt_font *f = fonts[i];	1157	rxvt_font *f = fonts[i];
1023		1158
1024	if (!f->loaded)	1159	if (!f->loaded)
1025	{	1160	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs. Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs.
Revision 1.48 by pcg, Tue Mar 16 11:07:44 2004 UTC