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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 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_1983_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	}
…		…
245		275
246	bool has_codepoint (uint32_t unicode)	276	bool has_codepoint (uint32_t unicode)
247	{	277	{
248	if (unicode <= 0x001f)	278	if (unicode <= 0x001f)
249	return true;	279	return true;
		280
250	if (unicode >= 0x0080 && unicode <= 0x009f)	281	if (unicode >= 0x0080 && unicode <= 0x009f)
251	return true;	282	return true;
252		283
253	if (unicode >= 0x2500 && unicode <= 0x257f	284	if (unicode >= 0x2500 && unicode <= 0x257f
254	&& linedraw_cmds[unicode - 0x2500])	285	&& linedraw_cmds[unicode - 0x2500])
		286	return true;
		287
		288	if (IS_COMPOSE (unicode))
255	return true;	289	return true;
256		290
257	switch (unicode)	291	switch (unicode)
258	{	292	{
259	case ZERO_WIDTH_CHAR:	293	case ZERO_WIDTH_CHAR:
…		…
261	}	295	}
262		296
263	return false;	297	return false;
264	}	298	}
265		299
266	void draw (int x, int y,	300	void draw (rxvt_drawable &d, int x, int y,
267	const text_t *text, int len,	301	const text_t *text, int len,
268	int fg, int bg);	302	int fg, int bg);
269	};	303	};
270		304
271	void	305	void
272	rxvt_font_default::draw (int x, int y,	306	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
273	const text_t *text, int len,	307	const text_t *text, int len,
274	int fg, int bg)	308	int fg, int bg)
275	{	309	{
276	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	310	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
277		311
278	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	312	XSetForeground (d.display->display, GC, r->PixColors[fg]);
279		313
280	while (len--)	314	while (len--)
281	{	315	{
		316	compose_char *cc;
282	text_t t = *text++;	317	text_t t = *text++;
283		318
		319	// is it in our linedrawing table?
284	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	320	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
285	{	321	{
286	const char *p = linedraw_cmds[t - 0x2500];	322	const char *p = linedraw_cmds[t - 0x2500];
287		323
288	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	324	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;	325	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
290		326
291	XGCValues gcv;	327	XGCValues gcv;
292		328
293	while (*p)	329	while (*p)
294	{	330	{
295	switch (*p++)	331	switch (*p++)
296	{	332	{
297	case '1':	333	case '1':
298	gcv.line_width = 0;	334	gcv.line_width = 0;
299	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	335	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
300	break;	336	break;
301		337
302	case '2':	338	case '2':
303	gcv.line_width = 2;	339	gcv.line_width = 2;
304	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	340	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
305	break;	341	break;
306		342
307	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	343	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;	344	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;	345	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;	346	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;	347	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;	348	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
313	}	349	}
314	}	350	}
315		351
316	gcv.line_width = 0;	352	gcv.line_width = 0;
317	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	353	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		354	}
		355	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
		356	{
		357	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		358	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		359	if (cc->c2 != NOCHAR)
		360	{
		361	// prefer font of first character, for no good reasons
		362	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		363	? f1
		364	: (*fs)[fs->find_font (cc->c2)];
		365
		366	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		367	}
318	}	368	}
319	else	369	else
320	switch (*text++)	370	switch (t)
321	{	371	{
322	case NOCHAR:
323	case ZERO_WIDTH_CHAR:	372	case ZERO_WIDTH_CHAR:
324	break;	373	break;
325	default:	374	default:
326	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	375	int w = 0;
		376	while (len > 0 && *text == NOCHAR)
		377	{
		378	++text;
		379	--len;
		380	w += r->TermWin.fwidth;
		381	}
		382
		383	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		384	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		385	x += w;
327	}	386	}
328		387
329	x += r->TermWin.fwidth;	388	x += r->TermWin.fwidth;
330	}	389	}
331	}	390	}
…		…
336	rxvt_font_x11 () { f = 0; }	395	rxvt_font_x11 () { f = 0; }
337		396
338	void clear ();	397	void clear ();
339		398
340	rxvt_fontprop properties ();	399	rxvt_fontprop properties ();
341	rxvt_fontprop properties (XFontStruct *f);
342		400
343	bool load (const rxvt_fontprop &prop);	401	bool load (const rxvt_fontprop &prop);
344		402
345	bool has_codepoint (uint32_t unicode);	403	bool has_codepoint (uint32_t unicode);
346		404
347	void draw (int x, int y,	405	void draw (rxvt_drawable &d, int x, int y,
348	const text_t *text, int len,	406	const text_t *text, int len,
349	int fg, int bg);	407	int fg, int bg);
350		408
351	XFontStruct *f;	409	XFontStruct *f;
352	codeset cs;	410	codeset cs;
353	bool enc2b, encm;	411	bool enc2b, encm;
354		412
355	const char get_property (XFontStruct f, const char property, const char repl) const;	413	const char get_property (XFontStruct f, const char property, const char repl) const;
		414	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		415	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		416	bool set_properties (rxvt_fontprop &p, const char *name);
356	};	417	};
357		418
358	const char *	419	const char *
359	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	420	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
360	{	421	{
…		…
367	}	428	}
368		429
369	rxvt_fontprop	430	rxvt_fontprop
370	rxvt_font_x11::properties ()	431	rxvt_font_x11::properties ()
371	{	432	{
372	return properties (f);
373	}
374
375	rxvt_fontprop
376	rxvt_font_x11::properties (XFontStruct *f)
377	{
378	rxvt_fontprop p;	433	rxvt_fontprop p;
		434	set_properties (p, f);
		435	return p;
		436	}
379		437
		438	bool
		439	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		440	{
		441	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		442	p.height = height;
		443	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		444	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		445
		446	return true;
		447	}
		448
		449	bool
		450	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		451	{
380	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	452	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
381	const char *slant = get_property (f, "SLANT", "r");	453	const char *slant = get_property (f, "SLANT", "r");
382		454
383	p.height = height;	455	unsigned long height;
384	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	456	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
385	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	457	return false;
386		458
387	return p;	459	unsigned long avgwidth;
		460	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		461	avgwidth = 0;
		462
		463	return set_properties (p, height, weight, slant, avgwidth);
		464	}
		465
		466	bool
		467	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		468	{
		469	int slashes = 0;
		470	const char *comp[13];
		471
		472	for (const char c = name; c; c++)
		473	if (*c == '-')
		474	{
		475	comp[slashes++] = c + 1;
		476	if (slashes >= 13)
		477	break;
		478	}
		479
		480	/* can we short-circuit the costly XLoadQueryFont? */
		481	if (slashes >= 13
		482	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		483	&& (comp[11] >= '0' && comp[11] <= '9'))
		484	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		485
		486	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		487
		488	if (f)
		489	{
		490	// the font should really exist now. if not, we have a problem
		491	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		492	// in that case, just return garbage.
		493	bool ret = set_properties (p, f);
		494	XFreeFont (DISPLAY, f);
		495	return ret;
		496	}
		497	else
		498	return false;
		499	}
		500
		501	// fix the size of scalable fonts
		502	static void
		503	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		504	{
		505	int slashes = 0;
		506	const char *size;
		507
		508	for (const char c = name; c; c++)
		509	if (*c == '-')
		510	{
		511	if (slashes == 6)
		512	size = c + 1;
		513
		514	if (++slashes >= 13)
		515	break;
		516	}
		517
		518	if (slashes >= 13 && size[0] == '0')
		519	{
		520	strncpy (buf, name, size - name);
		521	buf += size - name;
		522	buf += sprintf (buf, "%d", prop.height);
		523	strcpy (buf, size + 1);
		524	}
		525	else
		526	strcpy (buf, name);
388	}	527	}
389		528
390	bool	529	bool
391	rxvt_font_x11::load (const rxvt_fontprop &prop)	530	rxvt_font_x11::load (const rxvt_fontprop &prop)
392	{	531	{
393	clear ();	532	clear ();
394		533
395	char **list;	534	char **list;
396	int count;	535	int count;
397	XFontStruct *info;
398	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	536	list = XListFonts (DISPLAY, name, 512, &count);
		537	set_name (0);
399		538
400	if (!list)	539	if (!list)
401	return false;	540	return false;
402		541
403	int bestdiff = 0x7fffffff;	542	int bestdiff = 0x7fffffff;
404	XFontStruct *best = 0;
405	for (int i = 0; i < count; i++)	543	for (int i = 0; i < count; i++)
406	{	544	{
407	XFontStruct *f = info + i;	545	rxvt_fontprop p;
		546	char fname[1024];
		547	fix_scalable (fname, list[i], prop);
408		548
		549	if (!set_properties (p, fname))
		550	continue;
		551
409	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	552	if (p.height > prop.height) // weed out too large fonts
410	{	553	continue;
411	rxvt_fontprop p = properties (f);	554
412	int diff = (prop.height - f->ascent + f->descent) * 32	555	int diff = (prop.height - p.height) * 32
413	+ abs (prop.weight - p.weight)	556	+ abs (prop.weight - p.weight)
414	+ abs (prop.slant - p.slant );	557	+ abs (prop.slant - p.slant );
415		558
416	if (!best // compare against best found so far	559	if (!name // compare against best found so far
417	\|\| diff < bestdiff)	560	\|\| diff < bestdiff)
418	{	561	{
419	best = f;	562	set_name (strdup (fname));
420	bestdiff = diff;	563	bestdiff = diff;
421	}	564	}
422	}
423	}	565	}
424		566
425	set_name (strdup (list[best - info]));	567	XFreeFontNames (list);
426		568
427	XFreeFontInfo (list, info, count);	569	if (!name)
		570	return false;
428		571
429	f = XLoadQueryFont (DISPLAY, name);	572	f = XLoadQueryFont (DISPLAY, name);
430		573
431	if (!f)	574	if (!f)
432	return false;	575	return false;
433
434	unsigned long value;
435		576
436	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	577	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
437	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	578	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
438		579
439	if (registry && encoding)	580	if (registry && encoding)
…		…
526	/* check wether the character exists in _this_ font. horrible. */	667	/* check wether the character exists in _this_ font. horrible. */
527	XCharStruct *xcs;	668	XCharStruct *xcs;
528		669
529	if (encm)	670	if (encm)
530	{	671	{
531	int byte1 = ch >> 8;	672	unsigned char byte1 = ch >> 8;
532	int byte2 = ch & 255;	673	unsigned char byte2 = ch & 255;
533		674
534	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	675	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
535	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	676	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
536	return false;	677	return false;
537		678
…		…
560		701
561	return true;	702	return true;
562	}	703	}
563		704
564	void	705	void
565	rxvt_font_x11::draw (int x, int y,	706	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
566	const text_t *text, int len,	707	const text_t *text, int len,
567	int fg, int bg)	708	int fg, int bg)
568	{	709	{
569	// this looks like a mess /.	710	// this looks like a mess /.
570	// and it is a mess /.	711	// and it is a mess /.
…		…
586	{	727	{
587	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	728	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
588		729
589	if (bg == Color_bg && !slow)	730	if (bg == Color_bg && !slow)
590	{	731	{
591	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	732	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
592	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	733	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
593	}	734	}
594	else	735	else
595	{	736	{
596	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	737	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
597		738
598	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	739	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
599		740
600	if (slow)	741	if (slow)
601	{	742	{
602	do	743	do
603	{	744	{
604	if (xc->byte1 \|\| xc->byte2)	745	if (xc->byte1 \|\| xc->byte2)
605	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	746	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
606		747
607	x += r->TermWin.fwidth;	748	x += r->TermWin.fwidth;
608	xc++; len--;	749	xc++; len--;
609	}	750	}
610	while (len);	751	while (len);
611	}	752	}
612	else	753	else
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	754	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
614	}	755	}
615	}	756	}
616	else	757	else
617	{	758	{
618	const char *xc = enc_char (text, len, cs, slow);	759	const char *xc = enc_char (text, len, cs, slow);
619		760
620	if (bg == Color_bg && !slow)	761	if (bg == Color_bg && !slow)
621	{	762	{
622	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	763	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
623	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	764	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
624	}	765	}
625	else	766	else
626	{	767	{
627	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	768	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
628		769
629	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	770	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
630		771
631	if (slow)	772	if (slow)
632	{	773	{
633	do	774	do
634	{	775	{
635	if (*xc)	776	if (*xc)
636	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	777	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
637		778
638	x += r->TermWin.fwidth;	779	x += r->TermWin.fwidth;
639	xc++; len--;	780	xc++; len--;
640	}	781	}
641	while (len);	782	while (len);
642	}	783	}
643	else	784	else
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	785	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
645	}	786	}
646	}	787	}
647	}	788	}
648		789
649	/////////////////////////////////////////////////////////////////////////////	790	/////////////////////////////////////////////////////////////////////////////
…		…
654	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	795	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
655	#define SWATHBITS 8	796	#define SWATHBITS 8
656	#endif	797	#endif
657		798
658	struct rxvt_font_xft : rxvt_font {	799	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; }	800	rxvt_font_xft () { f = 0; }
686		801
687	void clear ();	802	void clear ();
688		803
689	rxvt_fontprop properties ();	804	rxvt_fontprop properties ();
690		805
691	bool load (const rxvt_fontprop &prop);	806	bool load (const rxvt_fontprop &prop);
692		807
693	void draw (int x, int y,	808	void draw (rxvt_drawable &d, int x, int y,
694	const text_t *text, int len,	809	const text_t *text, int len,
695	int fg, int bg);	810	int fg, int bg);
696		811
697	bool has_codepoint (uint32_t unicode);	812	bool has_codepoint (uint32_t unicode);
698		813
699	protected:	814	protected:
700	XftFont *f;	815	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	};	816	};
711		817
712	void	818	void
713	rxvt_font_xft::clear ()	819	rxvt_font_xft::clear ()
714	{	820	{
715	if (f)	821	if (f)
716	{	822	{
717	XftFontClose (DISPLAY, f);	823	XftFontClose (DISPLAY, f);
718	f = 0;	824	f = 0;
719	}	825	}
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	}	826	}
732		827
733	rxvt_fontprop	828	rxvt_fontprop
734	rxvt_font_xft::properties ()	829	rxvt_font_xft::properties ()
735	{	830	{
736	rxvt_fontprop p;	831	rxvt_fontprop p;
737		832
738	FT_Face face = XftLockFace (f);	833	FT_Face face = XftLockFace (f);
739		834
740	p.height = height;	835	p.width = width; p.height = height;
741	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	836	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;	837	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
743		838
744	XftUnlockFace (f);	839	XftUnlockFace (f);
745		840
…		…
767	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	862	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
768		863
769	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	864	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
770	FcPatternAddInteger (p, FC_SLANT, prop.slant);	865	FcPatternAddInteger (p, FC_SLANT, prop.slant);
771		866
		867	#if 0 // clipping unfortunately destroys our precious double-width-characters
		868	// clip width, we can't do better, or can we?
		869	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		870	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		871	#endif
		872
772	//FcPatternAddBool (p, FC_MINSPACE, 1);	873	//FcPatternAddBool (p, FC_MINSPACE, 1);
773		874
774	XftResult result;	875	XftResult result;
775	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	876	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
776		877
…		…
779	if (!match)	880	if (!match)
780	return false;	881	return false;
781		882
782	f = XftFontOpenPattern (DISPLAY, match);	883	f = XftFontOpenPattern (DISPLAY, match);
783		884
784	FcPatternDestroy (match);
785
786	if (!f)	885	if (!f)
		886	{
		887	FcPatternDestroy (match);
787	return false;	888	return false;
		889	}
788		890
789	FT_Face face = XftLockFace (f);	891	FT_Face face = XftLockFace (f);
790		892
791	slow = !FT_IS_FIXED_WIDTH (face);	893	slow = !FT_IS_FIXED_WIDTH (face);
792		894
…		…
827	XftUnlockFace (f);	929	XftUnlockFace (f);
828		930
829	return true;	931	return true;
830	}	932	}
831		933
832	#if 0
833	void rxvt_font::gen_coverage_swath (unsigned int page)
834	{
835	cvr[page] = new swath;
836
837	for (int i = 0; i < SWATHSIZE; i++)
838	cvr[page][i] = 0;
839
840	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
841	}
842	#endif
843
844	bool	934	bool
845	rxvt_font_xft::has_codepoint (uint32_t unicode)	935	rxvt_font_xft::has_codepoint (uint32_t unicode)
846	{	936	{
847	return XftCharExists (DISPLAY, f, unicode);	937	return XftCharExists (DISPLAY, f, unicode);
848	}	938	}
849		939
850	void	940	void
851	rxvt_font_xft::draw (int x, int y,	941	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
852	const text_t *text, int len,	942	const text_t *text, int len,
853	int fg, int bg)	943	int fg, int bg)
854	{	944	{
855	if (!d)
856	{
857	dR;
858	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
859	}
860
861	if (bg >= 0 && bg != Color_bg)
862	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
863	else
864	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	945	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
865		946
866	if (!slow && width == r->TermWin.fwidth)	947	if (!slow && width == r->TermWin.fwidth && 0)
867	{	948	{
868	if (sizeof (text_t) == sizeof (FcChar16))	949	if (sizeof (text_t) == sizeof (FcChar16))
869	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	950	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
870	else	951	else
871	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	952	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
874	{	955	{
875	while (len)	956	while (len)
876	{	957	{
877	if (text != NOCHAR && text != ' ')	958	if (text != NOCHAR && text != ' ')
878	{	959	{
		960	int fwidth = r->TermWin.fwidth;
		961	if (len >= 2 && text[1] == NOCHAR)
		962	fwidth *= 2;
		963
		964	XGlyphInfo extents;
879	if (sizeof (text_t) == sizeof (FcChar16))	965	if (sizeof (text_t) == sizeof (FcChar16))
880	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	966	{
		967	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		968	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		969	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		970	}
881	else	971	else
882	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	972	{
		973	XGlyphInfo extents;
		974	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		975	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		976	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		977	}
883	}	978	}
884		979
885	x += r->TermWin.fwidth;	980	x += r->TermWin.fwidth;
886	text++;	981	text++;
887	len--;	982	len--;
…		…
891	#endif	986	#endif
892		987
893	/////////////////////////////////////////////////////////////////////////////	988	/////////////////////////////////////////////////////////////////////////////
894		989
895	rxvt_fontset::rxvt_fontset (rxvt_t r)	990	rxvt_fontset::rxvt_fontset (rxvt_t r)
896	#ifdef EXPLICIT_CONTEXT
897	: r(r)	991	: r (r)
898	#endif
899	{	992	{
900	clear ();	993	clear ();
901	}	994	}
902		995
903	rxvt_fontset::~rxvt_fontset ()	996	rxvt_fontset::~rxvt_fontset ()
…		…
906	}	999	}
907		1000
908	void	1001	void
909	rxvt_fontset::clear ()	1002	rxvt_fontset::clear ()
910	{	1003	{
911	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1004	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
912	FONT_UNREF (*i);	1005	FONT_UNREF (*i);
913		1006
914	fonts.clear ();	1007	fonts.clear ();
915	base_id = 0;	1008	base_id = 0;
916	base_prop.height = 0x7fffffff;	1009	base_prop.height = 0x7fffffff;
…		…
943	f = new rxvt_font_x11;	1036	f = new rxvt_font_x11;
944	}	1037	}
945	else	1038	else
946	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
947		1040
		1041	f->fs = this;
948	f->set_term (r);	1042	f->set_term (r);
949	f->set_name (strdup (name));	1043	f->set_name (strdup (name));
950		1044
951	f->cs = cs;	1045	f->cs = cs;
952	f->loaded = false;	1046	f->loaded = false;
…		…
970		1064
971	if (*desc == '[')	1065	if (*desc == '[')
972	{	1066	{
973	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1067	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
974		1068
975	const char *extra = desc++;	1069	//const char *extra = desc++; // not yet used
976		1070
977	desc = strchr (desc, ']');	1071	desc = strchr (desc, ']');
978		1072
979	if (!desc)	1073	if (!desc)
980	{	1074	{
…		…
1019	}	1113	}
1020		1114
1021	return true;	1115	return true;
1022	}	1116	}
1023		1117
1024	void	1118	bool
1025	rxvt_fontset::populate (const char *desc)	1119	rxvt_fontset::populate (const char *desc)
1026	{	1120	{
1027	clear ();	1121	clear ();
1028		1122
1029	fonts.push_back (new_font (0, CS_UNICODE));	1123	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1033		1127
1034	if (!base_id)	1128	if (!base_id)
1035	base_id = 1;	1129	base_id = 1;
1036		1130
1037	// we currently need a base-font, no matter what	1131	// we currently need a base-font, no matter what
1038	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1132	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1039	{	1133	{
		1134	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1040	add_fonts ("fixed");	1135	add_fonts ("fixed");
1041	base_id = fonts.size () - 1;	1136	base_id = fonts.size () - 1;
1042	}	1137	}
1043		1138
1044	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1139	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1045	{	1140	return false;
1046	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1047	exit (1);
1048	}
1049		1141
1050	base_prop = fonts[base_id]->properties ();	1142	base_prop = fonts[base_id]->properties ();
		1143
		1144	return true;
1051	}	1145	}
1052		1146
1053	int	1147	int
1054	rxvt_fontset::find_font (uint32_t unicode)	1148	rxvt_fontset::find_font (uint32_t unicode)
1055	{	1149	{
1056	for (int i = 0; i < fonts.size (); i++)	1150	for (unsigned int i = 0; i < fonts.size (); i++)
1057	{	1151	{
1058	rxvt_font *f = fonts[i];	1152	rxvt_font *f = fonts[i];
1059		1153
1060	if (!f->loaded)	1154	if (!f->loaded)
1061	{	1155	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs. Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC