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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.162 by root, Wed Mar 31 22:46:40 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
…		…
43	const char *name;	42	const char *name;
44	} fallback_fonts[] = {	43	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	44	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	45	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		47
49	#if ENCODING_EU	48	#if ENCODING_EU
50	// cyrillic	49	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	50	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	51	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		52
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	53	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	54	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	55	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	56	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	57	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	64	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	65	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		66
68	# if XFT	67	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	68	{ CS_KOI8_U, "xft::lang=ru" },
70		69
71	{ CS_ISO8859_5, "xft::lang=ru" },	70	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	71	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	72	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	73	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	74	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
80		79
81	// japanese	80	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	82	# if XFT
84	// prefer xft for complex scripts	83	// prefer xft for complex scripts
		84	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ 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" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	88	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
129	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },	128	{ CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },	129	{ CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131	# endif	130	# endif
132	#endif	131	#endif
133		132
134	// generic font fallback
135	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	133	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
136	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	134	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
137	{ CS_UNICODE, "----r-------c--iso10646-1" },
138	{ CS_UNICODE, "----r-------m--iso10646-1" },
139	#if XFT	135	#if XFT
140	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	136	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	137	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	138	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
143	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	139	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
144		140
145	// FreeMono is usually uglier than x fonts, so try last only.	141	// FreeMono is usually uglier than x fonts, so try after the others
146	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	142	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
147	#endif	143	#endif
148		144
		145	// generic font fallback, put this last, as many iso10646 fonts have extents
		146	// specified for all glyphs in the range they cover, but most are simply empty
		147	//{ CS_UNICODE, "----r-------c--iso10646-1" },
		148	//{ CS_UNICODE, "----r-------m--iso10646-1" },
149	{ CS_UNKNOWN, 0 }	149	{ CS_UNKNOWN, 0 }
150	};	150	};
151		151
152	// these characters are used to guess the font height and width	152	// these characters are used to guess the font height and width
153	// pango uses a similar algorithm and doesn't trust the font either.	153	// pango uses a similar algorithm and doesn't trust the font either.
…		…
157	0x304c, 0x672c, // が本	157	0x304c, 0x672c, // が本
158	};	158	};
159		159
160	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	160	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161		161
162	#define dTermDisplay Display *disp = term->xdisp	162	#define dTermDisplay Display *disp = term->dpy
163	#define dTermGC GC gc = term->gc	163	#define dTermGC GC gc = term->gc
164
165	/////////////////////////////////////////////////////////////////////////////
166
167	#if XFT
168	rxvt_drawable::~rxvt_drawable ()
169	{
170	if (xftdrawable)
171	XftDrawDestroy (xftdrawable);
172	}
173
174	rxvt_drawable::operator XftDraw *()
175	{
176	if (!xftdrawable)
177	xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
178
179	return xftdrawable;
180	}
181	#endif
182		164
183	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
184		166
185	static const char *	167	static const char *
186	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	168	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
…		…
234	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
235	{	217	{
236	}	218	}
237		219
238	void	220	void
239	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
240	{	222	{
241	if (this->name == name)	223	if (name == name_)
242	return;	224	return;
243		225
244	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
245	this->name = name;	227	name = name_;
246	}	228	}
247		229
248	void	230	void
249	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
250	{	232	{
251	dTermDisplay;	233	dTermDisplay;
252	dTermGC;	234	dTermGC;
253		235
254	if (color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
255	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
256	else if (color >= 0)	238	else if (color >= 0)
257	{	239	{
258	#if XFT	240	#if XFT
		241	Picture dst;
		242
		243	# ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap
		245	&& !term->pix_colors[color].is_opaque ()
		246	&& ((dst = XftDrawPicture (d))))
		247	{
		248	XClearArea (disp, d, x, y, w, h, false);
		249
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	}
		253	else
		254	# endif
259	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
260	#else	257	#else
261	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
262	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
263	#endif	260	#endif
264	}	261	}
265	}	262	}
266		263
267	/////////////////////////////////////////////////////////////////////////////	264	/////////////////////////////////////////////////////////////////////////////
268
269	#include "table/linedraw.h"
270		265
271	struct rxvt_font_default : rxvt_font {	266	struct rxvt_font_default : rxvt_font {
272	struct rxvt_fontset *fs;	267	struct rxvt_fontset *fs;
273		268
274	rxvt_font_default (rxvt_fontset *fs)	269	rxvt_font_default (rxvt_fontset *fs)
…		…
287	p.slant = rxvt_fontprop::roman;	282	p.slant = rxvt_fontprop::roman;
288		283
289	return p;	284	return p;
290	}	285	}
291		286
292	bool load (const rxvt_fontprop &prop)	287	bool load (const rxvt_fontprop &prop, bool force_prop)
293	{	288	{
294	width = 1; height = 1;	289	width = 1; height = 1;
295	ascent = 1; descent = 0;	290	ascent = 1; descent = 0;
296		291
297	set_name (strdup ("built-in support font"));	292	set_name (strdup ("built-in support font"));
…		…
310	return false;	305	return false;
311		306
312	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
313	return true;	308	return true;
314		309
		310	#ifdef BUILTIN_GLYPHS
315	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
316	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
317	return true;	313	return true;
		314	#endif
318		315
319	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
320	return true;	317	return true;
321		318
322	switch (unicode)	319	switch (unicode)
…		…
358	;	355	;
359		356
360	int width = text - tp;	357	int width = text - tp;
361	int fwidth = term->fwidth * width;	358	int fwidth = term->fwidth * width;
362		359
		360	#ifdef BUILTIN_GLYPHS
363	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
364	{	362	{
		363	# include "table/linedraw.h"
365	uint16_t offs = linedraw_offs[t - 0x2500];	364	uint16_t offs = linedraw_offs[t - 0x2500];
366	uint32_t *a = linedraw_command + (offs >> 4);	365	uint32_t *a = linedraw_command + (offs >> 4);
367	uint32_t *b = a + (offs & 15);	366	uint32_t *b = a + (offs & 15);
368		367
369	int W = fwidth;	368	int W = fwidth;
…		…
407		406
408	case 1: // rectangle, possibly stippled	407	case 1: // rectangle, possibly stippled
409	if (a)	408	if (a)
410	{	409	{
411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	410	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412		411
413	gcv.fill_style = FillStippled;	412	gcv.fill_style = FillStippled;
414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	413	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415	gcv.ts_x_origin = x;	414	gcv.ts_x_origin = x;
416	gcv.ts_y_origin = y;	415	gcv.ts_y_origin = y;
417		416
…		…
436	(a - 1) * 9064, (b - 1) 90*64);	435	(a - 1) * 9064, (b - 1) 90*64);
437	break;	436	break;
438	}	437	}
439	}	438	}
440	}	439	}
		440	#else
		441	if (0)
		442	;
		443	#endif
441	#if ENABLE_COMBINING	444	#if ENABLE_COMBINING
442	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	445	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443	{	446	{
444	min_it (width, 2); // we only support wcwidth up to 2	447	min_it (width, 2); // we only support wcwidth up to 2
445		448
…		…
458	*chrs = cc->c2;	461	*chrs = cc->c2;
459	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
460	? f1	463	? f1
461	: (*fs)[fs->find_font (cc->c2)];	464	: (*fs)[fs->find_font (cc->c2)];
462		465
463	f2->draw (d, x, y, chrs, width, fg, -1);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
464	}	467	}
465	}	468	}
466	#endif	469	#endif
467	else	470	else
468	switch (t)	471	switch (t)
…		…
479		482
480	x += fwidth;	483	x += fwidth;
481	}	484	}
482	}	485	}
483		486
		487	struct rxvt_font_overflow : rxvt_font {
		488	struct rxvt_fontset *fs;
		489
		490	rxvt_font_overflow (rxvt_fontset *fs)
		491	: rxvt_font ()
		492	{
		493	this->fs = fs;
		494	}
		495
		496	rxvt_fontprop properties ()
		497	{
		498	rxvt_fontprop p;
		499
		500	p.width = p.height = 1;
		501	p.ascent = rxvt_fontprop::unset;
		502	p.weight = rxvt_fontprop::medium;
		503	p.slant = rxvt_fontprop::roman;
		504
		505	return p;
		506	}
		507
		508	bool load (const rxvt_fontprop &prop, bool force_prop)
		509	{
		510	width = 1; height = 1;
		511	ascent = 1; descent = 0;
		512
		513	set_name (strdup ("built-in rendition overflow font"));
		514
		515	return true;
		516	}
		517
		518	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		519	{
		520	return false;
		521	}
		522
		523	void draw (rxvt_drawable &d, int x, int y,
		524	const text_t *text, int len,
		525	int fg, int bg)
		526	{
		527	while (len--)
		528	{
		529	int fid = fs->find_font_idx (*text);
		530	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		531	++text;
		532	x += term->fwidth;
		533	}
		534	}
		535	};
		536
484	/////////////////////////////////////////////////////////////////////////////	537	/////////////////////////////////////////////////////////////////////////////
485		538
486	struct rxvt_font_x11 : rxvt_font {	539	struct rxvt_font_x11 : rxvt_font {
487	rxvt_font_x11 () { f = 0; }	540	rxvt_font_x11 () { f = 0; }
488		541
489	void clear ();	542	void clear ();
490		543
491	rxvt_fontprop properties ();	544	rxvt_fontprop properties ();
492		545
493	bool load (const rxvt_fontprop &prop);	546	bool load (const rxvt_fontprop &prop, bool force_prop);
494		547
495	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	548	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496		549
497	void draw (rxvt_drawable &d, int x, int y,	550	void draw (rxvt_drawable &d, int x, int y,
498	const text_t *text, int len,	551	const text_t *text, int len,
499	int fg, int bg);	552	int fg, int bg);
500		553
501	bool slow; // wether this is a proportional font or has other funny characteristics	554	bool slow; // whether this is a proportional font or has other funny characteristics
502	XFontStruct *f;	555	XFontStruct *f;
503	codeset cs;
504	bool enc2b, encm;	556	bool enc2b, encm;
505		557
506	char get_property (XFontStruct f, Atom property, const char *repl) const;	558	char get_property (XFontStruct f, Atom property, const char *repl) const;
507	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	559	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
508	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	560	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
513	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	565	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
514	{	566	{
515	unsigned long value;	567	unsigned long value;
516		568
517	if (XGetFontProperty (f, property, &value))	569	if (XGetFontProperty (f, property, &value))
518	return XGetAtomName (term->xdisp, value);	570	return XGetAtomName (term->dpy, value);
519	else	571	else
520	return rxvt_strdup (repl);	572	return repl ? strdup (repl) : 0;
521	}	573	}
522		574
523	rxvt_fontprop	575	rxvt_fontprop
524	rxvt_font_x11::properties ()	576	rxvt_font_x11::properties ()
525	{	577	{
…		…
546	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	598	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547	{	599	{
548	unsigned long height;	600	unsigned long height;
549		601
550	#if 0	602	#if 0
551	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	603	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552	return false;	604	return false;
553	#else	605	#else
554	height = f->ascent + f->descent;	606	height = f->ascent + f->descent;
555	#endif	607	#endif
556		608
…		…
607	return false;	659	return false;
608	}	660	}
609		661
610	// fix the size of scalable fonts	662	// fix the size of scalable fonts
611	static bool	663	static bool
612	replace_field (char buf, const char name, int index, const char old, const char *replace)	664	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
613	{	665	{
614	int slashes = 0;	666	int slashes = 0;
615	const char field, end;	667	const char field, end;
616		668
617	for (const char c = name; c; c++)	669	for (const char c = name; c; c++)
…		…
627	break;	679	break;
628	}	680	}
629		681
630	if (slashes >= 13 && (!old \|\| *field == old))	682	if (slashes >= 13 && (!old \|\| *field == old))
631	{	683	{
632	// TODO: check for overflow in font-name	684	size_t len = field - name;
633	strncpy (buf, name, field - name);	685	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
634	buf += field - name;	686	memcpy (*ptr, name, len);
635	strcpy (buf, replace);	687	strcpy (*ptr + len, replace);
636	strcat (buf, end);	688	strcat (*ptr, end);
637		689
638	return true;	690	return true;
639	}	691	}
640	else	692	else
641	{	693	{
642	strcpy (buf, name);	694	*ptr = strdup (name);
643		695
644	return false;	696	return false;
645	}	697	}
646	}	698	}
647		699
648	bool	700	bool
649	rxvt_font_x11::load (const rxvt_fontprop &prop)	701	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650	{	702	{
651	dTermDisplay;	703	dTermDisplay;
652		704
653	clear ();	705	clear ();
654		706
655	char field_str[64]; // enough for 128 bits	707	char field_str[64]; // enough for 128 bits
656		708
657	// first morph the font if required	709	// first morph the font if required
658	if (prop.weight != rxvt_fontprop::unset	710	if (force_prop)
659	\|\| prop.slant != rxvt_fontprop::unset)
660	{	711	{
661	char fname[1024];	712	char *fname;
662		713
663	if (name[0] != '-')	714	if (name[0] != '-')
664	{	715	{
665	f = XLoadQueryFont (disp, name);	716	f = XLoadQueryFont (disp, name);
666		717
…		…
678	f = 0;	729	f = 0;
679	}	730	}
680		731
681	if (prop.weight != rxvt_fontprop::unset)	732	if (prop.weight != rxvt_fontprop::unset)
682	{	733	{
683	replace_field (fname, name, 2, 0,	734	replace_field (&fname, name, 2, 0,
684	prop.weight < rxvt_fontprop::bold	735	prop.weight < rxvt_fontprop::bold
685	? "medium" : "bold");	736	? "medium" : "bold");
686	set_name (strdup (fname));	737	set_name (fname);
687	}	738	}
688		739
689	if (prop.slant != rxvt_fontprop::unset)	740	if (prop.slant != rxvt_fontprop::unset)
690	{	741	{
691	replace_field (fname, name, 3, 0,	742	replace_field (&fname, name, 3, 0,
692	prop.slant < rxvt_fontprop::italic	743	prop.slant < rxvt_fontprop::italic
693	? "r" : "i"); // TODO: handle "o"blique, too	744	? "r" : "i"); // TODO: handle "o"blique, too
694	set_name (strdup (fname));	745	set_name (fname);
695	}	746	}
696	}	747	}
697		748
698	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	749	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699	? 0 : prop.height);	750	? 0 : prop.height);
…		…
724	font_weight *fonts = new font_weight[count];	775	font_weight *fonts = new font_weight[count];
725		776
726	for (int i = 0; i < count; i++)	777	for (int i = 0; i < count; i++)
727	{	778	{
728	rxvt_fontprop p;	779	rxvt_fontprop p;
729	char fname[1024];	780	char *fname;
730		781
731	int diff = 0;	782	int diff = 0;
732		783
733	if (replace_field (fname, list[i], 6, '0', field_str))	784	if (replace_field (&fname, list[i], 6, '0', field_str))
734	diff += 10; // slightly penalize scalable fonts	785	diff += 10; // slightly penalize scalable fonts
		786	else
		787	{
		788	free (fname);
735	else if (replace_field (fname, list[i], 11, '0', "0"))	789	if (replace_field (&fname, list[i], 11, '0', "0"))
736	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	790	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		791	}
737		792
738	if (!set_properties (p, fname))	793	if (!set_properties (p, fname))
739	continue;	794	continue;
740		795
741	if (prop.height != rxvt_fontprop::unset	796	if (prop.height != rxvt_fontprop::unset
…		…
745	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	800	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
746	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	801	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
747	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	802	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	803	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749		804
750	fonts[i].name = strdup (fname);	805	fonts[i].name = fname;
751	fonts[i].diff = diff;	806	fonts[i].diff = diff;
752	}	807	}
753		808
754	XFreeFontNames (list);	809	XFreeFontNames (list);
755		810
…		…
787	return false;	842	return false;
788		843
789	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	844	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	845	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791		846
		847	cs = CS_UNKNOWN;
		848
792	if (registry && encoding)	849	if (registry && encoding)
793	{	850	{
794	char charset[64];	851	char charset[64];
795	snprintf (charset, 64, "%s-%s", registry, encoding);	852	snprintf (charset, 64, "%s-%s", registry, encoding);
796		853
797	cs = codeset_from_name (charset);	854	cs = codeset_from_name (charset);
		855
		856	if (cs == CS_UNKNOWN)
		857	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
798	}	858	}
799	else	859
		860	free (registry);
		861	free (encoding);
		862
		863	if (cs == CS_UNKNOWN)
800	{	864	{
801	const char *charset = get_property (f, XA_FONT, 0);	865	const char *charset = get_property (f, XA_FONT, 0);
802		866
803	if (!charset)	867	if (!charset)
804	charset = name;	868	charset = name;
…		…
807	while (*charset)	871	while (*charset)
808	if (*charset++ == '-' && !--count)	872	if (*charset++ == '-' && !--count)
809	break;	873	break;
810		874
811	cs = codeset_from_name (charset);	875	cs = codeset_from_name (charset);
		876	if (cs == CS_UNKNOWN)
		877	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		878	}
		879
		880	if (cs == CS_UNKNOWN)
812	}	881	{
813		882	clear ();
814	free (registry);	883	return false;
815	free (encoding);	884	}
816		885
817	if (cs == CS_UNICODE)	886	if (cs == CS_UNICODE)
818	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	887	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819		888
820	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	889	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
832	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	901	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
833		902
834	if (encm)	903	if (encm)
835	N += (f->max_byte1 - f->min_byte1)	904	N += (f->max_byte1 - f->min_byte1)
836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	905	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837		906
838	while (N)	907	while (N)
839	{	908	{
840	if (f->per_char[N].width > width)	909	if (f->per_char[N].width > width)
841	width = f->per_char[N].width;	910	width = f->per_char[N].width;
842		911
…		…
861		930
862	XCharStruct g;	931	XCharStruct g;
863	int dir_ret, asc_ret, des_ret;	932	int dir_ret, asc_ret, des_ret;
864	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	933	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865		934
		935	int wcw = WCWIDTH (*t);
866	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	936	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867		937
868	if (width < g.width) width = g.width;	938	if (width < g.width) width = g.width;
869	}	939	}
870		940
871	if (cs == CS_UNKNOWN)	941	#if 0 // do it per-character
		942	if (prop && width > prop->width)
872	{	943	{
873	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
874
875	clear ();	944	clear ();
876	return false;	945	return false;
877	}	946	}
878
879	#if 0 // do it per-character
880	if (prop && width > prop->width)
881	{
882	clear ();
883	return false;
884	}
885	#endif	947	#endif
886		948
887	return true;	949	return true;
888	}	950	}
889		951
890	void	952	void
891	rxvt_font_x11::clear ()	953	rxvt_font_x11::clear ()
892	{	954	{
893	if (f)	955	if (f)
894	{	956	{
895	XFreeFont (term->xdisp, f);	957	XFreeFont (term->dpy, f);
896	f = 0;	958	f = 0;
897	}	959	}
898	}	960	}
899		961
900	bool	962	bool
…		…
903	uint32_t ch = FROM_UNICODE (cs, unicode);	965	uint32_t ch = FROM_UNICODE (cs, unicode);
904		966
905	if (ch == NOCHAR)	967	if (ch == NOCHAR)
906	return false;	968	return false;
907		969
908	/* check wether the character exists in _this_ font. horrible. */	970	/* check whether the character exists in _this_ font. horrible. */
909	XCharStruct *xcs;	971	XCharStruct *xcs;
910		972
911	if (encm)	973	if (encm)
912	{	974	{
913	unsigned char byte1 = ch >> 8;	975	unsigned char byte1 = ch >> 8;
…		…
943	return false;	1005	return false;
944		1006
945	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1007	if (!prop \|\| prop->width == rxvt_fontprop::unset)
946	return true;	1008	return true;
947		1009
948	// check wether character overlaps previous/next character	1010	// check whether character overlaps previous/next character
949	int w = xcs->rbearing - xcs->lbearing;	1011	int w = xcs->rbearing - xcs->lbearing;
950	int wcw = WCWIDTH (unicode);	1012	int wcw = max (WCWIDTH (unicode), 1);
951		1013
952	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1014	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
953		1015
954	if (careful && !OVERLAP_OK (w, wcw, prop))	1016	if (careful && !OVERLAP_OK (w, wcw, prop))
955	return false;	1017	return false;
…		…
993	else	1055	else
994	{	1056	{
995	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1057	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996		1058
997	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1059	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
998		1060
999	if (slow)	1061	if (slow)
1000	{	1062	{
1001	do	1063	do
1002	{	1064	{
1003	if (xc->byte1 \|\| xc->byte2)	1065	if (xc->byte1 \|\| xc->byte2)
…		…
1025	else	1087	else
1026	{	1088	{
1027	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1089	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028		1090
1029	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1091	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1030		1092
1031	if (slow)	1093	if (slow)
1032	{	1094	{
1033	do	1095	do
1034	{	1096	{
1035	if (*xc)	1097	if (*xc)
…		…
1055		1117
1056	void clear ();	1118	void clear ();
1057		1119
1058	rxvt_fontprop properties ();	1120	rxvt_fontprop properties ();
1059		1121
1060	bool load (const rxvt_fontprop &prop);	1122	bool load (const rxvt_fontprop &prop, bool force_prop);
1061		1123
1062	void draw (rxvt_drawable &d, int x, int y,	1124	void draw (rxvt_drawable &d, int x, int y,
1063	const text_t *text, int len,	1125	const text_t *text, int len,
1064	int fg, int bg);	1126	int fg, int bg);
1065		1127
1066	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1128	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1067		1129
1068	protected:	1130	protected:
1069	XftFont *f;	1131	XftFont *f;
1070	};	1132	};
1071		1133
1072	void	1134	void
1073	rxvt_font_xft::clear ()	1135	rxvt_font_xft::clear ()
1074	{	1136	{
1075	if (f)	1137	if (f)
1076	{	1138	{
1077	XftFontClose (term->xdisp, f);	1139	XftFontClose (term->dpy, f);
1078	f = 0;	1140	f = 0;
1079	}	1141	}
1080	}	1142	}
1081		1143
1082	rxvt_fontprop	1144	rxvt_fontprop
…		…
1098		1160
1099	return p;	1161	return p;
1100	}	1162	}
1101		1163
1102	bool	1164	bool
1103	rxvt_font_xft::load (const rxvt_fontprop &prop)	1165	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104	{	1166	{
1105	dTermDisplay;	1167	dTermDisplay;
1106		1168
1107	clear ();	1169	clear ();
1108		1170
…		…
1117	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1179	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1180	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1181	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120		1182
1121	if (prop.weight != rxvt_fontprop::unset	1183	if (prop.weight != rxvt_fontprop::unset
1122	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1184	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1185	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124		1186
1125	if (prop.slant != rxvt_fontprop::unset	1187	if (prop.slant != rxvt_fontprop::unset
1126	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1188	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1189	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128		1190
1129	#if 0 // clipping unfortunately destroys our precious double-width-characters	1191	#if 0 // clipping unfortunately destroys our precious double-width-characters
1130	// clip width, we can't do better, or can we?	1192	// clip width, we can't do better, or can we?
1131	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1193	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1132	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1194	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1133	#endif	1195	#endif
1134		1196
1135	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1197	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1136	FcPatternAddBool (p, FC_MINSPACE, 1);	1198	FcPatternAddBool (p, FC_MINSPACE, 1);
1137		1199
…		…
1249	bool	1311	bool
1250	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1312	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251	{	1313	{
1252	careful = false;	1314	careful = false;
1253		1315
1254	if (!XftCharExists (term->xdisp, f, unicode))	1316	if (!XftCharExists (term->dpy, f, unicode))
1255	return false;	1317	return false;
1256		1318
1257	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1319	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1258	return true;	1320	return true;
1259		1321
1260	// check character against base font bounding box	1322	// check character against base font bounding box
1261	FcChar32 ch = unicode;	1323	FcChar32 ch = unicode;
1262	XGlyphInfo g;	1324	XGlyphInfo g;
1263	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1325	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264		1326
1265	int w = g.width - g.x;	1327	int w = g.width - g.x;
1266	int wcw = WCWIDTH (unicode);	1328	int wcw = max (WCWIDTH (unicode), 1);
1267		1329
1268	careful = g.x > 0 \|\| w > prop->width * wcw;	1330	careful = g.x > 0 \|\| w > prop->width * wcw;
1269		1331
1270	if (careful && !OVERLAP_OK (w, wcw, prop))	1332	if (careful && !OVERLAP_OK (w, wcw, prop))
1271	return false;	1333	return false;
…		…
1280	void	1342	void
1281	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1343	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282	const text_t *text, int len,	1344	const text_t *text, int len,
1283	int fg, int bg)	1345	int fg, int bg)
1284	{	1346	{
1285	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287	XGlyphInfo extents;	1347	XGlyphInfo extents;
1288	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1348	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1289	XftGlyphSpec *ep = enc;	1349	XftGlyphSpec *ep = enc;
1290		1350
1291	dTermDisplay;	1351	dTermDisplay;
1292	dTermGC;	1352	dTermGC;
		1353
		1354	int w = term->fwidth * len;
		1355	int h = term->fheight;
		1356
		1357	bool buffered = bg >= Color_transparent
		1358	&& term->option (Opt_buffered);
1293		1359
1294	// cut trailing spaces	1360	// cut trailing spaces
1295	while (len && text [len - 1] == ' ')	1361	while (len && text [len - 1] == ' ')
1296	len--;	1362	len--;
1297		1363
		1364	int x_ = buffered ? 0 : x;
		1365	int y_ = buffered ? 0 : y;
		1366
1298	while (len)	1367	while (len)
1299	{	1368	{
1300	int cwidth = term->fwidth;	1369	int cwidth = term->fwidth;
1301	FcChar32 fc = *text++; len--;	1370	FcChar32 fc = *text++; len--;
1302		1371
1303	while (len && *text == NOCHAR)	1372	while (len && *text == NOCHAR)
1304	text++, len--, cwidth += term->fwidth;	1373	text++, len--, cwidth += term->fwidth;
1305		1374
1306	if (fc != ' ') // skip spaces	1375	if (fc != ' ') // skip spaces
1307	{	1376	{
1308	FT_UInt glyph = XftCharIndex (disp, f, fc);	1377	FT_UInt glyph = XftCharIndex (disp, f, fc);
1309	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1378	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310		1379
1311
1312	ep->glyph = glyph;	1380	ep->glyph = glyph;
1313	ep->x = x + (cwidth - extents.xOff >> 1);	1381	ep->x = x_ + (cwidth - extents.xOff >> 1);
1314	ep->y = y + ascent;	1382	ep->y = y_ + ascent;
1315		1383
1316	if (extents.xOff == 0)	1384	if (extents.xOff == 0)
1317	ep->x = x + cwidth;	1385	ep->x = x_ + cwidth;
1318		1386
1319	ep++;	1387	ep++;
1320	}	1388	}
1321		1389
1322	x += cwidth;	1390	x_ += cwidth;
		1391	}
		1392
		1393	if (buffered)
1323	}	1394	{
1324
1325	if (ep != enc)	1395	if (ep != enc)
		1396	{
		1397	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1398
		1399	#ifdef HAVE_BG_PIXMAP
		1400	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1401
		1402	if (term->bgPixmap.pixmap
		1403	&& (bg == Color_transparent \|\| bg == Color_bg
		1404	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1405	{
		1406	int src_x = x, src_y = y;
		1407
		1408	if (term->bgPixmap.is_parentOrigin ())
		1409	{
		1410	src_x += term->window_vt_x;
		1411	src_y += term->window_vt_y;
		1412	}
		1413
		1414	if (term->bgPixmap.pmap_width >= src_x + w
		1415	&& term->bgPixmap.pmap_height >= src_y + h)
		1416	{
		1417	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1418	src_x, src_y, w, h, 0, 0);
		1419	}
		1420	else
		1421	{
		1422	XGCValues gcv;
		1423
		1424	gcv.fill_style = FillTiled;
		1425	gcv.tile = term->bgPixmap.pixmap;
		1426	gcv.ts_x_origin = -src_x;
		1427	gcv.ts_y_origin = -src_y;
		1428
		1429	XChangeGC (disp, gc,
		1430	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1431	&gcv);
		1432
		1433	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1434
		1435	gcv.fill_style = FillSolid;
		1436	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1437	}
		1438
		1439	if (dst)
		1440	{
		1441	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1442
		1443	// dst can only be set when bg >= 0
		1444	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1445	}
		1446	}
		1447	else
		1448	#endif
		1449	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
		1450
		1451	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1452	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1453	}
		1454	else
		1455	clear_rect (d, x, y, w, h, bg);
		1456	}
		1457	else
		1458	{
		1459	clear_rect (d, x, y, w, h, bg);
1326	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1460	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1461	}
1327	}	1462	}
		1463
1328	#endif	1464	#endif
1329		1465
1330	/////////////////////////////////////////////////////////////////////////////	1466	/////////////////////////////////////////////////////////////////////////////
1331		1467
1332	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1468	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1343	void	1479	void
1344	rxvt_fontset::clear ()	1480	rxvt_fontset::clear ()
1345	{	1481	{
1346	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1482	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347	= rxvt_fontprop::unset;	1483	= rxvt_fontprop::unset;
		1484	force_prop = false;
1348		1485
1349	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1486	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350	FONT_UNREF (*i);	1487	FONT_UNREF (*i);
1351		1488
1352	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1489	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1357	fonts.clear ();	1494	fonts.clear ();
1358		1495
1359	fallback = fallback_fonts;	1496	fallback = fallback_fonts;
1360	}	1497	}
1361		1498
		1499	void
		1500	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1501	{
		1502	font->set_term (term);
		1503
		1504	font->cs = cs;
		1505	font->loaded = false;
		1506	}
		1507
1362	rxvt_font *	1508	rxvt_font *
1363	rxvt_fontset::new_font (const char *name, codeset cs)	1509	rxvt_fontset::new_font (const char *name, codeset cs)
1364	{	1510	{
1365	rxvt_font *f;	1511	rxvt_font *f;
1366		1512
1367	if (!name \|\| !*name)	1513	if (!name \|\| !*name)
1368	{	1514	{
1369	name = "";	1515	name = "";
1370	f = new rxvt_font_default (this);	1516	f = new rxvt_font_default (this);
1371	}	1517	}
…		…
1382	f = new rxvt_font_x11;	1528	f = new rxvt_font_x11;
1383	}	1529	}
1384	else	1530	else
1385	f = new rxvt_font_x11;	1531	f = new rxvt_font_x11;
1386		1532
1387	f->set_term (term);
1388	f->set_name (strdup (name));	1533	f->set_name (strdup (name));
1389		1534	prepare_font (f, cs);
1390	f->cs = cs;
1391	f->loaded = false;
1392		1535
1393	return f;	1536	return f;
1394	}	1537	}
1395		1538
1396	/////////////////////////////////////////////////////////////////////////////	1539	/////////////////////////////////////////////////////////////////////////////
		1540
		1541	void
		1542	rxvt_fontset::push_font (rxvt_font *font)
		1543	{
		1544	if (fonts.size () == fontCount)
		1545	{
		1546	rxvt_font *f = new rxvt_font_overflow (this);
		1547
		1548	prepare_font (f, CS_UNICODE);
		1549	fonts.push_back (f);
		1550	}
		1551
		1552	fonts.push_back (font);
		1553	}
1397		1554
1398	void	1555	void
1399	rxvt_fontset::add_fonts (const char *desc)	1556	rxvt_fontset::add_fonts (const char *desc)
1400	{	1557	{
1401	if (desc)	1558	if (desc)
…		…
1439	if (!end)	1596	if (!end)
1440	end = desc + strlen (desc);	1597	end = desc + strlen (desc);
1441		1598
1442	if (end - desc < 511)	1599	if (end - desc < 511)
1443	{	1600	{
1444	strncpy (buf, desc, end - desc);	1601	memcpy (buf, desc, end - desc);
1445	buf[end - desc] = 0;	1602	buf[end - desc] = 0;
1446		1603
1447	fonts.push_back (new_font (buf, cs));	1604	push_font (new_font (buf, cs));
1448	}	1605	}
1449	else	1606	else
1450	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1607	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1451		1608
1452	desc = end + 1;	1609	desc = end + 1;
…		…
1464	if (fonts[i]->loaded)	1621	if (fonts[i]->loaded)
1465	return true;	1622	return true;
1466		1623
1467	fonts[i]->loaded = true;	1624	fonts[i]->loaded = true;
1468		1625
1469	if (!fonts[i]->load (prop))	1626	if (!fonts[i]->load (prop, force_prop))
1470	{	1627	{
1471	fonts[i]->cs = CS_UNKNOWN;	1628	fonts[i]->cs = CS_UNKNOWN;
1472	return false;	1629	return false;
1473	}	1630	}
1474		1631
…		…
1480	{	1637	{
1481	clear ();	1638	clear ();
1482		1639
1483	fontdesc = strdup (desc);	1640	fontdesc = strdup (desc);
1484		1641
1485	fonts.push_back (new_font (0, CS_UNICODE));	1642	push_font (new_font (0, CS_UNICODE));
1486	realize_font (0);	1643	realize_font (0);
1487		1644
1488	add_fonts (desc);	1645	add_fonts (desc);
1489		1646
1490	return true;	1647	return true;
…		…
1499		1656
1500	return -1;	1657	return -1;
1501	}	1658	}
1502		1659
1503	int	1660	int
1504	rxvt_fontset::find_font (unicode_t unicode)	1661	rxvt_fontset::find_font_idx (unicode_t unicode)
1505	{	1662	{
1506	if (unicode >= 1<<20)	1663	if (unicode >= 1<<20)
1507	return 0;	1664	return 0;
1508		1665
1509	unicode_t hi = unicode >> 8;	1666	unicode_t hi = unicode >> 8;
…		…
1535	goto next_font;	1692	goto next_font;
1536		1693
1537	bool careful;	1694	bool careful;
1538	if (f->has_char (unicode, &prop, careful))	1695	if (f->has_char (unicode, &prop, careful))
1539	{	1696	{
1540	if (careful)	1697	i = (i << 1) \| careful;
1541	i \|= 128;
1542		1698
1543	goto found;	1699	goto found;
1544	}	1700	}
1545		1701
1546	next_font:	1702	next_font:
1547	if (i == fonts.size () - 1)	1703	if (i == fonts.size () - 1)
1548	{	1704	{
1549	if (fallback->name)	1705	if (fallback->name)
1550	{	1706	{
1551	// search through the fallback list	1707	// search through the fallback list
1552	fonts.push_back (new_font (fallback->name, fallback->cs));	1708	push_font (new_font (fallback->name, fallback->cs));
1553	fallback++;	1709	fallback++;
1554	}	1710	}
1555	else	1711	else
1556	{	1712	{
1557	// try to find a new font.	1713	// try to find a new font.
…		…
1575	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1731	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576	FcPatternAddBool (p, FC_MINSPACE, 1);	1732	FcPatternAddBool (p, FC_MINSPACE, 1);
1577	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1733	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578		1734
1579	XftResult result;	1735	XftResult result;
1580	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1736	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581		1737
1582	FcPatternDestroy (p);	1738	FcPatternDestroy (p);
1583		1739
1584	if (match)	1740	if (match)
1585	{	1741	{
…		…
1588	FcPatternDestroy (match);	1744	FcPatternDestroy (match);
1589		1745
1590	if (find_font (font) < 0)	1746	if (find_font (font) < 0)
1591	{	1747	{
1592	char fontname[4096];	1748	char fontname[4096];
1593	sprintf (fontname, "xft:%-.4090s", font);	1749	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1594		1750
1595	fonts.push_back (new_font (fontname, CS_UNICODE));	1751	push_font (new_font (fontname, CS_UNICODE));
1596	}	1752	}
1597		1753
1598	free (font);	1754	free (font);
1599	}	1755	}
1600	#endif	1756	#endif
…		…
1622	}	1778	}
1623		1779
1624	return i;	1780	return i;
1625	}	1781	}
1626		1782
1627
1628

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs. Revision 1.162 by root, Wed Mar 31 22:46:40 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.91 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.162 by root, Wed Mar 31 22:46:40 2010 UTC