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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.5 by pcg, Thu Dec 4 00:43:26 2003 UTC vs. Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.5 by pcg, Thu Dec 4 00:43:26 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC