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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs. Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.4 by pcg, Sat Nov 29 18:42:07 2003 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC