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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs. Revision 1.24 by pcg, Tue Feb 24 00:44:23 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.6 by pcg, Wed Dec 17 22:29:03 2003 UTC vs.
Revision 1.24 by pcg, Tue Feb 24 00:44:23 2004 UTC