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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.3 by pcg, Thu Nov 27 20:09:00 2003 UTC vs. Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.3 by pcg, Thu Nov 27 20:09:00 2003 UTC vs.
Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC