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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs. Revision 1.31 by pcg, Thu Mar 4 00:40:06 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.31 by pcg, Thu Mar 4 00:40:06 2004 UTC