[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.170 by sf-exg, Thu Dec 30 01:13:24 2010 UTC

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