[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.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" },
…		…
158	0x304c, 0x672c, // が本	157	0x304c, 0x672c, // が本
159	};	158	};
160		159
161	#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]))
162		161
163	#define dTermDisplay Display *disp = term->xdisp	162	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	163	#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		164
184	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
185		166
186	static const char *	167	static const char *
187	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)
…		…
235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236	{	217	{
237	}	218	}
238		219
239	void	220	void
240	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
241	{	222	{
242	if (this->name == name)	223	if (name == name_)
243	return;	224	return;
244		225
245	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
246	this->name = name;	227	name = name_;
247	}	228	}
248		229
249	void	230	void
250	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
251	{	232	{
252	dTermDisplay;	233	dTermDisplay;
253	dTermGC;	234	dTermGC;
254		235
255	if (color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
256	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
257	else if (color >= 0)	238	else if (color >= 0)
258	{	239	{
259	#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
260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
261	#else	257	#else
262	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
263	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
264	#endif	260	#endif
265	}	261	}
266	}	262	}
267		263
268	/////////////////////////////////////////////////////////////////////////////	264	/////////////////////////////////////////////////////////////////////////////
269
270	#include "table/linedraw.h"
271		265
272	struct rxvt_font_default : rxvt_font {	266	struct rxvt_font_default : rxvt_font {
273	struct rxvt_fontset *fs;	267	struct rxvt_fontset *fs;
274		268
275	rxvt_font_default (rxvt_fontset *fs)	269	rxvt_font_default (rxvt_fontset *fs)
…		…
288	p.slant = rxvt_fontprop::roman;	282	p.slant = rxvt_fontprop::roman;
289		283
290	return p;	284	return p;
291	}	285	}
292		286
293	bool load (const rxvt_fontprop &prop)	287	bool load (const rxvt_fontprop &prop, bool force_prop)
294	{	288	{
295	width = 1; height = 1;	289	width = 1; height = 1;
296	ascent = 1; descent = 0;	290	ascent = 1; descent = 0;
297		291
298	set_name (strdup ("built-in support font"));	292	set_name (strdup ("built-in support font"));
…		…
311	return false;	305	return false;
312		306
313	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
314	return true;	308	return true;
315		309
		310	#ifdef BUILTIN_GLYPHS
316	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
317	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
318	return true;	313	return true;
		314	#endif
319		315
320	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
321	return true;	317	return true;
322		318
323	switch (unicode)	319	switch (unicode)
…		…
359	;	355	;
360		356
361	int width = text - tp;	357	int width = text - tp;
362	int fwidth = term->fwidth * width;	358	int fwidth = term->fwidth * width;
363		359
		360	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
365	{	362	{
		363	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	364	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	365	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	366	uint32_t *b = a + (offs & 15);
369		367
370	int W = fwidth;	368	int W = fwidth;
…		…
408		406
409	case 1: // rectangle, possibly stippled	407	case 1: // rectangle, possibly stippled
410	if (a)	408	if (a)
411	{	409	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	410	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		411
414	gcv.fill_style = FillStippled;	412	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	413	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	414	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	415	gcv.ts_y_origin = y;
418		416
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	435	(a - 1) * 9064, (b - 1) 90*64);
438	break;	436	break;
439	}	437	}
440	}	438	}
441	}	439	}
		440	#else
		441	if (0)
		442	;
		443	#endif
442	#if ENABLE_COMBINING	444	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	445	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	446	{
445	min_it (width, 2); // we only support wcwidth up to 2	447	min_it (width, 2); // we only support wcwidth up to 2
446		448
447	text_t chrs[2];	449	text_t chrs[2];
448	chrs [1] = NOCHAR;	450	chrs [1] = NOCHAR;
449		451
450	*chrs = cc->c1;	452	*chrs = cc->c1;
451	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	453	rxvt_font *f1 = fs->get (cc->c1);
452	f1->draw (d, x, y, chrs, width, fg, bg);	454	f1->draw (d, x, y, chrs, width, fg, bg);
453		455
454	if (cc->c2 != NOCHAR)	456	if (cc->c2 != NOCHAR)
455	{	457	{
456	bool careful;	458	bool careful;
457		459
458	// prefer font of first character, for no good reasons	460	// prefer font of first character, for no good reasons
459	*chrs = cc->c2;	461	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	463	? f1
462	: (*fs)[fs->find_font (cc->c2)];	464	: fs->get (cc->c2);
463		465
464	f2->draw (d, x, y, chrs, width, fg, -1);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	467	}
466	}	468	}
467	#endif	469	#endif
468	else	470	else
469	switch (t)	471	switch (t)
…		…
489		491
490	void clear ();	492	void clear ();
491		493
492	rxvt_fontprop properties ();	494	rxvt_fontprop properties ();
493		495
494	bool load (const rxvt_fontprop &prop);	496	bool load (const rxvt_fontprop &prop, bool force_prop);
495		497
496	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;
497		499
498	void draw (rxvt_drawable &d, int x, int y,	500	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	501	const text_t *text, int len,
500	int fg, int bg);	502	int fg, int bg);
501		503
502	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
503	XFontStruct *f;	505	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	506	bool enc2b, encm;
506		507
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	508	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);	509	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);	510	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
514	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
515	{	516	{
516	unsigned long value;	517	unsigned long value;
517		518
518	if (XGetFontProperty (f, property, &value))	519	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->xdisp, value);	520	return XGetAtomName (term->dpy, value);
520	else	521	else
521	return rxvt_strdup (repl);	522	return repl ? strdup (repl) : 0;
522	}	523	}
523		524
524	rxvt_fontprop	525	rxvt_fontprop
525	rxvt_font_x11::properties ()	526	rxvt_font_x11::properties ()
526	{	527	{
…		…
547	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	548	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
548	{	549	{
549	unsigned long height;	550	unsigned long height;
550		551
551	#if 0	552	#if 0
552	if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))	553	if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
553	return false;	554	return false;
554	#else	555	#else
555	height = f->ascent + f->descent;	556	height = f->ascent + f->descent;
556	#endif	557	#endif
557		558
…		…
608	return false;	609	return false;
609	}	610	}
610		611
611	// fix the size of scalable fonts	612	// fix the size of scalable fonts
612	static bool	613	static bool
613	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)
614	{	615	{
615	int slashes = 0;	616	int slashes = 0;
616	const char field, end;	617	const char field, end;
617		618
618	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
628	break;	629	break;
629	}	630	}
630		631
631	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
632	{	633	{
633	// TODO: check for overflow in font-name	634	size_t len = field - name;
634	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	636	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
637	strcat (buf, end);	638	strcat (*ptr, end);
638		639
639	return true;	640	return true;
640	}	641	}
641	else	642	else
642	{	643	{
643	strcpy (buf, name);	644	*ptr = strdup (name);
644		645
645	return false;	646	return false;
646	}	647	}
647	}	648	}
648		649
649	bool	650	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	651	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	652	{
652	dTermDisplay;	653	dTermDisplay;
653		654
654	clear ();	655	clear ();
655		656
656	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
657		658
658	// first morph the font if required	659	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	660	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	661	{
662	char fname[1024];	662	char *fname;
663		663
664	if (name[0] != '-')	664	if (name[0] != '-')
665	{	665	{
666	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
667		667
…		…
679	f = 0;	679	f = 0;
680	}	680	}
681		681
682	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
683	{	683	{
684	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	686	? "medium" : "bold");
687	set_name (strdup (fname));	687	set_name (fname);
688	}	688	}
689		689
690	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
691	{	691	{
692	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
693	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
694	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
695	set_name (strdup (fname));	695	set_name (fname);
696	}	696	}
697	}	697	}
698		698
699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700	? 0 : prop.height);	700	? 0 : prop.height);
…		…
725	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
726		726
727	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
728	{	728	{
729	rxvt_fontprop p;	729	rxvt_fontprop p;
730	char fname[1024];	730	char *fname;
731		731
732	int diff = 0;	732	int diff = 0;
733		733
734	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
735	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
736	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
737	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
738		742
739	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
740	continue;	744	continue;
741		745
742	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
746	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;
747	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);
748	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);
749	//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);
750		754
751	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
752	fonts[i].diff = diff;	756	fonts[i].diff = diff;
753	}	757	}
754		758
755	XFreeFontNames (list);	759	XFreeFontNames (list);
756		760
…		…
788	return false;	792	return false;
789		793
790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792		796
		797	cs = CS_UNKNOWN;
		798
793	if (registry && encoding)	799	if (registry && encoding)
794	{	800	{
795	char charset[64];	801	char charset[64];
796	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
797		803
798	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);
799	}	808	}
800	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
801	{	814	{
802	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
803		816
804	if (!charset)	817	if (!charset)
805	charset = name;	818	charset = name;
…		…
808	while (*charset)	821	while (*charset)
809	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
810	break;	823	break;
811		824
812	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)
813	}	831	{
814		832	clear ();
815	free (registry);	833	return false;
816	free (encoding);	834	}
817		835
818	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
819	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
820		838
821	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
833	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;
834		852
835	if (encm)	853	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	854	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	855	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		856
839	while (N)	857	while (N)
840	{	858	{
841	if (f->per_char[N].width > width)	859	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	860	width = f->per_char[N].width;
843		861
…		…
868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869		887
870	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
871	}	889	}
872		890
873	if (cs == CS_UNKNOWN)	891	#if 0 // do it per-character
		892	if (prop && width > prop->width)
874	{	893	{
875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877	clear ();	894	clear ();
878	return false;	895	return false;
879	}	896	}
880
881	#if 0 // do it per-character
882	if (prop && width > prop->width)
883	{
884	clear ();
885	return false;
886	}
887	#endif	897	#endif
888		898
889	return true;	899	return true;
890	}	900	}
891		901
892	void	902	void
893	rxvt_font_x11::clear ()	903	rxvt_font_x11::clear ()
894	{	904	{
895	if (f)	905	if (f)
896	{	906	{
897	XFreeFont (term->xdisp, f);	907	XFreeFont (term->dpy, f);
898	f = 0;	908	f = 0;
899	}	909	}
900	}	910	}
901		911
902	bool	912	bool
…		…
995	else	1005	else
996	{	1006	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1007	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		1008
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1009	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		1010
1001	if (slow)	1011	if (slow)
1002	{	1012	{
1003	do	1013	do
1004	{	1014	{
1005	if (xc->byte1 \|\| xc->byte2)	1015	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1037	else
1028	{	1038	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1039	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1040
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1041	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1042
1033	if (slow)	1043	if (slow)
1034	{	1044	{
1035	do	1045	do
1036	{	1046	{
1037	if (*xc)	1047	if (*xc)
…		…
1057		1067
1058	void clear ();	1068	void clear ();
1059		1069
1060	rxvt_fontprop properties ();	1070	rxvt_fontprop properties ();
1061		1071
1062	bool load (const rxvt_fontprop &prop);	1072	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1073
1064	void draw (rxvt_drawable &d, int x, int y,	1074	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1075	const text_t *text, int len,
1066	int fg, int bg);	1076	int fg, int bg);
1067		1077
1068	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;
1069		1079
1070	protected:	1080	protected:
1071	XftFont *f;	1081	XftFont *f;
1072	};	1082	};
1073		1083
1074	void	1084	void
1075	rxvt_font_xft::clear ()	1085	rxvt_font_xft::clear ()
1076	{	1086	{
1077	if (f)	1087	if (f)
1078	{	1088	{
1079	XftFontClose (term->xdisp, f);	1089	XftFontClose (term->dpy, f);
1080	f = 0;	1090	f = 0;
1081	}	1091	}
1082	}	1092	}
1083		1093
1084	rxvt_fontprop	1094	rxvt_fontprop
…		…
1100		1110
1101	return p;	1111	return p;
1102	}	1112	}
1103		1113
1104	bool	1114	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1115	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1116	{
1107	dTermDisplay;	1117	dTermDisplay;
1108		1118
1109	clear ();	1119	clear ();
1110		1120
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1129	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1130	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1131	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1132
1123	if (prop.weight != rxvt_fontprop::unset	1133	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1134	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1135	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1136
1127	if (prop.slant != rxvt_fontprop::unset	1137	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1138	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1140
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135	#endif	1145	#endif
1136		1146
1137	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1139		1149
…		…
1251	bool	1261	bool
1252	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
1253	{	1263	{
1254	careful = false;	1264	careful = false;
1255		1265
1256	if (!XftCharExists (term->xdisp, f, unicode))	1266	if (!XftCharExists (term->dpy, f, unicode))
1257	return false;	1267	return false;
1258		1268
1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1269	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1260	return true;	1270	return true;
1261		1271
1262	// check character against base font bounding box	1272	// check character against base font bounding box
1263	FcChar32 ch = unicode;	1273	FcChar32 ch = unicode;
1264	XGlyphInfo g;	1274	XGlyphInfo g;
1265	XftTextExtents32 (term->xdisp, f, &ch, 1, &g);	1275	XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1266		1276
1267	int w = g.width - g.x;	1277	int w = g.width - g.x;
1268	int wcw = max (WCWIDTH (unicode), 1);	1278	int wcw = max (WCWIDTH (unicode), 1);
1269		1279
1270	careful = g.x > 0 \|\| w > prop->width * wcw;	1280	careful = g.x > 0 \|\| w > prop->width * wcw;
…		…
1282	void	1292	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1294	const text_t *text, int len,
1285	int fg, int bg)	1295	int fg, int bg)
1286	{	1296	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289	XGlyphInfo extents;	1297	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1291	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1292		1300
1293	dTermDisplay;	1301	dTermDisplay;
1294	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);
1295		1309
1296	// cut trailing spaces	1310	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1298	len--;	1312	len--;
1299		1313
		1314	int x_ = buffered ? 0 : x;
		1315	int y_ = buffered ? 0 : y;
		1316
1300	while (len)	1317	while (len)
1301	{	1318	{
1302	int cwidth = term->fwidth;	1319	int cwidth = term->fwidth;
1303	FcChar32 fc = *text++; len--;	1320	FcChar32 fc = *text++; len--;
1304		1321
1305	while (len && *text == NOCHAR)	1322	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1323	text++, len--, cwidth += term->fwidth;
1307		1324
1308	if (fc != ' ') // skip spaces	1325	if (fc != ' ') // skip spaces
1309	{	1326	{
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1327	FT_UInt glyph = XftCharIndex (disp, f, fc);
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1328	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312		1329
1313
1314	ep->glyph = glyph;	1330	ep->glyph = glyph;
1315	ep->x = x + (cwidth - extents.xOff >> 1);	1331	ep->x = x_ + (cwidth - extents.xOff >> 1);
1316	ep->y = y + ascent;	1332	ep->y = y_ + ascent;
1317		1333
1318	if (extents.xOff == 0)	1334	if (extents.xOff == 0)
1319	ep->x = x + cwidth;	1335	ep->x = x_ + cwidth;
1320		1336
1321	ep++;	1337	ep++;
1322	}	1338	}
1323		1339
1324	x += cwidth;	1340	x_ += cwidth;
		1341	}
		1342
		1343	if (buffered)
1325	}	1344	{
1326
1327	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);
1328	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1410	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1411	}
1329	}	1412	}
		1413
1330	#endif	1414	#endif
1331		1415
1332	/////////////////////////////////////////////////////////////////////////////	1416	/////////////////////////////////////////////////////////////////////////////
1333		1417
1334	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1418	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1345	void	1429	void
1346	rxvt_fontset::clear ()	1430	rxvt_fontset::clear ()
1347	{	1431	{
1348	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1432	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1349	= rxvt_fontprop::unset;	1433	= rxvt_fontprop::unset;
		1434	force_prop = false;
1350		1435
1351	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1436	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1352	FONT_UNREF (*i);	1437	FONT_UNREF (*i);
1353		1438
1354	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1439	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1363		1448
1364	rxvt_font *	1449	rxvt_font *
1365	rxvt_fontset::new_font (const char *name, codeset cs)	1450	rxvt_fontset::new_font (const char *name, codeset cs)
1366	{	1451	{
1367	rxvt_font *f;	1452	rxvt_font *f;
1368		1453
1369	if (!name \|\| !*name)	1454	if (!name \|\| !*name)
1370	{	1455	{
1371	name = "";	1456	name = "";
1372	f = new rxvt_font_default (this);	1457	f = new rxvt_font_default (this);
1373	}	1458	}
…		…
1441	if (!end)	1526	if (!end)
1442	end = desc + strlen (desc);	1527	end = desc + strlen (desc);
1443		1528
1444	if (end - desc < 511)	1529	if (end - desc < 511)
1445	{	1530	{
1446	strncpy (buf, desc, end - desc);	1531	memcpy (buf, desc, end - desc);
1447	buf[end - desc] = 0;	1532	buf[end - desc] = 0;
1448		1533
1449	fonts.push_back (new_font (buf, cs));	1534	fonts.push_back (new_font (buf, cs));
1450	}	1535	}
1451	else	1536	else
…		…
1466	if (fonts[i]->loaded)	1551	if (fonts[i]->loaded)
1467	return true;	1552	return true;
1468		1553
1469	fonts[i]->loaded = true;	1554	fonts[i]->loaded = true;
1470		1555
1471	if (!fonts[i]->load (prop))	1556	if (!fonts[i]->load (prop, force_prop))
1472	{	1557	{
1473	fonts[i]->cs = CS_UNKNOWN;	1558	fonts[i]->cs = CS_UNKNOWN;
1474	return false;	1559	return false;
1475	}	1560	}
1476		1561
…		…
1501		1586
1502	return -1;	1587	return -1;
1503	}	1588	}
1504		1589
1505	int	1590	int
1506	rxvt_fontset::find_font (unicode_t unicode)	1591	rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1507	{	1592	{
1508	if (unicode >= 1<<20)	1593	if (unicode >= 1<<20)
1509	return 0;	1594	return 0;
1510		1595
1511	unicode_t hi = unicode >> 8;	1596	unicode_t hi = unicode >> 8;
1512		1597
1513	if (hi < fmap.size ()	1598	if (hi < fmap.size () && fmap[hi])
1514	&& fmap[hi]	1599	{
1515	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1600	unsigned char m = (*fmap[hi])[unicode & 0xff];
1516	return (*fmap[hi])[unicode & 0xff];	1601
		1602	if (m != 0xff)
		1603	{
		1604	careful = m & 128;
		1605	return m & 127;
		1606	}
		1607	}
1517		1608
1518	unsigned int i;	1609	unsigned int i;
1519		1610
1520	for (i = 0; i < fonts.size (); i++)	1611	for (i = 0; i < fonts.size (); i++)
1521	{	1612	{
…		…
1534	}	1625	}
1535		1626
1536	if (f->cs == CS_UNKNOWN)	1627	if (f->cs == CS_UNKNOWN)
1537	goto next_font;	1628	goto next_font;
1538		1629
1539	bool careful;
1540	if (f->has_char (unicode, &prop, careful))	1630	if (f->has_char (unicode, &prop, careful))
1541	{
1542	if (careful)
1543	i \|= 128;
1544
1545	goto found;	1631	goto found;
1546	}
1547		1632
1548	next_font:	1633	next_font:
1549	if (i == fonts.size () - 1)	1634	if (i == fonts.size () - 1)
1550	{	1635	{
1551	if (fallback->name)	1636	if (fallback->name)
…		…
1577	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1662	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1578	FcPatternAddBool (p, FC_MINSPACE, 1);	1663	FcPatternAddBool (p, FC_MINSPACE, 1);
1579	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1664	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1580		1665
1581	XftResult result;	1666	XftResult result;
1582	FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);	1667	FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1583		1668
1584	FcPatternDestroy (p);	1669	FcPatternDestroy (p);
1585		1670
1586	if (match)	1671	if (match)
1587	{	1672	{
…		…
1590	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1591		1676
1592	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1593	{	1678	{
1594	char fontname[4096];	1679	char fontname[4096];
1595	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1596		1681
1597	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1598	}	1683	}
1599		1684
1600	free (font);	1685	free (font);
1601	}	1686	}
1602	#endif	1687	#endif
…		…
1604	}	1689	}
1605	}	1690	}
1606		1691
1607	/* we must return SOME font */	1692	/* we must return SOME font */
1608	i = 0;	1693	i = 0;
		1694	careful = false;
1609		1695
1610	found:	1696	found:
1611	// found a font, cache it	1697	// found a font, cache it
1612	if (i < 255)	1698	if (i < 127)
1613	{	1699	{
1614	while (hi >= fmap.size ())	1700	while (hi >= fmap.size ())
1615	fmap.push_back (0);	1701	fmap.push_back (0);
1616		1702
1617	if (!fmap[hi])	1703	if (!fmap[hi])
1618	{	1704	{
1619	fmap[hi] = (pagemap *)new pagemap;	1705	fmap[hi] = (pagemap *)new pagemap;
1620	memset (fmap[hi], 0xff, sizeof (pagemap));	1706	memset (fmap[hi], 0xff, sizeof (pagemap));
1621	}	1707	}
1622		1708
1623	(*fmap[hi])[unicode & 0xff] = i;	1709	(*fmap[hi])[unicode & 0xff] = i \| (careful ? 128 : 0);
1624	}	1710	}
1625		1711
1626	return i;	1712	return i;
1627	}	1713	}
1628		1714
		1715	int
		1716	rxvt_fontset::find_font (unicode_t unicode)
		1717	{
		1718	bool careful;
		1719	int id = find_font_idx (unicode, careful);
1629		1720
		1721	return min<int> (fontCount, id) \| (careful ? Careful : 0);
		1722	}
1630		1723

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