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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2008 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
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	---------------------------------------------------------------------/	20	---------------------------------------------------------------------/
21		21
22	#include "../config.h"	22	#include "../config.h"
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "rxvtlib.h"
25	#include "rxvtutil.h"	24	#include "rxvtutil.h"
26	#include "rxvtfont.h"	25	#include "rxvtfont.h"
27		26
28	#include <cstdlib>	27	#include <cstdlib>
29		28
30	#include <inttypes.h>	29	#include <inttypes.h>
		30
		31	#if XFT
		32	# include <fontconfig/fontconfig.h>
		33	#endif
31		34
32	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width	35	#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts	36	#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34		37
35	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \	38	#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36	(prop)->slant >= rxvt_fontprop::italic \	39	(prop)->slant >= rxvt_fontprop::italic \
37	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \	40	? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \	41	: ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39	))	42	))
40		43
41	const struct rxvt_fallback_font {	44	static const struct rxvt_fallback_font {
42	codeset cs;	45	codeset cs;
43	const char *name;	46	const char *name;
44	} fallback_fonts[] = {	47	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	48	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	49	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	50	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		51
49	#if ENCODING_EU	52	#if ENCODING_EU
50	// cyrillic	53	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	54	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	55	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		56
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	57	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	58	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	59	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	60	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	61	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	68	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	69	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		70
68	# if XFT	71	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	72	{ CS_KOI8_U, "xft::lang=ru" },
70		73
71	{ CS_ISO8859_5, "xft::lang=ru" },	74	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	75	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	76	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	77	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	78	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
80		83
81	// japanese	84	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	85	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	86	# if XFT
84	// prefer xft for complex scripts	87	// prefer xft for complex scripts
		88	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	89	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	90	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	91	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	92	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	93	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	94	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
156	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',	159	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ	160	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158	0x304c, 0x672c, // が本	161	0x304c, 0x672c, // が本
159	};	162	};
160		163
161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163	#define dTermDisplay Display *disp = term->xdisp	164	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	165	#define dTermGC GC gc = term->gc
165
166	/////////////////////////////////////////////////////////////////////////////
167
168	#if XFT
169	rxvt_drawable::~rxvt_drawable ()
170	{
171	if (xftdrawable)
172	XftDrawDestroy (xftdrawable);
173	}
174
175	rxvt_drawable::operator XftDraw *()
176	{
177	if (!xftdrawable)
178	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
179
180	return xftdrawable;
181	}
182	#endif
183		166
184	/////////////////////////////////////////////////////////////////////////////	167	/////////////////////////////////////////////////////////////////////////////
185		168
186	static const char *	169	static const char *
187	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	170	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
…		…
235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	218	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236	{	219	{
237	}	220	}
238		221
239	void	222	void
240	rxvt_font::set_name (char *name)	223	rxvt_font::set_name (char *name_)
241	{	224	{
242	if (this->name == name)	225	if (name == name_)
243	return;	226	return;
244		227
245	if (this->name) free (this->name); // let the compiler optimize	228	if (name) free (name); // let the compiler optimize
246	this->name = name;	229	name = name_;
247	}	230	}
248		231
249	void	232	void
250	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	233	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251	{	234	{
252	dTermDisplay;	235	dTermDisplay;
253	dTermGC;	236	dTermGC;
254		237
255	if (color == Color_bg)	238	if (color == Color_bg \|\| color == Color_transparent)
256	XClearArea (disp, d, x, y, w, h, false);	239	XClearArea (disp, d, x, y, w, h, false);
257	else if (color >= 0)	240	else if (color >= 0)
258	{	241	{
259	#if XFT	242	#if XFT
		243	Picture dst;
		244
		245	# ifdef HAVE_BG_PIXMAP
		246	if (term->bgPixmap.pixmap
		247	&& !term->pix_colors[color].is_opaque ()
		248	&& ((dst = XftDrawPicture (d))))
		249	{
		250	XClearArea (disp, d, x, y, w, h, false);
		251
		252	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		253	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		254	}
		255	else
		256	# endif
260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		258
261	#else	259	#else
262	XSetForeground (disp, gc, term->pix_colors[color]);	260	XSetForeground (disp, gc, term->pix_colors[color]);
263	XFillRectangle (disp, d, gc, x, y, w, h);	261	XFillRectangle (disp, d, gc, x, y, w, h);
264	#endif	262	#endif
265	}	263	}
266	}	264	}
267		265
268	/////////////////////////////////////////////////////////////////////////////	266	/////////////////////////////////////////////////////////////////////////////
269
270	#include "table/linedraw.h"
271		267
272	struct rxvt_font_default : rxvt_font {	268	struct rxvt_font_default : rxvt_font {
273	struct rxvt_fontset *fs;	269	struct rxvt_fontset *fs;
274		270
275	rxvt_font_default (rxvt_fontset *fs)	271	rxvt_font_default (rxvt_fontset *fs)
…		…
288	p.slant = rxvt_fontprop::roman;	284	p.slant = rxvt_fontprop::roman;
289		285
290	return p;	286	return p;
291	}	287	}
292		288
293	bool load (const rxvt_fontprop &prop)	289	bool load (const rxvt_fontprop &prop, bool force_prop)
294	{	290	{
295	width = 1; height = 1;	291	width = 1; height = 1;
296	ascent = 1; descent = 0;	292	ascent = 1; descent = 0;
297		293
298	set_name (strdup ("built-in support font"));	294	set_name (strdup ("built-in support font"));
…		…
311	return false;	307	return false;
312		308
313	if (unicode <= 0x009f)	309	if (unicode <= 0x009f)
314	return true;	310	return true;
315		311
		312	#ifdef BUILTIN_GLYPHS
316	if (unicode >= 0x2500 && unicode <= 0x259f &&	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
317	!term->option (Opt_skipBuiltinGlyphs))	314	!term->option (Opt_skipBuiltinGlyphs))
318	return true;	315	return true;
		316	#endif
319		317
320	if (IS_COMPOSE (unicode))	318	if (IS_COMPOSE (unicode))
321	return true;	319	return true;
322		320
323	switch (unicode)	321	switch (unicode)
…		…
359	;	357	;
360		358
361	int width = text - tp;	359	int width = text - tp;
362	int fwidth = term->fwidth * width;	360	int fwidth = term->fwidth * width;
363		361
		362	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
365	{	364	{
		365	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	366	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	367	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	368	uint32_t *b = a + (offs & 15);
369		369
370	int W = fwidth;	370	int W = fwidth;
…		…
408		408
409	case 1: // rectangle, possibly stippled	409	case 1: // rectangle, possibly stippled
410	if (a)	410	if (a)
411	{	411	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		413
414	gcv.fill_style = FillStippled;	414	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	416	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	417	gcv.ts_y_origin = y;
418		418
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	437	(a - 1) * 9064, (b - 1) 90*64);
438	break;	438	break;
439	}	439	}
440	}	440	}
441	}	441	}
		442	#else
		443	if (0)
		444	;
		445	#endif
442	#if ENABLE_COMBINING	446	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	448	{
445	min_it (width, 2); // we only support wcwidth up to 2	449	min_it (width, 2); // we only support wcwidth up to 2
446		450
447	text_t chrs[2];	451	text_t chrs[2];
448	chrs [1] = NOCHAR;	452	chrs [1] = NOCHAR;
449		453
450	*chrs = cc->c1;	454	*chrs = cc->c1;
451	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	455	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
452	f1->draw (d, x, y, chrs, width, fg, bg);	456	f1->draw (d, x, y, chrs, width, fg, bg);
453		457
454	if (cc->c2 != NOCHAR)	458	if (cc->c2 != NOCHAR)
455	{	459	{
456	bool careful;	460	bool careful;
457		461
458	// prefer font of first character, for no good reasons	462	// prefer font of first character, for no good reasons
459	*chrs = cc->c2;	463	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	464	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	465	? f1
462	: (*fs)[fs->find_font (cc->c2)];	466	: (*fs)[fs->find_font_idx (cc->c2)];
463		467
464	f2->draw (d, x, y, chrs, width, fg, -1);	468	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	469	}
466	}	470	}
467	#endif	471	#endif
468	else	472	else
469	switch (t)	473	switch (t)
…		…
480		484
481	x += fwidth;	485	x += fwidth;
482	}	486	}
483	}	487	}
484		488
		489	struct rxvt_font_overflow : rxvt_font {
		490	struct rxvt_fontset *fs;
		491
		492	rxvt_font_overflow (rxvt_fontset *fs)
		493	: rxvt_font ()
		494	{
		495	this->fs = fs;
		496	}
		497
		498	rxvt_fontprop properties ()
		499	{
		500	rxvt_fontprop p;
		501
		502	p.width = p.height = 1;
		503	p.ascent = rxvt_fontprop::unset;
		504	p.weight = rxvt_fontprop::medium;
		505	p.slant = rxvt_fontprop::roman;
		506
		507	return p;
		508	}
		509
		510	bool load (const rxvt_fontprop &prop, bool force_prop)
		511	{
		512	width = 1; height = 1;
		513	ascent = 1; descent = 0;
		514
		515	set_name (strdup ("built-in rendition overflow font"));
		516
		517	return true;
		518	}
		519
		520	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		521	{
		522	return false;
		523	}
		524
		525	void draw (rxvt_drawable &d, int x, int y,
		526	const text_t *text, int len,
		527	int fg, int bg)
		528	{
		529	while (len--)
		530	{
		531	int fid = fs->find_font_idx (*text);
		532	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		533	++text;
		534	x += term->fwidth;
		535	}
		536	}
		537	};
		538
485	/////////////////////////////////////////////////////////////////////////////	539	/////////////////////////////////////////////////////////////////////////////
486		540
487	struct rxvt_font_x11 : rxvt_font {	541	struct rxvt_font_x11 : rxvt_font {
488	rxvt_font_x11 () { f = 0; }	542	rxvt_font_x11 () { f = 0; }
489		543
490	void clear ();	544	void clear ();
491		545
492	rxvt_fontprop properties ();	546	rxvt_fontprop properties ();
493		547
494	bool load (const rxvt_fontprop &prop);	548	bool load (const rxvt_fontprop &prop, bool force_prop);
495		549
496	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	550	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497		551
498	void draw (rxvt_drawable &d, int x, int y,	552	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	553	const text_t *text, int len,
500	int fg, int bg);	554	int fg, int bg);
501		555
502	bool slow; // wether this is a proportional font or has other funny characteristics	556	bool slow; // whether this is a proportional font or has other funny characteristics
503	XFontStruct *f;	557	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	558	bool enc2b, encm;
506		559
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	560	char get_property (XFontStruct f, Atom property, const char *repl) const;
508	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	561	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	562	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
514	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	567	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
515	{	568	{
516	unsigned long value;	569	unsigned long value;
517		570
518	if (XGetFontProperty (f, property, &value))	571	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->xdisp, value);	572	return XGetAtomName (term->dpy, value);
520	else	573	else
521	return rxvt_strdup (repl);	574	return repl ? strdup (repl) : 0;
522	}	575	}
523		576
524	rxvt_fontprop	577	rxvt_fontprop
525	rxvt_font_x11::properties ()	578	rxvt_font_x11::properties ()
526	{	579	{
…		…
547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	600	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
548	{	601	{
549	unsigned long height;	602	unsigned long height;
550		603
551	#if 0	604	#if 0
552	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	605	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
553	return false;	606	return false;
554	#else	607	#else
555	height = f->ascent + f->descent;	608	height = f->ascent + f->descent;
556	#endif	609	#endif
557		610
…		…
608	return false;	661	return false;
609	}	662	}
610		663
611	// fix the size of scalable fonts	664	// fix the size of scalable fonts
612	static bool	665	static bool
613	replace_field (char buf, const char name, int index, const char old, const char *replace)	666	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
614	{	667	{
615	int slashes = 0;	668	int slashes = 0;
616	const char field, end;	669	const char field, end;
617		670
618	for (const char c = name; c; c++)	671	for (const char c = name; c; c++)
…		…
628	break;	681	break;
629	}	682	}
630		683
631	if (slashes >= 13 && (!old \|\| *field == old))	684	if (slashes >= 13 && (!old \|\| *field == old))
632	{	685	{
633	// TODO: check for overflow in font-name	686	size_t len = field - name;
634	strncpy (buf, name, field - name);	687	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	688	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	689	strcpy (*ptr + len, replace);
637	strcat (buf, end);	690	strcat (*ptr, end);
638		691
639	return true;	692	return true;
640	}	693	}
641	else	694	else
642	{	695	{
643	strcpy (buf, name);	696	*ptr = strdup (name);
644		697
645	return false;	698	return false;
646	}	699	}
647	}	700	}
648		701
649	bool	702	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	703	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	704	{
652	dTermDisplay;	705	dTermDisplay;
653		706
654	clear ();	707	clear ();
655		708
656	char field_str[64]; // enough for 128 bits	709	char field_str[64]; // enough for 128 bits
657		710
658	// first morph the font if required	711	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	712	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	713	{
662	char fname[1024];	714	char *fname;
663		715
664	if (name[0] != '-')	716	if (name[0] != '-')
665	{	717	{
666	f = XLoadQueryFont (disp, name);	718	f = XLoadQueryFont (disp, name);
667		719
…		…
679	f = 0;	731	f = 0;
680	}	732	}
681		733
682	if (prop.weight != rxvt_fontprop::unset)	734	if (prop.weight != rxvt_fontprop::unset)
683	{	735	{
684	replace_field (fname, name, 2, 0,	736	replace_field (&fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	737	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	738	? "medium" : "bold");
687	set_name (strdup (fname));	739	set_name (fname);
688	}	740	}
689		741
690	if (prop.slant != rxvt_fontprop::unset)	742	if (prop.slant != rxvt_fontprop::unset)
691	{	743	{
692	replace_field (fname, name, 3, 0,	744	replace_field (&fname, name, 3, 0,
693	prop.slant < rxvt_fontprop::italic	745	prop.slant < rxvt_fontprop::italic
694	? "r" : "i"); // TODO: handle "o"blique, too	746	? "r" : "i"); // TODO: handle "o"blique, too
695	set_name (strdup (fname));	747	set_name (fname);
696	}	748	}
697	}	749	}
698		750
699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	751	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700	? 0 : prop.height);	752	? 0 : prop.height);
…		…
725	font_weight *fonts = new font_weight[count];	777	font_weight *fonts = new font_weight[count];
726		778
727	for (int i = 0; i < count; i++)	779	for (int i = 0; i < count; i++)
728	{	780	{
729	rxvt_fontprop p;	781	rxvt_fontprop p;
730	char fname[1024];	782	char *fname;
731		783
732	int diff = 0;	784	int diff = 0;
733		785
734	if (replace_field (fname, list[i], 6, '0', field_str))	786	if (replace_field (&fname, list[i], 6, '0', field_str))
735	diff += 10; // slightly penalize scalable fonts	787	diff += 10; // slightly penalize scalable fonts
		788	else
		789	{
		790	free (fname);
736	else if (replace_field (fname, list[i], 11, '0', "0"))	791	if (replace_field (&fname, list[i], 11, '0', "0"))
737	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	792	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		793	}
738		794
739	if (!set_properties (p, fname))	795	if (!set_properties (p, fname))
740	continue;	796	continue;
741		797
742	if (prop.height != rxvt_fontprop::unset	798	if (prop.height != rxvt_fontprop::unset
…		…
746	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	802	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
747	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	803	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
748	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	804	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
749	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	805	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
750		806
751	fonts[i].name = strdup (fname);	807	fonts[i].name = fname;
752	fonts[i].diff = diff;	808	fonts[i].diff = diff;
753	}	809	}
754		810
755	XFreeFontNames (list);	811	XFreeFontNames (list);
756		812
…		…
788	return false;	844	return false;
789		845
790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	846	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	847	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792		848
		849	cs = CS_UNKNOWN;
		850
793	if (registry && encoding)	851	if (registry && encoding)
794	{	852	{
795	char charset[64];	853	char charset[64];
796	snprintf (charset, 64, "%s-%s", registry, encoding);	854	snprintf (charset, 64, "%s-%s", registry, encoding);
797		855
798	cs = codeset_from_name (charset);	856	cs = codeset_from_name (charset);
		857
		858	if (cs == CS_UNKNOWN)
		859	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
799	}	860	}
800	else	861
		862	free (registry);
		863	free (encoding);
		864
		865	if (cs == CS_UNKNOWN)
801	{	866	{
802	const char *charset = get_property (f, XA_FONT, 0);	867	const char *charset = get_property (f, XA_FONT, 0);
803		868
804	if (!charset)	869	if (!charset)
805	charset = name;	870	charset = name;
…		…
808	while (*charset)	873	while (*charset)
809	if (*charset++ == '-' && !--count)	874	if (*charset++ == '-' && !--count)
810	break;	875	break;
811		876
812	cs = codeset_from_name (charset);	877	cs = codeset_from_name (charset);
		878	if (cs == CS_UNKNOWN)
		879	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		880	}
		881
		882	if (cs == CS_UNKNOWN)
813	}	883	{
814		884	clear ();
815	free (registry);	885	return false;
816	free (encoding);	886	}
817		887
818	if (cs == CS_UNICODE)	888	if (cs == CS_UNICODE)
819	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	889	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
820		890
821	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	891	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
833	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	903	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
834		904
835	if (encm)	905	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	906	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	907	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		908
839	while (N)	909	while (N)
840	{	910	{
841	if (f->per_char[N].width > width)	911	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	912	width = f->per_char[N].width;
843		913
…		…
846	}	916	}
847	#endif	917	#endif
848		918
849	width = 1;	919	width = 1;
850		920
851	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	921	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
852	{	922	{
853	if (FROM_UNICODE (cs, *t) == NOCHAR)	923	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	924	continue;
855		925
856	// ignore characters we wouldn't use anyways	926	// ignore characters we wouldn't use anyways
…		…
868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	938	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869		939
870	if (width < g.width) width = g.width;	940	if (width < g.width) width = g.width;
871	}	941	}
872		942
873	if (cs == CS_UNKNOWN)	943	#if 0 // do it per-character
		944	if (prop && width > prop->width)
874	{	945	{
875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877	clear ();	946	clear ();
878	return false;	947	return false;
879	}	948	}
880
881	#if 0 // do it per-character
882	if (prop && width > prop->width)
883	{
884	clear ();
885	return false;
886	}
887	#endif	949	#endif
888		950
889	return true;	951	return true;
890	}	952	}
891		953
892	void	954	void
893	rxvt_font_x11::clear ()	955	rxvt_font_x11::clear ()
894	{	956	{
895	if (f)	957	if (f)
896	{	958	{
897	XFreeFont (term->xdisp, f);	959	XFreeFont (term->dpy, f);
898	f = 0;	960	f = 0;
899	}	961	}
900	}	962	}
901		963
902	bool	964	bool
…		…
905	uint32_t ch = FROM_UNICODE (cs, unicode);	967	uint32_t ch = FROM_UNICODE (cs, unicode);
906		968
907	if (ch == NOCHAR)	969	if (ch == NOCHAR)
908	return false;	970	return false;
909		971
910	/* check wether the character exists in _this_ font. horrible. */	972	/* check whether the character exists in _this_ font. horrible. */
911	XCharStruct *xcs;	973	XCharStruct *xcs;
912		974
913	if (encm)	975	if (encm)
914	{	976	{
915	unsigned char byte1 = ch >> 8;	977	unsigned char byte1 = ch >> 8;
…		…
945	return false;	1007	return false;
946		1008
947	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1009	if (!prop \|\| prop->width == rxvt_fontprop::unset)
948	return true;	1010	return true;
949		1011
950	// check wether character overlaps previous/next character	1012	// check whether character overlaps previous/next character
951	int w = xcs->rbearing - xcs->lbearing;	1013	int w = xcs->rbearing - xcs->lbearing;
952	int wcw = max (WCWIDTH (unicode), 1);	1014	int wcw = max (WCWIDTH (unicode), 1);
953		1015
954	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1016	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955		1017
…		…
995	else	1057	else
996	{	1058	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1059	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		1060
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1061	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		1062
1001	if (slow)	1063	if (slow)
1002	{	1064	{
1003	do	1065	do
1004	{	1066	{
1005	if (xc->byte1 \|\| xc->byte2)	1067	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1089	else
1028	{	1090	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1091	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1092
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1093	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1094
1033	if (slow)	1095	if (slow)
1034	{	1096	{
1035	do	1097	do
1036	{	1098	{
1037	if (*xc)	1099	if (*xc)
…		…
1057		1119
1058	void clear ();	1120	void clear ();
1059		1121
1060	rxvt_fontprop properties ();	1122	rxvt_fontprop properties ();
1061		1123
1062	bool load (const rxvt_fontprop &prop);	1124	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1125
1064	void draw (rxvt_drawable &d, int x, int y,	1126	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1127	const text_t *text, int len,
1066	int fg, int bg);	1128	int fg, int bg);
1067		1129
1068	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1130	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069		1131
1070	protected:	1132	protected:
1071	XftFont *f;	1133	XftFont *f;
1072	};	1134	};
1073		1135
1074	void	1136	void
1075	rxvt_font_xft::clear ()	1137	rxvt_font_xft::clear ()
1076	{	1138	{
1077	if (f)	1139	if (f)
1078	{	1140	{
1079	XftFontClose (term->xdisp, f);	1141	XftFontClose (term->dpy, f);
1080	f = 0;	1142	f = 0;
1081	}	1143	}
1082	}	1144	}
1083		1145
1084	rxvt_fontprop	1146	rxvt_fontprop
…		…
1100		1162
1101	return p;	1163	return p;
1102	}	1164	}
1103		1165
1104	bool	1166	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1167	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1168	{
1107	dTermDisplay;	1169	dTermDisplay;
1108		1170
1109	clear ();	1171	clear ();
1110		1172
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1181	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1182	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1183	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1184
1123	if (prop.weight != rxvt_fontprop::unset	1185	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1186	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1187	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1188
1127	if (prop.slant != rxvt_fontprop::unset	1189	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1190	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1191	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1192
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1193	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1194	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1195	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1196	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135	#endif	1197	#endif
1136		1198
1137	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1199	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138	FcPatternAddBool (p, FC_MINSPACE, 1);	1200	FcPatternAddBool (p, FC_MINSPACE, 1);
1139		1201
…		…
1172		1234
1173	XftUnlockFace (f);	1235	XftUnlockFace (f);
1174		1236
1175	int glheight = height;	1237	int glheight = height;
1176		1238
1177	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1239	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1178	{	1240	{
1179	FcChar16 ch = *t;	1241	FcChar16 ch = *t;
1180		1242
1181	if (cs != CS_UNICODE	1243	if (cs != CS_UNICODE
1182	&& ch > 0x100	1244	&& ch > 0x100
…		…
1251	bool	1313	bool
1252	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1314	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1253	{	1315	{
1254	careful = false;	1316	careful = false;
1255		1317
1256	if (!XftCharExists (term->xdisp, f, unicode))	1318	if (!XftCharExists (term->dpy, f, unicode))
1257	return false;	1319	return false;
1258		1320
1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1321	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1260	return true;	1322	return true;
1261		1323
1262	// check character against base font bounding box	1324	// check character against base font bounding box
1263	FcChar32 ch = unicode;	1325	FcChar32 ch = unicode;
1264	XGlyphInfo g;	1326	XGlyphInfo g;
1265	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1327	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1266		1328
1267	int w = g.width - g.x;	1329	int w = g.width - g.x;
1268	int wcw = max (WCWIDTH (unicode), 1);	1330	int wcw = max (WCWIDTH (unicode), 1);
1269		1331
1270	careful = g.x > 0 \|\| w > prop->width * wcw;	1332	careful = g.x > 0 \|\| w > prop->width * wcw;
…		…
1282	void	1344	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1345	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1346	const text_t *text, int len,
1285	int fg, int bg)	1347	int fg, int bg)
1286	{	1348	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289	XGlyphInfo extents;	1349	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1350	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1291	XftGlyphSpec *ep = enc;	1351	XftGlyphSpec *ep = enc;
1292		1352
1293	dTermDisplay;	1353	dTermDisplay;
1294	dTermGC;	1354	dTermGC;
		1355
		1356	int w = term->fwidth * len;
		1357	int h = term->fheight;
		1358
		1359	bool buffered = bg >= Color_transparent
		1360	&& term->option (Opt_buffered);
1295		1361
1296	// cut trailing spaces	1362	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1363	while (len && text [len - 1] == ' ')
1298	len--;	1364	len--;
1299		1365
		1366	int x_ = buffered ? 0 : x;
		1367	int y_ = buffered ? 0 : y;
		1368
1300	while (len)	1369	while (len)
1301	{	1370	{
1302	int cwidth = term->fwidth;	1371	int cwidth = term->fwidth;
1303	FcChar32 fc = *text++; len--;	1372	FcChar32 fc = *text++; len--;
1304		1373
1305	while (len && *text == NOCHAR)	1374	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1375	text++, len--, cwidth += term->fwidth;
1307		1376
1308	if (fc != ' ') // skip spaces	1377	if (fc != ' ') // skip spaces
1309	{	1378	{
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1379	FT_UInt glyph = XftCharIndex (disp, f, fc);
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1380	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312		1381
1313
1314	ep->glyph = glyph;	1382	ep->glyph = glyph;
1315	ep->x = x + (cwidth - extents.xOff >> 1);	1383	ep->x = x_ + (cwidth - extents.xOff >> 1);
1316	ep->y = y + ascent;	1384	ep->y = y_ + ascent;
1317		1385
1318	if (extents.xOff == 0)	1386	if (extents.xOff == 0)
1319	ep->x = x + cwidth;	1387	ep->x = x_ + cwidth;
1320		1388
1321	ep++;	1389	ep++;
1322	}	1390	}
1323		1391
1324	x += cwidth;	1392	x_ += cwidth;
		1393	}
		1394
		1395	if (buffered)
1325	}	1396	{
1326
1327	if (ep != enc)	1397	if (ep != enc)
		1398	{
		1399	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1400
		1401	#ifdef HAVE_BG_PIXMAP
		1402	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1403
		1404	if (term->bgPixmap.pixmap
		1405	&& (bg == Color_transparent \|\| bg == Color_bg
		1406	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1407	{
		1408	int src_x = x, src_y = y;
		1409
		1410	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
		1411	{
		1412	src_x += term->window_vt_x;
		1413	src_y += term->window_vt_y;
		1414	}
		1415
		1416	if (term->bgPixmap.pmap_width >= src_x + w
		1417	&& term->bgPixmap.pmap_height >= src_y + h)
		1418	{
		1419	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1420	src_x, src_y, w, h, 0, 0);
		1421	}
		1422	else
		1423	{
		1424	XGCValues gcv;
		1425
		1426	gcv.fill_style = FillTiled;
		1427	gcv.tile = term->bgPixmap.pixmap;
		1428	gcv.ts_x_origin = -src_x;
		1429	gcv.ts_y_origin = -src_y;
		1430
		1431	XChangeGC (disp, gc,
		1432	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1433	&gcv);
		1434
		1435	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1436
		1437	gcv.fill_style = FillSolid;
		1438	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1439	}
		1440
		1441	if (dst)
		1442	{
		1443	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1444
		1445	// dst can only be set when bg >= 0
		1446	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1447	}
		1448	}
		1449	else
		1450	#endif
		1451	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
		1452
		1453	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1454	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1455	}
		1456	else
		1457	clear_rect (d, x, y, w, h, bg);
		1458	}
		1459	else
		1460	{
		1461	clear_rect (d, x, y, w, h, bg);
1328	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1462	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1463	}
1329	}	1464	}
		1465
1330	#endif	1466	#endif
1331		1467
1332	/////////////////////////////////////////////////////////////////////////////	1468	/////////////////////////////////////////////////////////////////////////////
1333		1469
1334	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1470	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1345	void	1481	void
1346	rxvt_fontset::clear ()	1482	rxvt_fontset::clear ()
1347	{	1483	{
1348	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1484	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1349	= rxvt_fontprop::unset;	1485	= rxvt_fontprop::unset;
		1486	force_prop = false;
1350		1487
1351	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1488	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1352	FONT_UNREF (*i);	1489	(*i)->unref ();
1353		1490
1354	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1491	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1355	delete *p;	1492	delete *p;
1356		1493
1357	free (fontdesc); fontdesc = 0;	1494	free (fontdesc); fontdesc = 0;
…		…
1359	fonts.clear ();	1496	fonts.clear ();
1360		1497
1361	fallback = fallback_fonts;	1498	fallback = fallback_fonts;
1362	}	1499	}
1363		1500
		1501	void
		1502	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1503	{
		1504	font->set_term (term);
		1505
		1506	font->cs = cs;
		1507	font->loaded = false;
		1508	}
		1509
1364	rxvt_font *	1510	rxvt_font *
1365	rxvt_fontset::new_font (const char *name, codeset cs)	1511	rxvt_fontset::new_font (const char *name, codeset cs)
1366	{	1512	{
1367	rxvt_font *f;	1513	rxvt_font *f;
1368		1514
1369	if (!name \|\| !*name)	1515	if (!name \|\| !*name)
1370	{	1516	{
1371	name = "";	1517	name = "";
1372	f = new rxvt_font_default (this);	1518	f = new rxvt_font_default (this);
1373	}	1519	}
…		…
1384	f = new rxvt_font_x11;	1530	f = new rxvt_font_x11;
1385	}	1531	}
1386	else	1532	else
1387	f = new rxvt_font_x11;	1533	f = new rxvt_font_x11;
1388		1534
1389	f->set_term (term);
1390	f->set_name (strdup (name));	1535	f->set_name (strdup (name));
1391		1536	prepare_font (f, cs);
1392	f->cs = cs;
1393	f->loaded = false;
1394		1537
1395	return f;	1538	return f;
1396	}	1539	}
1397		1540
1398	/////////////////////////////////////////////////////////////////////////////	1541	/////////////////////////////////////////////////////////////////////////////
		1542
		1543	void
		1544	rxvt_fontset::push_font (rxvt_font *font)
		1545	{
		1546	// the fontCount index is reserved for the overflow font, it is only
		1547	// necessary when we get fontCount or more fonts, as they cannot be
		1548	// represented in the rendition.
		1549	if (fonts.size () == fontCount)
		1550	{
		1551	rxvt_font *f = new rxvt_font_overflow (this);
		1552
		1553	prepare_font (f, CS_UNICODE);
		1554	fonts.push_back (f);
		1555	}
		1556
		1557	fonts.push_back (font);
		1558	}
1399		1559
1400	void	1560	void
1401	rxvt_fontset::add_fonts (const char *desc)	1561	rxvt_fontset::add_fonts (const char *desc)
1402	{	1562	{
1403	if (desc)	1563	if (desc)
…		…
1441	if (!end)	1601	if (!end)
1442	end = desc + strlen (desc);	1602	end = desc + strlen (desc);
1443		1603
1444	if (end - desc < 511)	1604	if (end - desc < 511)
1445	{	1605	{
1446	strncpy (buf, desc, end - desc);	1606	memcpy (buf, desc, end - desc);
1447	buf[end - desc] = 0;	1607	buf[end - desc] = 0;
1448		1608
1449	fonts.push_back (new_font (buf, cs));	1609	push_font (new_font (buf, cs));
1450	}	1610	}
1451	else	1611	else
1452	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1612	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1453		1613
1454	desc = end + 1;	1614	desc = end + 1;
…		…
1466	if (fonts[i]->loaded)	1626	if (fonts[i]->loaded)
1467	return true;	1627	return true;
1468		1628
1469	fonts[i]->loaded = true;	1629	fonts[i]->loaded = true;
1470		1630
1471	if (!fonts[i]->load (prop))	1631	if (!fonts[i]->load (prop, force_prop))
1472	{	1632	{
1473	fonts[i]->cs = CS_UNKNOWN;	1633	fonts[i]->cs = CS_UNKNOWN;
1474	return false;	1634	return false;
1475	}	1635	}
1476		1636
…		…
1482	{	1642	{
1483	clear ();	1643	clear ();
1484		1644
1485	fontdesc = strdup (desc);	1645	fontdesc = strdup (desc);
1486		1646
1487	fonts.push_back (new_font (0, CS_UNICODE));	1647	push_font (new_font (0, CS_UNICODE));
1488	realize_font (0);	1648	realize_font (0);
1489		1649
1490	add_fonts (desc);	1650	add_fonts (desc);
1491		1651
1492	return true;	1652	return true;
…		…
1501		1661
1502	return -1;	1662	return -1;
1503	}	1663	}
1504		1664
1505	int	1665	int
1506	rxvt_fontset::find_font (unicode_t unicode)	1666	rxvt_fontset::find_font_idx (unicode_t unicode)
1507	{	1667	{
1508	if (unicode >= 1<<20)	1668	if (unicode >= 1<<20)
1509	return 0;	1669	return 0;
1510		1670
1511	unicode_t hi = unicode >> 8;	1671	unicode_t hi = unicode >> 8;
…		…
1537	goto next_font;	1697	goto next_font;
1538		1698
1539	bool careful;	1699	bool careful;
1540	if (f->has_char (unicode, &prop, careful))	1700	if (f->has_char (unicode, &prop, careful))
1541	{	1701	{
1542	if (careful)	1702	i = (i << 1) \| careful;
1543	i \|= 128;
1544		1703
1545	goto found;	1704	goto found;
1546	}	1705	}
1547		1706
1548	next_font:	1707	next_font:
1549	if (i == fonts.size () - 1)	1708	if (i == fonts.size () - 1)
1550	{	1709	{
1551	if (fallback->name)	1710	if (fallback->name)
1552	{	1711	{
1553	// search through the fallback list	1712	// search through the fallback list
1554	fonts.push_back (new_font (fallback->name, fallback->cs));	1713	push_font (new_font (fallback->name, fallback->cs));
1555	fallback++;	1714	fallback++;
1556	}	1715	}
1557	else	1716	else
1558	{	1717	{
1559	// try to find a new font.	1718	// try to find a new font.
…		…
1577	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1736	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1578	FcPatternAddBool (p, FC_MINSPACE, 1);	1737	FcPatternAddBool (p, FC_MINSPACE, 1);
1579	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1738	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1580		1739
1581	XftResult result;	1740	XftResult result;
1582	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1741	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1583		1742
1584	FcPatternDestroy (p);	1743	FcPatternDestroy (p);
1585		1744
1586	if (match)	1745	if (match)
1587	{	1746	{
…		…
1590	FcPatternDestroy (match);	1749	FcPatternDestroy (match);
1591		1750
1592	if (find_font (font) < 0)	1751	if (find_font (font) < 0)
1593	{	1752	{
1594	char fontname[4096];	1753	char fontname[4096];
1595	sprintf (fontname, "xft:%-.4090s", font);	1754	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1596		1755
1597	fonts.push_back (new_font (fontname, CS_UNICODE));	1756	push_font (new_font (fontname, CS_UNICODE));
1598	}	1757	}
1599		1758
1600	free (font);	1759	free (font);
1601	}	1760	}
1602	#endif	1761	#endif
…		…
1624	}	1783	}
1625		1784
1626	return i;	1785	return i;
1627	}	1786	}
1628		1787
1629
1630

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC vs. Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.92 by root, Mon Jan 30 04:53:30 2006 UTC vs.
Revision 1.169 by sf-exg, Sat Dec 18 18:17:38 2010 UTC