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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.41 by pcg, Mon Mar 15 01:27:46 2004 UTC

…		…
1	/---------------------------------C----------------------------------;	1	/---------------------------------C----------------------------------;
2	* File: defaultfont.C	2	* File: defaultfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003 Marc Lehmann rxvt@plan9.de>	4	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5	* - original version.	5	* - original version.
6	*	6	*
7	* This program is free software; you can redistribute it and/or modify	7	* This program is free software; you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by	8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; either version 2 of the License, or	9	* the Free Software Foundation; either version 2 of the License, or
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
29	#define DRAWABLE r->TermWin.vt
30	#define GC r->TermWin.gc	29	#define GC r->TermWin.gc
31		30
32	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
33	codeset cs;	32	codeset cs;
34	const char *name;	33	const char *name;
…		…
59		58
60	// japanese	59	// japanese
61	#if ENCODING_JP \|\| ENCODING_JP_EXT	60	#if ENCODING_JP \|\| ENCODING_JP_EXT
62	# if XFT	61	# if XFT
63	// prefer xft for complex scripts	62	// prefer xft for complex scripts
64	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65	# endif	64	# endif
66	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
67	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	66	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
68	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
69	#endif	68	#endif
70		69
71	#if ENCODING_CN \|\| ENCODING_CN_EXT	70	#if ENCODING_CN \|\| ENCODING_CN_EXT
72	# if XFT	71	# if XFT
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	76	# endif
		77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
		80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "----r-------c--cns11643.1992-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "----r-------c--cns11643.1992-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "----r-------c--cns11643.1992-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "----r-------c--cns11643.1992-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "----r-------c--cns11643.1992-5" },	85	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "----r-------c--cns11643.1992-6" },	86	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "----r-------c--cns11643.1992-7" },	87	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "----r-------c--cns11643.1992-f" },	88	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	89	#endif
87		90
88	#if XFT	91	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	92	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	93	{ CS_UNICODE, "xft:Arial Unicode MS" },
91	#endif	94	#endif
92	{ 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" },
93	{ CS_UNICODE, "----r-------m--iso10646-1" },	99	{ CS_UNICODE, "----r-------m--iso10646-1" },
94	{ CS_UNICODE, "----r-------m--iso10646-1" },	100
95	{ CS_UNICODE, "----r-------m--iso10646-1" },	101	#if UNICODE_3 && XFT
		102	{ CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
		103	#endif
96		104
97	{ CS_UNKNOWN, 0 }	105	{ CS_UNKNOWN, 0 }
98	};	106	};
99		107
100	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
101		109
		110	#if XFT
		111	rxvt_drawable::~rxvt_drawable ()
		112	{
		113	if (xftdrawable)
		114	XftDrawDestroy (xftdrawable);
		115	}
		116
		117	rxvt_drawable::operator XftDraw *()
		118	{
		119	if (!xftdrawable)
		120	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		121
		122	return xftdrawable;
		123	}
		124	#endif
		125
		126	/////////////////////////////////////////////////////////////////////////////
		127
102	static void *enc_buf;	128	static void *enc_buf;
103	static uint32_t enc_len;	129	static uint32_t enc_len;
104		130
105	static inline void *	131	static inline void *
106	get_enc_buf (int len)	132	get_enc_buf (uint32_t len)
107	{	133	{
108	if (len > enc_len)	134	if (len > enc_len)
109	{	135	{
110	free (enc_buf);	136	free (enc_buf);
111	enc_buf = malloc (len);	137	enc_buf = malloc (len);
…		…
113		139
114	return enc_buf;	140	return enc_buf;
115	}	141	}
116		142
117	static const char *	143	static const char *
118	enc_char (const text_t *text, int len, codeset cs, bool &zero)	144	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
119	{	145	{
120	uint8_t buf = (uint8_t )get_enc_buf (len);	146	uint8_t buf = (uint8_t )get_enc_buf (len);
121		147
122	while (len--)	148	while (len--)
123	{	149	{
…		…
134		160
135	return (const char *)enc_buf;	161	return (const char *)enc_buf;
136	}	162	}
137		163
138	static const XChar2b *	164	static const XChar2b *
139	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	165	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
140	{	166	{
141	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	167	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
142		168
143	while (len--)	169	while (len--)
144	{	170	{
…		…
159	}	185	}
160		186
161	/////////////////////////////////////////////////////////////////////////////	187	/////////////////////////////////////////////////////////////////////////////
162		188
163	void	189	void
164	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	190	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
165	{	191	{
166	if (color == Color_bg)	192	if (color == Color_bg)
167	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	193	XClearArea (d.display->display, d, x, y, w, h, FALSE);
168	else if (color >= 0)	194	else if (color >= 0)
169	{	195	{
		196	#if XFT
		197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		198	#else
170	XSetForeground (DISPLAY, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, GC, r->PixColors[color]);
171	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		201	#endif
172	}	202	}
173	}	203	}
174		204
175	static const char *linedraw_cmds[128] = {	205	static const char *linedraw_cmds[128] = {
176	"1hH", "2hH", "1vV", "2vV",	206	"1hH", "2hH", "1vV", "2vV",
…		…
226	struct rxvt_font_default : rxvt_font {	256	struct rxvt_font_default : rxvt_font {
227	rxvt_fontprop properties ()	257	rxvt_fontprop properties ()
228	{	258	{
229	rxvt_fontprop p;	259	rxvt_fontprop p;
230		260
231	p.height = 1;	261	p.width = p.height = 1;
232	p.weight = rxvt_fontprop::medium;	262	p.weight = rxvt_fontprop::medium;
233	p.slant = rxvt_fontprop::roman;	263	p.slant = rxvt_fontprop::roman;
234		264
235	return p;	265	return p;
236	}	266	}
…		…
238	bool load (const rxvt_fontprop &prop)	268	bool load (const rxvt_fontprop &prop)
239	{	269	{
240	width = 1; height = 1;	270	width = 1; height = 1;
241	ascent = 1; descent = 0;	271	ascent = 1; descent = 0;
242		272
		273	set_name ("built-in pseudofont");
		274
243	return true;	275	return true;
244	}	276	}
245		277
246	bool has_codepoint (uint32_t unicode)	278	bool has_codepoint (unicode_t unicode)
247	{	279	{
248	if (unicode <= 0x001f)	280	if (unicode <= 0x001f)
249	return true;	281	return true;
		282
250	if (unicode >= 0x0080 && unicode <= 0x009f)	283	if (unicode >= 0x0080 && unicode <= 0x009f)
251	return true;	284	return true;
252		285
253	if (unicode >= 0x2500 && unicode <= 0x257f	286	if (unicode >= 0x2500 && unicode <= 0x257f
254	&& linedraw_cmds[unicode - 0x2500])	287	&& linedraw_cmds[unicode - 0x2500])
		288	return true;
		289
		290	if (IS_COMPOSE (unicode))
255	return true;	291	return true;
256		292
257	switch (unicode)	293	switch (unicode)
258	{	294	{
259	case ZERO_WIDTH_CHAR:	295	case ZERO_WIDTH_CHAR:
…		…
261	}	297	}
262		298
263	return false;	299	return false;
264	}	300	}
265		301
266	void draw (int x, int y,	302	void draw (rxvt_drawable &d, int x, int y,
267	const text_t *text, int len,	303	const text_t *text, int len,
268	int fg, int bg);	304	int fg, int bg);
269	};	305	};
270		306
271	void	307	void
272	rxvt_font_default::draw (int x, int y,	308	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
273	const text_t *text, int len,	309	const text_t *text, int len,
274	int fg, int bg)	310	int fg, int bg)
275	{	311	{
276	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	312	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
277		313
278	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	314	XSetForeground (d.display->display, GC, r->PixColors[fg]);
279		315
280	while (len--)	316	while (len--)
281	{	317	{
		318	#if ENABLE_COMBINING
		319	compose_char *cc;
		320	#endif
282	text_t t = *text++;	321	text_t t = *text++;
283		322
		323	// is it in our linedrawing table?
284	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	324	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
285	{	325	{
286	const char *p = linedraw_cmds[t - 0x2500];	326	const char *p = linedraw_cmds[t - 0x2500];
287		327
288	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	328	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
289	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	329	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
290		330
291	XGCValues gcv;	331	XGCValues gcv;
292		332
293	while (*p)	333	while (*p)
294	{	334	{
295	switch (*p++)	335	switch (*p++)
296	{	336	{
297	case '1':	337	case '1':
298	gcv.line_width = 0;	338	gcv.line_width = 0;
299	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	339	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
300	break;	340	break;
301		341
302	case '2':	342	case '2':
303	gcv.line_width = 2;	343	gcv.line_width = 2;
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	344	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
305	break;	345	break;
306		346
307	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	347	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
308	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	348	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
309	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	349	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
310	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	350	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
311	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;	351	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
312	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;	352	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
313	}	353	}
314	}	354	}
315		355
316	gcv.line_width = 0;	356	gcv.line_width = 0;
317	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	357	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		358	}
		359	#if ENABLE_COMBINING
		360	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
318	}	361	{
		362	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		363	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		364	if (cc->c2 != NOCHAR)
		365	{
		366	// prefer font of first character, for no good reasons
		367	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		368	? f1
		369	: (*fs)[fs->find_font (cc->c2)];
		370
		371	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		372	}
		373	}
		374	#endif
319	else	375	else
320	switch (*text++)	376	switch (t)
321	{	377	{
322	case NOCHAR:
323	case ZERO_WIDTH_CHAR:	378	case ZERO_WIDTH_CHAR:
324	break;	379	break;
325	default:	380	default:
326	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	381	int w = 0;
		382	while (len > 0 && *text == NOCHAR)
		383	{
		384	++text;
		385	--len;
		386	w += r->TermWin.fwidth;
		387	}
		388
		389	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		390	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		391	x += w;
327	}	392	}
328		393
329	x += r->TermWin.fwidth;	394	x += r->TermWin.fwidth;
330	}	395	}
331	}	396	}
…		…
336	rxvt_font_x11 () { f = 0; }	401	rxvt_font_x11 () { f = 0; }
337		402
338	void clear ();	403	void clear ();
339		404
340	rxvt_fontprop properties ();	405	rxvt_fontprop properties ();
341	rxvt_fontprop properties (XFontStruct *f);
342		406
343	bool load (const rxvt_fontprop &prop);	407	bool load (const rxvt_fontprop &prop);
344		408
345	bool has_codepoint (uint32_t unicode);	409	bool has_codepoint (unicode_t unicode);
346		410
347	void draw (int x, int y,	411	void draw (rxvt_drawable &d, int x, int y,
348	const text_t *text, int len,	412	const text_t *text, int len,
349	int fg, int bg);	413	int fg, int bg);
350		414
351	XFontStruct *f;	415	XFontStruct *f;
352	codeset cs;	416	codeset cs;
353	bool enc2b, encm;	417	bool enc2b, encm;
354		418
355	const char get_property (XFontStruct f, const char property, const char repl) const;	419	const char get_property (XFontStruct f, const char property, const char repl) const;
		420	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		421	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		422	bool set_properties (rxvt_fontprop &p, const char *name);
356	};	423	};
357		424
358	const char *	425	const char *
359	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	426	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
360	{	427	{
…		…
367	}	434	}
368		435
369	rxvt_fontprop	436	rxvt_fontprop
370	rxvt_font_x11::properties ()	437	rxvt_font_x11::properties ()
371	{	438	{
372	return properties (f);
373	}
374
375	rxvt_fontprop
376	rxvt_font_x11::properties (XFontStruct *f)
377	{
378	rxvt_fontprop p;	439	rxvt_fontprop p;
		440	set_properties (p, f);
		441	return p;
		442	}
379		443
		444	bool
		445	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		446	{
		447	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		448	p.height = height;
		449	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		450	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		451
		452	return true;
		453	}
		454
		455	bool
		456	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		457	{
380	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	458	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381	const char *slant = get_property (f, "SLANT", "r");	459	const char *slant = get_property (f, "SLANT", "r");
382		460
383	p.height = height;	461	unsigned long height;
384	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	462	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
385	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	463	return false;
386		464
387	return p;	465	unsigned long avgwidth;
		466	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		467	avgwidth = 0;
		468
		469	return set_properties (p, height, weight, slant, avgwidth);
		470	}
		471
		472	bool
		473	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		474	{
		475	int slashes = 0;
		476	const char *comp[13];
		477
		478	for (const char c = name; c; c++)
		479	if (*c == '-')
		480	{
		481	comp[slashes++] = c + 1;
		482	if (slashes >= 13)
		483	break;
		484	}
		485
		486	/* can we short-circuit the costly XLoadQueryFont? */
		487	if (slashes >= 13
		488	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		489	&& (comp[11] >= '0' && comp[11] <= '9'))
		490	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		491
		492	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		493
		494	if (f)
		495	{
		496	// the font should really exist now. if not, we have a problem
		497	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		498	// in that case, just return garbage.
		499	bool ret = set_properties (p, f);
		500	XFreeFont (DISPLAY, f);
		501	return ret;
		502	}
		503	else
		504	return false;
		505	}
		506
		507	// fix the size of scalable fonts
		508	static void
		509	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		510	{
		511	int slashes = 0;
		512	const char *size;
		513
		514	for (const char c = name; c; c++)
		515	if (*c == '-')
		516	{
		517	if (slashes == 6)
		518	size = c + 1;
		519
		520	if (++slashes >= 13)
		521	break;
		522	}
		523
		524	if (slashes >= 13 && size[0] == '0')
		525	{
		526	strncpy (buf, name, size - name);
		527	buf += size - name;
		528	buf += sprintf (buf, "%d", prop.height);
		529	strcpy (buf, size + 1);
		530	}
		531	else
		532	strcpy (buf, name);
388	}	533	}
389		534
390	bool	535	bool
391	rxvt_font_x11::load (const rxvt_fontprop &prop)	536	rxvt_font_x11::load (const rxvt_fontprop &prop)
392	{	537	{
393	clear ();	538	clear ();
394		539
395	char **list;	540	char **list;
396	int count;	541	int count;
397	XFontStruct *info;
398	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	542	list = XListFonts (DISPLAY, name, 512, &count);
		543	set_name (0);
399		544
400	if (!list)	545	if (!list)
401	return false;	546	return false;
402		547
403	int bestdiff = 0x7fffffff;	548	int bestdiff = 0x7fffffff;
404	XFontStruct *best = 0;
405	for (int i = 0; i < count; i++)	549	for (int i = 0; i < count; i++)
406	{	550	{
407	XFontStruct *f = info + i;	551	rxvt_fontprop p;
		552	char fname[1024];
		553	fix_scalable (fname, list[i], prop);
408		554
		555	if (!set_properties (p, fname))
		556	continue;
		557
409	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	558	if (p.height > prop.height) // weed out too large fonts
410	{	559	continue;
411	rxvt_fontprop p = properties (f);	560
412	int diff = (prop.height - f->ascent + f->descent) * 32	561	int diff = (prop.height - p.height) * 32
413	+ abs (prop.weight - p.weight)	562	+ abs (prop.weight - p.weight)
414	+ abs (prop.slant - p.slant );	563	+ abs (prop.slant - p.slant );
415		564
416	if (!best // compare against best found so far	565	if (!name // compare against best found so far
417	\|\| diff < bestdiff)	566	\|\| diff < bestdiff)
418	{	567	{
419	best = f;	568	set_name (strdup (fname));
420	bestdiff = diff;	569	bestdiff = diff;
421	}	570	}
422	}
423	}	571	}
424		572
425	set_name (strdup (list[best - info]));	573	XFreeFontNames (list);
426		574
427	XFreeFontInfo (list, info, count);	575	if (!name)
		576	return false;
428		577
429	f = XLoadQueryFont (DISPLAY, name);	578	f = XLoadQueryFont (DISPLAY, name);
430		579
431	if (!f)	580	if (!f)
432	return false;	581	return false;
433
434	unsigned long value;
435		582
436	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	583	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	584	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438		585
439	if (registry && encoding)	586	if (registry && encoding)
…		…
514	f = 0;	661	f = 0;
515	}	662	}
516	}	663	}
517		664
518	bool	665	bool
519	rxvt_font_x11::has_codepoint (uint32_t unicode)	666	rxvt_font_x11::has_codepoint (unicode_t unicode)
520	{	667	{
521	uint32_t ch = FROM_UNICODE (cs, unicode);	668	uint32_t ch = FROM_UNICODE (cs, unicode);
522		669
523	if (ch == NOCHAR)	670	if (ch == NOCHAR)
524	return false;	671	return false;
…		…
526	/* check wether the character exists in _this_ font. horrible. */	673	/* check wether the character exists in _this_ font. horrible. */
527	XCharStruct *xcs;	674	XCharStruct *xcs;
528		675
529	if (encm)	676	if (encm)
530	{	677	{
531	int byte1 = ch >> 8;	678	unsigned char byte1 = ch >> 8;
532	int byte2 = ch & 255;	679	unsigned char byte2 = ch & 255;
533		680
534	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	681	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
535	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	682	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
536	return false;	683	return false;
537		684
…		…
560		707
561	return true;	708	return true;
562	}	709	}
563		710
564	void	711	void
565	rxvt_font_x11::draw (int x, int y,	712	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
566	const text_t *text, int len,	713	const text_t *text, int len,
567	int fg, int bg)	714	int fg, int bg)
568	{	715	{
569	// this looks like a mess /.	716	// this looks like a mess /.
570	// and it is a mess /.	717	// and it is a mess /.
…		…
586	{	733	{
587	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	734	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
588		735
589	if (bg == Color_bg && !slow)	736	if (bg == Color_bg && !slow)
590	{	737	{
591	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	738	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
592	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	739	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
593	}	740	}
594	else	741	else
595	{	742	{
596	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	743	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
597		744
598	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	745	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
599		746
600	if (slow)	747	if (slow)
601	{	748	{
602	do	749	do
603	{	750	{
604	if (xc->byte1 \|\| xc->byte2)	751	if (xc->byte1 \|\| xc->byte2)
605	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	752	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
606		753
607	x += r->TermWin.fwidth;	754	x += r->TermWin.fwidth;
608	xc++; len--;	755	xc++; len--;
609	}	756	}
610	while (len);	757	while (len);
611	}	758	}
612	else	759	else
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	760	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
614	}	761	}
615	}	762	}
616	else	763	else
617	{	764	{
618	const char *xc = enc_char (text, len, cs, slow);	765	const char *xc = enc_char (text, len, cs, slow);
619		766
620	if (bg == Color_bg && !slow)	767	if (bg == Color_bg && !slow)
621	{	768	{
622	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	769	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
623	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	770	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
624	}	771	}
625	else	772	else
626	{	773	{
627	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	774	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
628		775
629	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	776	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
630		777
631	if (slow)	778	if (slow)
632	{	779	{
633	do	780	do
634	{	781	{
635	if (*xc)	782	if (*xc)
636	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	783	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
637		784
638	x += r->TermWin.fwidth;	785	x += r->TermWin.fwidth;
639	xc++; len--;	786	xc++; len--;
640	}	787	}
641	while (len);	788	while (len);
642	}	789	}
643	else	790	else
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	791	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
645	}	792	}
646	}	793	}
647	}	794	}
648		795
649	/////////////////////////////////////////////////////////////////////////////	796	/////////////////////////////////////////////////////////////////////////////
…		…
654	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	801	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655	#define SWATHBITS 8	802	#define SWATHBITS 8
656	#endif	803	#endif
657		804
658	struct rxvt_font_xft : rxvt_font {	805	struct rxvt_font_xft : rxvt_font {
659	#if 0
660	enum {
661	SWATHCOUNT = 1 << (21 - UNIBITS),
662	SWATHSIZE = 1 << (SWATHBITS - 5)
663	};
664	typedef uint32_t swath[SWATHSIZE];
665
666	swath *cvr[SWATHCOUNT];
667	#endif
668
669	#if 0
670	void gen_coverage_swath (unsigned int page);
671
672	bool has_char (uint32_t ch)
673	{
674	unsigned int page = ch >> SWATHBITS;
675	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
676
677	if (page >= SWATHCOUNT)
678	return false;
679
680	if (!cvr[page]) gen_coverage_swath (page);
681
682	return cvr[page][idx >> 5] & (1 << (idx & 31));
683	}
684	#endif
685	rxvt_font_xft () { f = 0; d = 0; }	806	rxvt_font_xft () { f = 0; }
686		807
687	void clear ();	808	void clear ();
688		809
689	rxvt_fontprop properties ();	810	rxvt_fontprop properties ();
690		811
691	bool load (const rxvt_fontprop &prop);	812	bool load (const rxvt_fontprop &prop);
692		813
693	void draw (int x, int y,	814	void draw (rxvt_drawable &d, int x, int y,
694	const text_t *text, int len,	815	const text_t *text, int len,
695	int fg, int bg);	816	int fg, int bg);
696		817
697	bool has_codepoint (uint32_t unicode);	818	bool has_codepoint (unicode_t unicode);
698		819
699	protected:	820	protected:
700	XftFont *f;	821	XftFont *f;
701	XftDraw *d;
702
703	#if 0
704	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
705	void set_swath (uint32_t ch)
706	{
707	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
708	}
709	#endif
710	};	822	};
711		823
712	void	824	void
713	rxvt_font_xft::clear ()	825	rxvt_font_xft::clear ()
714	{	826	{
715	if (f)	827	if (f)
716	{	828	{
717	XftFontClose (DISPLAY, f);	829	XftFontClose (DISPLAY, f);
718	f = 0;	830	f = 0;
719	}	831	}
720
721	if (d)
722	{
723	XftDrawDestroy (d);
724	d = 0;
725	}
726
727	#if 0
728	for (int i = 0; i < SWATHCOUNT; i++)
729	delete cvr[i];
730	#endif
731	}	832	}
732		833
733	rxvt_fontprop	834	rxvt_fontprop
734	rxvt_font_xft::properties ()	835	rxvt_font_xft::properties ()
735	{	836	{
736	rxvt_fontprop p;	837	rxvt_fontprop p;
737		838
738	FT_Face face = XftLockFace (f);	839	FT_Face face = XftLockFace (f);
739		840
740	p.height = height;	841	p.width = width; p.height = height;
741	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	842	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
742	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;	843	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743		844
744	XftUnlockFace (f);	845	XftUnlockFace (f);
745		846
…		…
766	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	867	if (FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
767	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	868	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768		869
769	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	870	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770	FcPatternAddInteger (p, FC_SLANT, prop.slant);	871	FcPatternAddInteger (p, FC_SLANT, prop.slant);
		872
		873	#if 0 // clipping unfortunately destroys our precious double-width-characters
		874	// clip width, we can't do better, or can we?
		875	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		876	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		877	#endif
771		878
772	//FcPatternAddBool (p, FC_MINSPACE, 1);	879	//FcPatternAddBool (p, FC_MINSPACE, 1);
773		880
774	XftResult result;	881	XftResult result;
775	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	882	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
…		…
828	XftUnlockFace (f);	935	XftUnlockFace (f);
829		936
830	return true;	937	return true;
831	}	938	}
832		939
833	#if 0
834	void rxvt_font::gen_coverage_swath (unsigned int page)
835	{
836	cvr[page] = new swath;
837
838	for (int i = 0; i < SWATHSIZE; i++)
839	cvr[page][i] = 0;
840
841	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
842	}
843	#endif
844
845	bool	940	bool
846	rxvt_font_xft::has_codepoint (uint32_t unicode)	941	rxvt_font_xft::has_codepoint (unicode_t unicode)
847	{	942	{
848	return XftCharExists (DISPLAY, f, unicode);	943	return XftCharExists (DISPLAY, f, unicode);
849	}	944	}
850		945
851	void	946	void
852	rxvt_font_xft::draw (int x, int y,	947	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
853	const text_t *text, int len,	948	const text_t *text, int len,
854	int fg, int bg)	949	int fg, int bg)
855	{	950	{
856	if (!d)
857	{
858	dR;
859	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
860	}
861
862	if (bg >= 0 && bg != Color_bg)
863	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
864	else
865	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	951	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
866		952
867	if (!slow && width == r->TermWin.fwidth)	953	if (!slow && width == r->TermWin.fwidth && 0)
868	{	954	{
869	if (sizeof (text_t) == sizeof (FcChar16))	955	if (sizeof (text_t) == sizeof (FcChar16))
870	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	956	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
871	else	957	else
872	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	958	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
875	{	961	{
876	while (len)	962	while (len)
877	{	963	{
878	if (text != NOCHAR && text != ' ')	964	if (text != NOCHAR && text != ' ')
879	{	965	{
		966	int fwidth = r->TermWin.fwidth;
		967	if (len >= 2 && text[1] == NOCHAR)
		968	fwidth *= 2;
		969
		970	XGlyphInfo extents;
880	if (sizeof (text_t) == sizeof (FcChar16))	971	if (sizeof (text_t) == sizeof (FcChar16))
881	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	972	{
		973	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		974	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		975	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		976	}
882	else	977	else
883	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	978	{
		979	XGlyphInfo extents;
		980	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		981	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		982	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		983	}
884	}	984	}
885		985
886	x += r->TermWin.fwidth;	986	x += r->TermWin.fwidth;
887	text++;	987	text++;
888	len--;	988	len--;
…		…
892	#endif	992	#endif
893		993
894	/////////////////////////////////////////////////////////////////////////////	994	/////////////////////////////////////////////////////////////////////////////
895		995
896	rxvt_fontset::rxvt_fontset (rxvt_t r)	996	rxvt_fontset::rxvt_fontset (rxvt_t r)
897	#ifdef EXPLICIT_CONTEXT
898	: r(r)	997	: r (r)
899	#endif
900	{	998	{
901	clear ();	999	clear ();
902	}	1000	}
903		1001
904	rxvt_fontset::~rxvt_fontset ()	1002	rxvt_fontset::~rxvt_fontset ()
…		…
907	}	1005	}
908		1006
909	void	1007	void
910	rxvt_fontset::clear ()	1008	rxvt_fontset::clear ()
911	{	1009	{
912	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1010	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
913	FONT_UNREF (*i);	1011	FONT_UNREF (*i);
914		1012
915	fonts.clear ();	1013	fonts.clear ();
916	base_id = 0;	1014	base_id = 0;
917	base_prop.height = 0x7fffffff;	1015	base_prop.height = 0x7fffffff;
…		…
944	f = new rxvt_font_x11;	1042	f = new rxvt_font_x11;
945	}	1043	}
946	else	1044	else
947	f = new rxvt_font_x11;	1045	f = new rxvt_font_x11;
948		1046
		1047	f->fs = this;
949	f->set_term (r);	1048	f->set_term (r);
950	f->set_name (strdup (name));	1049	f->set_name (strdup (name));
951		1050
952	f->cs = cs;	1051	f->cs = cs;
953	f->loaded = false;	1052	f->loaded = false;
…		…
971		1070
972	if (*desc == '[')	1071	if (*desc == '[')
973	{	1072	{
974	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1073	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
975		1074
976	const char *extra = desc++;	1075	//const char *extra = desc++; // not yet used
977		1076
978	desc = strchr (desc, ']');	1077	desc = strchr (desc, ']');
979		1078
980	if (!desc)	1079	if (!desc)
981	{	1080	{
…		…
1020	}	1119	}
1021		1120
1022	return true;	1121	return true;
1023	}	1122	}
1024		1123
1025	void	1124	bool
1026	rxvt_fontset::populate (const char *desc)	1125	rxvt_fontset::populate (const char *desc)
1027	{	1126	{
1028	clear ();	1127	clear ();
1029		1128
1030	fonts.push_back (new_font (0, CS_UNICODE));	1129	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1034		1133
1035	if (!base_id)	1134	if (!base_id)
1036	base_id = 1;	1135	base_id = 1;
1037		1136
1038	// we currently need a base-font, no matter what	1137	// we currently need a base-font, no matter what
1039	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1138	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1040	{	1139	{
		1140	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1041	add_fonts ("fixed");	1141	add_fonts ("fixed");
1042	base_id = fonts.size () - 1;	1142	base_id = fonts.size () - 1;
1043	}	1143	}
1044		1144
1045	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1145	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1046	{	1146	return false;
1047	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1048	exit (1);
1049	}
1050		1147
1051	base_prop = fonts[base_id]->properties ();	1148	base_prop = fonts[base_id]->properties ();
		1149
		1150	return true;
1052	}	1151	}
1053		1152
1054	int	1153	int
1055	rxvt_fontset::find_font (uint32_t unicode)	1154	rxvt_fontset::find_font (unicode_t unicode)
1056	{	1155	{
1057	for (int i = 0; i < fonts.size (); i++)	1156	for (unsigned int i = 0; i < fonts.size (); i++)
1058	{	1157	{
1059	rxvt_font *f = fonts[i];	1158	rxvt_font *f = fonts[i];
1060		1159
1061	if (!f->loaded)	1160	if (!f->loaded)
1062	{	1161	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs. Revision 1.41 by pcg, Mon Mar 15 01:27:46 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.8 by pcg, Thu Dec 18 04:27:36 2003 UTC vs.
Revision 1.41 by pcg, Mon Mar 15 01:27:46 2004 UTC