[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.157 by root, Tue Mar 30 23:38:02 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
446	text_t chrs[2];	449	text_t chrs[2];
447	chrs [1] = NOCHAR;	450	chrs [1] = NOCHAR;
448		451
449	*chrs = cc->c1;	452	*chrs = cc->c1;
450	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	453	rxvt_font *f1 = fs->get (cc->c1);
451	f1->draw (d, x, y, chrs, width, fg, bg);	454	f1->draw (d, x, y, chrs, width, fg, bg);
452		455
453	if (cc->c2 != NOCHAR)	456	if (cc->c2 != NOCHAR)
454	{	457	{
455	bool careful;	458	bool careful;
456		459
457	// prefer font of first character, for no good reasons	460	// prefer font of first character, for no good reasons
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->get (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)
…		…
488		491
489	void clear ();	492	void clear ();
490		493
491	rxvt_fontprop properties ();	494	rxvt_fontprop properties ();
492		495
493	bool load (const rxvt_fontprop &prop);	496	bool load (const rxvt_fontprop &prop, bool force_prop);
494		497
495	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	498	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
496		499
497	void draw (rxvt_drawable &d, int x, int y,	500	void draw (rxvt_drawable &d, int x, int y,
498	const text_t *text, int len,	501	const text_t *text, int len,
499	int fg, int bg);	502	int fg, int bg);
500		503
501	bool slow; // wether this is a proportional font or has other funny characteristics	504	bool slow; // wether this is a proportional font or has other funny characteristics
502	XFontStruct *f;	505	XFontStruct *f;
503	codeset cs;
504	bool enc2b, encm;	506	bool enc2b, encm;
505		507
506	char get_property (XFontStruct f, Atom property, const char *repl) const;	508	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);	509	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);	510	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
513	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const	515	rxvt_font_x11::get_property (XFontStruct f, Atom property, const char repl) const
514	{	516	{
515	unsigned long value;	517	unsigned long value;
516		518
517	if (XGetFontProperty (f, property, &value))	519	if (XGetFontProperty (f, property, &value))
518	return XGetAtomName (term->xdisp, value);	520	return XGetAtomName (term->dpy, value);
519	else	521	else
520	return rxvt_strdup (repl);	522	return repl ? strdup (repl) : 0;
521	}	523	}
522		524
523	rxvt_fontprop	525	rxvt_fontprop
524	rxvt_font_x11::properties ()	526	rxvt_font_x11::properties ()
525	{	527	{
…		…
546	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	548	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
547	{	549	{
548	unsigned long height;	550	unsigned long height;
549		551
550	#if 0	552	#if 0
551	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	553	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
552	return false;	554	return false;
553	#else	555	#else
554	height = f->ascent + f->descent;	556	height = f->ascent + f->descent;
555	#endif	557	#endif
556		558
…		…
607	return false;	609	return false;
608	}	610	}
609		611
610	// fix the size of scalable fonts	612	// fix the size of scalable fonts
611	static bool	613	static bool
612	replace_field (char buf, const char name, int index, const char old, const char *replace)	614	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
613	{	615	{
614	int slashes = 0;	616	int slashes = 0;
615	const char field, end;	617	const char field, end;
616		618
617	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
627	break;	629	break;
628	}	630	}
629		631
630	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
631	{	633	{
632	// TODO: check for overflow in font-name	634	size_t len = field - name;
633	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
634	buf += field - name;	636	memcpy (*ptr, name, len);
635	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
636	strcat (buf, end);	638	strcat (*ptr, end);
637		639
638	return true;	640	return true;
639	}	641	}
640	else	642	else
641	{	643	{
642	strcpy (buf, name);	644	*ptr = strdup (name);
643		645
644	return false;	646	return false;
645	}	647	}
646	}	648	}
647		649
648	bool	650	bool
649	rxvt_font_x11::load (const rxvt_fontprop &prop)	651	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
650	{	652	{
651	dTermDisplay;	653	dTermDisplay;
652		654
653	clear ();	655	clear ();
654		656
655	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
656		658
657	// first morph the font if required	659	// first morph the font if required
658	if (prop.weight != rxvt_fontprop::unset	660	if (force_prop)
659	\|\| prop.slant != rxvt_fontprop::unset)
660	{	661	{
661	char fname[1024];	662	char *fname;
662		663
663	if (name[0] != '-')	664	if (name[0] != '-')
664	{	665	{
665	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
666		667
…		…
678	f = 0;	679	f = 0;
679	}	680	}
680		681
681	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
682	{	683	{
683	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
684	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
685	? "medium" : "bold");	686	? "medium" : "bold");
686	set_name (strdup (fname));	687	set_name (fname);
687	}	688	}
688		689
689	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
690	{	691	{
691	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
692	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
693	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
694	set_name (strdup (fname));	695	set_name (fname);
695	}	696	}
696	}	697	}
697		698
698	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699	? 0 : prop.height);	700	? 0 : prop.height);
…		…
724	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
725		726
726	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
727	{	728	{
728	rxvt_fontprop p;	729	rxvt_fontprop p;
729	char fname[1024];	730	char *fname;
730		731
731	int diff = 0;	732	int diff = 0;
732		733
733	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
734	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
735	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
736	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
737		742
738	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
739	continue;	744	continue;
740		745
741	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
745	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	750	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);	751	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);	752	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);	753	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749		754
750	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
751	fonts[i].diff = diff;	756	fonts[i].diff = diff;
752	}	757	}
753		758
754	XFreeFontNames (list);	759	XFreeFontNames (list);
755		760
…		…
787	return false;	792	return false;
788		793
789	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791		796
		797	cs = CS_UNKNOWN;
		798
792	if (registry && encoding)	799	if (registry && encoding)
793	{	800	{
794	char charset[64];	801	char charset[64];
795	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
796		803
797	cs = codeset_from_name (charset);	804	cs = codeset_from_name (charset);
		805
		806	if (cs == CS_UNKNOWN)
		807	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
798	}	808	}
799	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
800	{	814	{
801	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
802		816
803	if (!charset)	817	if (!charset)
804	charset = name;	818	charset = name;
…		…
807	while (*charset)	821	while (*charset)
808	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
809	break;	823	break;
810		824
811	cs = codeset_from_name (charset);	825	cs = codeset_from_name (charset);
		826	if (cs == CS_UNKNOWN)
		827	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		828	}
		829
		830	if (cs == CS_UNKNOWN)
812	}	831	{
813		832	clear ();
814	free (registry);	833	return false;
815	free (encoding);	834	}
816		835
817	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
818	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	837	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819		838
820	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
832	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	851	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
833		852
834	if (encm)	853	if (encm)
835	N += (f->max_byte1 - f->min_byte1)	854	N += (f->max_byte1 - f->min_byte1)
836	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	855	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
837		856
838	while (N)	857	while (N)
839	{	858	{
840	if (f->per_char[N].width > width)	859	if (f->per_char[N].width > width)
841	width = f->per_char[N].width;	860	width = f->per_char[N].width;
842		861
…		…
861		880
862	XCharStruct g;	881	XCharStruct g;
863	int dir_ret, asc_ret, des_ret;	882	int dir_ret, asc_ret, des_ret;
864	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	883	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865		884
		885	int wcw = WCWIDTH (*t);
866	int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
867		887
868	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
869	}	889	}
870		890
871	if (cs == CS_UNKNOWN)	891	#if 0 // do it per-character
		892	if (prop && width > prop->width)
872	{	893	{
873	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
874
875	clear ();	894	clear ();
876	return false;	895	return false;
877	}	896	}
878
879	#if 0 // do it per-character
880	if (prop && width > prop->width)
881	{
882	clear ();
883	return false;
884	}
885	#endif	897	#endif
886		898
887	return true;	899	return true;
888	}	900	}
889		901
890	void	902	void
891	rxvt_font_x11::clear ()	903	rxvt_font_x11::clear ()
892	{	904	{
893	if (f)	905	if (f)
894	{	906	{
895	XFreeFont (term->xdisp, f);	907	XFreeFont (term->dpy, f);
896	f = 0;	908	f = 0;
897	}	909	}
898	}	910	}
899		911
900	bool	912	bool
…		…
945	if (!prop \|\| prop->width == rxvt_fontprop::unset)	957	if (!prop \|\| prop->width == rxvt_fontprop::unset)
946	return true;	958	return true;
947		959
948	// check wether character overlaps previous/next character	960	// check wether character overlaps previous/next character
949	int w = xcs->rbearing - xcs->lbearing;	961	int w = xcs->rbearing - xcs->lbearing;
950	int wcw = WCWIDTH (unicode);	962	int wcw = max (WCWIDTH (unicode), 1);
951		963
952	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	964	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
953		965
954	if (careful && !OVERLAP_OK (w, wcw, prop))	966	if (careful && !OVERLAP_OK (w, wcw, prop))
955	return false;	967	return false;
…		…
993	else	1005	else
994	{	1006	{
995	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1007	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
996		1008
997	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1009	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
998		1010
999	if (slow)	1011	if (slow)
1000	{	1012	{
1001	do	1013	do
1002	{	1014	{
1003	if (xc->byte1 \|\| xc->byte2)	1015	if (xc->byte1 \|\| xc->byte2)
…		…
1025	else	1037	else
1026	{	1038	{
1027	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1039	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1028		1040
1029	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1041	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1030		1042
1031	if (slow)	1043	if (slow)
1032	{	1044	{
1033	do	1045	do
1034	{	1046	{
1035	if (*xc)	1047	if (*xc)
…		…
1055		1067
1056	void clear ();	1068	void clear ();
1057		1069
1058	rxvt_fontprop properties ();	1070	rxvt_fontprop properties ();
1059		1071
1060	bool load (const rxvt_fontprop &prop);	1072	bool load (const rxvt_fontprop &prop, bool force_prop);
1061		1073
1062	void draw (rxvt_drawable &d, int x, int y,	1074	void draw (rxvt_drawable &d, int x, int y,
1063	const text_t *text, int len,	1075	const text_t *text, int len,
1064	int fg, int bg);	1076	int fg, int bg);
1065		1077
1066	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1078	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1067		1079
1068	protected:	1080	protected:
1069	XftFont *f;	1081	XftFont *f;
1070	};	1082	};
1071		1083
1072	void	1084	void
1073	rxvt_font_xft::clear ()	1085	rxvt_font_xft::clear ()
1074	{	1086	{
1075	if (f)	1087	if (f)
1076	{	1088	{
1077	XftFontClose (term->xdisp, f);	1089	XftFontClose (term->dpy, f);
1078	f = 0;	1090	f = 0;
1079	}	1091	}
1080	}	1092	}
1081		1093
1082	rxvt_fontprop	1094	rxvt_fontprop
…		…
1098		1110
1099	return p;	1111	return p;
1100	}	1112	}
1101		1113
1102	bool	1114	bool
1103	rxvt_font_xft::load (const rxvt_fontprop &prop)	1115	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1104	{	1116	{
1105	dTermDisplay;	1117	dTermDisplay;
1106		1118
1107	clear ();	1119	clear ();
1108		1120
…		…
1117	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1129	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1118	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1130	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1119	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1131	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1120		1132
1121	if (prop.weight != rxvt_fontprop::unset	1133	if (prop.weight != rxvt_fontprop::unset
1122	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1134	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1123	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1135	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1124		1136
1125	if (prop.slant != rxvt_fontprop::unset	1137	if (prop.slant != rxvt_fontprop::unset
1126	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1138	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1127	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1128		1140
1129	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1130	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1131	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1132	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1133	#endif	1145	#endif
1134		1146
1135	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1136	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1137		1149
…		…
1249	bool	1261	bool
1250	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1262	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1251	{	1263	{
1252	careful = false;	1264	careful = false;
1253		1265
1254	if (!XftCharExists (term->xdisp, f, unicode))	1266	if (!XftCharExists (term->dpy, f, unicode))
1255	return false;	1267	return false;
1256		1268
1257	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1269	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1258	return true;	1270	return true;
1259		1271
1260	// check character against base font bounding box	1272	// check character against base font bounding box
1261	FcChar32 ch = unicode;	1273	FcChar32 ch = unicode;
1262	XGlyphInfo g;	1274	XGlyphInfo g;
1263	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1275	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1264		1276
1265	int w = g.width - g.x;	1277	int w = g.width - g.x;
1266	int wcw = WCWIDTH (unicode);	1278	int wcw = max (WCWIDTH (unicode), 1);
1267		1279
1268	careful = g.x > 0 \|\| w > prop->width * wcw;	1280	careful = g.x > 0 \|\| w > prop->width * wcw;
1269		1281
1270	if (careful && !OVERLAP_OK (w, wcw, prop))	1282	if (careful && !OVERLAP_OK (w, wcw, prop))
1271	return false;	1283	return false;
…		…
1280	void	1292	void
1281	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1282	const text_t *text, int len,	1294	const text_t *text, int len,
1283	int fg, int bg)	1295	int fg, int bg)
1284	{	1296	{
1285	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1286
1287	XGlyphInfo extents;	1297	XGlyphInfo extents;
1288	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1289	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1290		1300
1291	dTermDisplay;	1301	dTermDisplay;
1292	dTermGC;	1302	dTermGC;
		1303
		1304	int w = term->fwidth * len;
		1305	int h = term->fheight;
		1306
		1307	bool buffered = bg >= Color_transparent
		1308	&& term->option (Opt_buffered);
1293		1309
1294	// cut trailing spaces	1310	// cut trailing spaces
1295	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1296	len--;	1312	len--;
1297		1313
		1314	int x_ = buffered ? 0 : x;
		1315	int y_ = buffered ? 0 : y;
		1316
1298	while (len)	1317	while (len)
1299	{	1318	{
1300	int cwidth = term->fwidth;	1319	int cwidth = term->fwidth;
1301	FcChar32 fc = *text++; len--;	1320	FcChar32 fc = *text++; len--;
1302		1321
1303	while (len && *text == NOCHAR)	1322	while (len && *text == NOCHAR)
1304	text++, len--, cwidth += term->fwidth;	1323	text++, len--, cwidth += term->fwidth;
1305		1324
1306	if (fc != ' ') // skip spaces	1325	if (fc != ' ') // skip spaces
1307	{	1326	{
1308	FT_UInt glyph = XftCharIndex (disp, f, fc);	1327	FT_UInt glyph = XftCharIndex (disp, f, fc);
1309	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1328	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1310		1329
1311
1312	ep->glyph = glyph;	1330	ep->glyph = glyph;
1313	ep->x = x + (cwidth - extents.xOff >> 1);	1331	ep->x = x_ + (cwidth - extents.xOff >> 1);
1314	ep->y = y + ascent;	1332	ep->y = y_ + ascent;
1315		1333
1316	if (extents.xOff == 0)	1334	if (extents.xOff == 0)
1317	ep->x = x + cwidth;	1335	ep->x = x_ + cwidth;
1318		1336
1319	ep++;	1337	ep++;
1320	}	1338	}
1321		1339
1322	x += cwidth;	1340	x_ += cwidth;
		1341	}
		1342
		1343	if (buffered)
1323	}	1344	{
1324
1325	if (ep != enc)	1345	if (ep != enc)
		1346	{
		1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1348
		1349	#ifdef HAVE_BG_PIXMAP
		1350	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1351
		1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1355	{
		1356	int src_x = x, src_y = y;
		1357
		1358	if (term->bgPixmap.is_parentOrigin ())
		1359	{
		1360	src_x += term->window_vt_x;
		1361	src_y += term->window_vt_y;
		1362	}
		1363
		1364	if (term->bgPixmap.pmap_width >= src_x + w
		1365	&& term->bgPixmap.pmap_height >= src_y + h)
		1366	{
		1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1368	src_x, src_y, w, h, 0, 0);
		1369	}
		1370	else
		1371	{
		1372	XGCValues gcv;
		1373
		1374	gcv.fill_style = FillTiled;
		1375	gcv.tile = term->bgPixmap.pixmap;
		1376	gcv.ts_x_origin = -src_x;
		1377	gcv.ts_y_origin = -src_y;
		1378
		1379	XChangeGC (disp, gc,
		1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1381	&gcv);
		1382
		1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1384
		1385	gcv.fill_style = FillSolid;
		1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1387	}
		1388
		1389	if (dst)
		1390	{
		1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
		1393	// dst can only be set when bg >= 0
		1394	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1395	}
		1396	}
		1397	else
		1398	#endif
		1399	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
		1400
		1401	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1402	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1403	}
		1404	else
		1405	clear_rect (d, x, y, w, h, bg);
		1406	}
		1407	else
		1408	{
		1409	clear_rect (d, x, y, w, h, bg);
1326	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1410	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1411	}
1327	}	1412	}
		1413
1328	#endif	1414	#endif
1329		1415
1330	/////////////////////////////////////////////////////////////////////////////	1416	/////////////////////////////////////////////////////////////////////////////
1331		1417
1332	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1418	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1343	void	1429	void
1344	rxvt_fontset::clear ()	1430	rxvt_fontset::clear ()
1345	{	1431	{
1346	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1432	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347	= rxvt_fontprop::unset;	1433	= rxvt_fontprop::unset;
		1434	force_prop = false;
1348		1435
1349	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1436	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350	FONT_UNREF (*i);	1437	FONT_UNREF (*i);
1351		1438
1352	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1439	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1361		1448
1362	rxvt_font *	1449	rxvt_font *
1363	rxvt_fontset::new_font (const char *name, codeset cs)	1450	rxvt_fontset::new_font (const char *name, codeset cs)
1364	{	1451	{
1365	rxvt_font *f;	1452	rxvt_font *f;
1366		1453
1367	if (!name \|\| !*name)	1454	if (!name \|\| !*name)
1368	{	1455	{
1369	name = "";	1456	name = "";
1370	f = new rxvt_font_default (this);	1457	f = new rxvt_font_default (this);
1371	}	1458	}
…		…
1439	if (!end)	1526	if (!end)
1440	end = desc + strlen (desc);	1527	end = desc + strlen (desc);
1441		1528
1442	if (end - desc < 511)	1529	if (end - desc < 511)
1443	{	1530	{
1444	strncpy (buf, desc, end - desc);	1531	memcpy (buf, desc, end - desc);
1445	buf[end - desc] = 0;	1532	buf[end - desc] = 0;
1446		1533
1447	fonts.push_back (new_font (buf, cs));	1534	fonts.push_back (new_font (buf, cs));
1448	}	1535	}
1449	else	1536	else
…		…
1464	if (fonts[i]->loaded)	1551	if (fonts[i]->loaded)
1465	return true;	1552	return true;
1466		1553
1467	fonts[i]->loaded = true;	1554	fonts[i]->loaded = true;
1468		1555
1469	if (!fonts[i]->load (prop))	1556	if (!fonts[i]->load (prop, force_prop))
1470	{	1557	{
1471	fonts[i]->cs = CS_UNKNOWN;	1558	fonts[i]->cs = CS_UNKNOWN;
1472	return false;	1559	return false;
1473	}	1560	}
1474		1561
…		…
1499		1586
1500	return -1;	1587	return -1;
1501	}	1588	}
1502		1589
1503	int	1590	int
1504	rxvt_fontset::find_font (unicode_t unicode)	1591	rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1505	{	1592	{
1506	if (unicode >= 1<<20)	1593	if (unicode >= 1<<20)
1507	return 0;	1594	return 0;
1508		1595
1509	unicode_t hi = unicode >> 8;	1596	unicode_t hi = unicode >> 8;
1510		1597
1511	if (hi < fmap.size ()	1598	if (hi < fmap.size () && fmap[hi])
1512	&& fmap[hi]	1599	{
1513	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1600	unsigned char m = (*fmap[hi])[unicode & 0xff];
1514	return (*fmap[hi])[unicode & 0xff];	1601
		1602	if (m != 0xff)
		1603	{
		1604	careful = m & 128;
		1605	return m & 127;
		1606	}
		1607	}
1515		1608
1516	unsigned int i;	1609	unsigned int i;
1517		1610
1518	for (i = 0; i < fonts.size (); i++)	1611	for (i = 0; i < fonts.size (); i++)
1519	{	1612	{
…		…
1532	}	1625	}
1533		1626
1534	if (f->cs == CS_UNKNOWN)	1627	if (f->cs == CS_UNKNOWN)
1535	goto next_font;	1628	goto next_font;
1536		1629
1537	bool careful;
1538	if (f->has_char (unicode, &prop, careful))	1630	if (f->has_char (unicode, &prop, careful))
1539	{
1540	if (careful)
1541	i \|= 128;
1542
1543	goto found;	1631	goto found;
1544	}
1545		1632
1546	next_font:	1633	next_font:
1547	if (i == fonts.size () - 1)	1634	if (i == fonts.size () - 1)
1548	{	1635	{
1549	if (fallback->name)	1636	if (fallback->name)
…		…
1575	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1662	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576	FcPatternAddBool (p, FC_MINSPACE, 1);	1663	FcPatternAddBool (p, FC_MINSPACE, 1);
1577	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1664	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578		1665
1579	XftResult result;	1666	XftResult result;
1580	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1667	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581		1668
1582	FcPatternDestroy (p);	1669	FcPatternDestroy (p);
1583		1670
1584	if (match)	1671	if (match)
1585	{	1672	{
…		…
1588	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1589		1676
1590	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1591	{	1678	{
1592	char fontname[4096];	1679	char fontname[4096];
1593	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1594		1681
1595	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1596	}	1683	}
1597		1684
1598	free (font);	1685	free (font);
1599	}	1686	}
1600	#endif	1687	#endif
…		…
1602	}	1689	}
1603	}	1690	}
1604		1691
1605	/* we must return SOME font */	1692	/* we must return SOME font */
1606	i = 0;	1693	i = 0;
		1694	careful = false;
1607		1695
1608	found:	1696	found:
1609	// found a font, cache it	1697	// found a font, cache it
1610	if (i < 255)	1698	if (i < 127)
1611	{	1699	{
1612	while (hi >= fmap.size ())	1700	while (hi >= fmap.size ())
1613	fmap.push_back (0);	1701	fmap.push_back (0);
1614		1702
1615	if (!fmap[hi])	1703	if (!fmap[hi])
1616	{	1704	{
1617	fmap[hi] = (pagemap *)new pagemap;	1705	fmap[hi] = (pagemap *)new pagemap;
1618	memset (fmap[hi], 0xff, sizeof (pagemap));	1706	memset (fmap[hi], 0xff, sizeof (pagemap));
1619	}	1707	}
1620		1708
1621	(*fmap[hi])[unicode & 0xff] = i;	1709	(*fmap[hi])[unicode & 0xff] = i \| (careful ? 128 : 0);
1622	}	1710	}
1623		1711
1624	return i;	1712	return i;
1625	}	1713	}
1626		1714
		1715	int
		1716	rxvt_fontset::find_font (unicode_t unicode)
		1717	{
		1718	bool careful;
		1719	int id = find_font_idx (unicode, careful);
1627		1720
		1721	return min<int> (fontCount, id) \| (careful ? Careful : 0);
		1722	}
1628		1723

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.157 by root, Tue Mar 30 23:38:02 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.157 by root, Tue Mar 30 23:38:02 2010 UTC