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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs. Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC