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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.103 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.194 by root, Fri Nov 14 11:06:49 2014 UTC

…		…
1	/----------------------------------------------------------------------	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 <schmorp@schmorp.de>
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 3 of the License, or
10	* (at your option) any later version.	10	* (at your option) any later version.
11	*	11	*
12	* This program is distributed in the hope that it will be useful,	12	* This program is distributed in the hope that it will be useful,
13	* but WITHOUT ANY WARRANTY; without even the implied warranty of	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 <stdlib.h>
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	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
135	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.	137	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
136	#if XFT	138	#if XFT
137	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	139	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	140	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	141	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
…		…
156	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',	158	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ	159	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158	0x304c, 0x672c, // が本	160	0x304c, 0x672c, // が本
159	};	161	};
160		162
161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163	#define dTermDisplay Display *disp = term->dpy	163	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	164	#define dTermGC GC gc = term->gc
165		165
166	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
167		167
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	218	{
219	}	219	}
220		220
221	void	221	void
222	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name_)
223	{	223	{
224	if (this->name == name)	224	if (name == name_)
225	return;	225	return;
226		226
227	if (this->name) free (this->name); // let the compiler optimize	227	if (name) free (name); // let the compiler optimize
228	this->name = name;	228	name = name_;
229	}	229	}
230		230
231	void	231	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	233	{
234	dTermDisplay;	234	dTermDisplay;
235	dTermGC;	235	dTermGC;
236		236
237	if (color < 0 \|\| color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
239	else	239	else if (color >= 0)
240	{	240	{
241	#if XFT	241	#if XFT
		242	Picture dst;
		243
		244	# ifdef HAVE_BG_PIXMAP
		245	if (term->bg_img
		246	&& !term->pix_colors[color].is_opaque ()
		247	&& ((dst = XftDrawPicture (d))))
		248	{
		249	XClearArea (disp, d, x, y, w, h, false);
		250
		251	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		252	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		253	}
		254	else
		255	# endif
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	256	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		257
243	#else	258	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	261	#endif
247	}	262	}
248	}	263	}
249		264
250	/////////////////////////////////////////////////////////////////////////////	265	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		266
254	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	268	struct rxvt_fontset *fs;
256		269
257	rxvt_font_default (rxvt_fontset *fs)	270	rxvt_font_default (rxvt_fontset *fs)
…		…
293	return false;	306	return false;
294		307
295	if (unicode <= 0x009f)	308	if (unicode <= 0x009f)
296	return true;	309	return true;
297		310
		311	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	312	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	313	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	314	return true;
		315	#endif
301		316
302	if (IS_COMPOSE (unicode))	317	if (IS_COMPOSE (unicode))
303	return true;	318	return true;
304		319
305	switch (unicode)	320	switch (unicode)
…		…
341	;	356	;
342		357
343	int width = text - tp;	358	int width = text - tp;
344	int fwidth = term->fwidth * width;	359	int fwidth = term->fwidth * width;
345		360
		361	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	362	if (0x2500 <= t && t <= 0x259f)
347	{	363	{
		364	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
351		368
352	int W = fwidth;	369	int W = fwidth;
…		…
390		407
391	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
392	if (a)	409	if (a)
393	{	410	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		412
396	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
400		417
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
420	break;	437	break;
421	}	438	}
422	}	439	}
423	}	440	}
		441	#else
		442	if (0)
		443	;
		444	#endif
424	#if ENABLE_COMBINING	445	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	446	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	447	{
427	min_it (width, 2); // we only support wcwidth up to 2	448	min_it (width, 2); // we only support wcwidth up to 2
428		449
429	text_t chrs[2];	450	text_t chrs[2];
430	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
431		452
432	*chrs = cc->c1;	453	*chrs = cc->c1;
433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
434	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
435		456
436	if (cc->c2 != NOCHAR)	457	if (cc->c2 != NOCHAR)
437	{	458	{
438	bool careful;	459	bool careful;
439		460
440	// prefer font of first character, for no good reasons	461	// prefer font of first character, for no good reasons
441	*chrs = cc->c2;	462	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	464	? f1
444	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font_idx (cc->c2)];
445		466
446	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	468	}
448	}	469	}
449	#endif	470	#endif
450	else	471	else
451	switch (t)	472	switch (t)
…		…
462		483
463	x += fwidth;	484	x += fwidth;
464	}	485	}
465	}	486	}
466		487
		488	struct rxvt_font_overflow : rxvt_font {
		489	struct rxvt_fontset *fs;
		490
		491	rxvt_font_overflow (rxvt_fontset *fs)
		492	: rxvt_font ()
		493	{
		494	this->fs = fs;
		495	}
		496
		497	rxvt_fontprop properties ()
		498	{
		499	rxvt_fontprop p;
		500
		501	p.width = p.height = 1;
		502	p.ascent = rxvt_fontprop::unset;
		503	p.weight = rxvt_fontprop::medium;
		504	p.slant = rxvt_fontprop::roman;
		505
		506	return p;
		507	}
		508
		509	bool load (const rxvt_fontprop &prop, bool force_prop)
		510	{
		511	width = 1; height = 1;
		512	ascent = 1; descent = 0;
		513
		514	set_name (strdup ("built-in rendition overflow font"));
		515
		516	return true;
		517	}
		518
		519	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		520	{
		521	return false;
		522	}
		523
		524	void draw (rxvt_drawable &d, int x, int y,
		525	const text_t *text, int len,
		526	int fg, int bg)
		527	{
		528	while (len)
		529	{
		530	int fid = fs->find_font_idx (*text);
		531	int w = 1;
		532	while (w < len && text[w] == NOCHAR)
		533	w++;
		534	(*fs)[fid]->draw (d, x, y, text, w, fg, bg);
		535	text += w;
		536	len -= w;
		537	x += term->fwidth * w;
		538	}
		539	}
		540	};
		541
467	/////////////////////////////////////////////////////////////////////////////	542	/////////////////////////////////////////////////////////////////////////////
468		543
469	struct rxvt_font_x11 : rxvt_font {	544	struct rxvt_font_x11 : rxvt_font {
470	rxvt_font_x11 () { f = 0; }	545	rxvt_font_x11 () { f = 0; }
471		546
…		…
479		554
480	void draw (rxvt_drawable &d, int x, int y,	555	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	556	const text_t *text, int len,
482	int fg, int bg);	557	int fg, int bg);
483		558
484	bool slow; // wether this is a proportional font or has other funny characteristics	559	bool slow; // whether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	560	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	561	bool enc2b, encm;
488		562
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	563	char get_property (XFontStruct f, Atom property, const char *repl) const;
490	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	564	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
491	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	565	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	572	unsigned long value;
499		573
500	if (XGetFontProperty (f, property, &value))	574	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	575	return XGetAtomName (term->dpy, value);
502	else	576	else
503	return rxvt_strdup (repl);	577	return repl ? strdup (repl) : 0;
504	}	578	}
505		579
506	rxvt_fontprop	580	rxvt_fontprop
507	rxvt_font_x11::properties ()	581	rxvt_font_x11::properties ()
508	{	582	{
…		…
590	return false;	664	return false;
591	}	665	}
592		666
593	// fix the size of scalable fonts	667	// fix the size of scalable fonts
594	static bool	668	static bool
595	replace_field (char buf, const char name, int index, const char old, const char *replace)	669	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
596	{	670	{
597	int slashes = 0;	671	int slashes = 0;
598	const char field, end;	672	const char field, end;
599		673
600	for (const char c = name; c; c++)	674	for (const char c = name; c; c++)
…		…
610	break;	684	break;
611	}	685	}
612		686
613	if (slashes >= 13 && (!old \|\| *field == old))	687	if (slashes >= 13 && (!old \|\| *field == old))
614	{	688	{
615	// TODO: check for overflow in font-name	689	size_t len = field - name;
616	strncpy (buf, name, field - name);	690	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	691	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	692	strcpy (*ptr + len, replace);
619	strcat (buf, end);	693	strcat (*ptr, end);
620		694
621	return true;	695	return true;
622	}	696	}
623	else	697	else
624	{	698	{
625	strcpy (buf, name);	699	*ptr = strdup (name);
626		700
627	return false;	701	return false;
628	}	702	}
629	}	703	}
630		704
…		…
638	char field_str[64]; // enough for 128 bits	712	char field_str[64]; // enough for 128 bits
639		713
640	// first morph the font if required	714	// first morph the font if required
641	if (force_prop)	715	if (force_prop)
642	{	716	{
643	char fname[1024];	717	char *fname;
644		718
645	if (name[0] != '-')	719	if (name[0] != '-')
646	{	720	{
647	f = XLoadQueryFont (disp, name);	721	f = XLoadQueryFont (disp, name);
648		722
649	if (!f)	723	if (!f)
650	return false;	724	return false;
651		725
652	char *new_name = get_property (f, XA_FONT, name);	726	char *new_name = get_property (f, XA_FONT, 0);
653		727
654	if (new_name)	728	if (new_name)
655	set_name (new_name);	729	set_name (new_name);
656	else	730	else
657	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	731	rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
658		732
659	XFreeFont (disp, f);	733	XFreeFont (disp, f);
660	f = 0;	734	f = 0;
661	}	735	}
662		736
663	if (prop.weight != rxvt_fontprop::unset)	737	if (prop.weight != rxvt_fontprop::unset)
664	{	738	{
665	replace_field (fname, name, 2, 0,	739	replace_field (&fname, name, 2, 0,
666	prop.weight < rxvt_fontprop::bold	740	prop.weight < rxvt_fontprop::bold
667	? "medium" : "bold");	741	? "medium" : "bold");
668	set_name (strdup (fname));	742	set_name (fname);
669	}	743	}
670		744
671	if (prop.slant != rxvt_fontprop::unset)	745	if (prop.slant != rxvt_fontprop::unset)
672	{	746	{
673	replace_field (fname, name, 3, 0,	747	replace_field (&fname, name, 3, 0,
674	prop.slant < rxvt_fontprop::italic	748	prop.slant < rxvt_fontprop::italic
675	? "r" : "i"); // TODO: handle "o"blique, too	749	? "r" : "i"); // TODO: handle "o"blique, too
676	set_name (strdup (fname));	750	set_name (fname);
677	}	751	}
678	}	752	}
679		753
680	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	754	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681	? 0 : prop.height);	755	? 0 : prop.height);
…		…
706	font_weight *fonts = new font_weight[count];	780	font_weight *fonts = new font_weight[count];
707		781
708	for (int i = 0; i < count; i++)	782	for (int i = 0; i < count; i++)
709	{	783	{
710	rxvt_fontprop p;	784	rxvt_fontprop p;
711	char fname[1024];	785	char *fname;
712		786
713	int diff = 0;	787	int diff = 0;
714		788
715	if (replace_field (fname, list[i], 6, '0', field_str))	789	if (replace_field (&fname, list[i], 6, '0', field_str))
716	diff += 10; // slightly penalize scalable fonts	790	diff += 10; // slightly penalize scalable fonts
		791	else
		792	{
		793	free (fname);
717	else if (replace_field (fname, list[i], 11, '0', "0"))	794	if (replace_field (&fname, list[i], 11, '0', "0"))
718	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	795	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		796	}
719		797
720	if (!set_properties (p, fname))	798	if (!set_properties (p, fname)
		799	// also weed out too large fonts
		800	\|\| (prop.height != rxvt_fontprop::unset
		801	&& p.height > prop.height))
		802	{
		803	free (fname);
721	continue;	804	continue;
722		805	}
723	if (prop.height != rxvt_fontprop::unset
724	&& p.height > prop.height) // weed out too large fonts
725	continue;
726		806
727	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	807	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
728	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	808	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
729	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	809	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
730	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	810	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
731		811
732	fonts[i].name = strdup (fname);	812	fonts[i].name = fname;
733	fonts[i].diff = diff;	813	fonts[i].diff = diff;
734	}	814	}
735		815
736	XFreeFontNames (list);	816	XFreeFontNames (list);
737		817
738	// this loop only iterates when the guessed font-size is too small	818	// this loop only iterates when the guessed font-size is too small
739	for (;;)	819	for (;;)
740	{	820	{
741	font_weight *best = fonts + count - 1;	821	font_weight *best = fonts;
742		822
743	for (font_weight *w = best; w-- > fonts; )	823	for (font_weight *w = fonts + 1; w < fonts + count; w++)
744	if (w->diff <= best->diff)	824	if (w->diff < best->diff)
745	best = w;	825	best = w;
746		826
747	if (!best->name	827	if (!best->name
748	\|\| !(f = XLoadQueryFont (disp, best->name)))	828	\|\| !(f = XLoadQueryFont (disp, best->name)))
749	break;	829	break;
…		…
769	return false;	849	return false;
770		850
771	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	851	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
772	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	852	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
773		853
		854	cs = CS_UNKNOWN;
		855
774	if (registry && encoding)	856	if (registry && encoding)
775	{	857	{
776	char charset[64];	858	char charset[64];
777	snprintf (charset, 64, "%s-%s", registry, encoding);	859	snprintf (charset, 64, "%s-%s", registry, encoding);
778		860
779	cs = codeset_from_name (charset);	861	cs = codeset_from_name (charset);
780	}	862
781	else	863	if (cs == CS_UNKNOWN)
		864	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
782	{	865	}
		866
		867	free (registry);
		868	free (encoding);
		869
		870	if (cs == CS_UNKNOWN)
		871	{
783	const char *charset = get_property (f, XA_FONT, 0);	872	char *value = get_property (f, XA_FONT, 0);
		873	const char *charset = value;
784		874
785	if (!charset)	875	if (!charset)
786	charset = name;	876	charset = name;
787		877
788	int count = 13;	878	int count = 13;
789	while (*charset)	879	while (*charset)
790	if (*charset++ == '-' && !--count)	880	if (*charset++ == '-' && !--count)
791	break;	881	break;
792		882
793	cs = codeset_from_name (charset);	883	cs = codeset_from_name (charset);
		884	if (cs == CS_UNKNOWN)
		885	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		886
		887	free (value);
		888	}
		889
		890	if (cs == CS_UNKNOWN)
794	}	891	{
795		892	clear ();
796	free (registry);	893	return false;
797	free (encoding);	894	}
798		895
799	if (cs == CS_UNICODE)	896	if (cs == CS_UNICODE)
800	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	897	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
801		898
802	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	899	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
814	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	911	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
815		912
816	if (encm)	913	if (encm)
817	N += (f->max_byte1 - f->min_byte1)	914	N += (f->max_byte1 - f->min_byte1)
818	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	915	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819		916
820	while (N)	917	while (N)
821	{	918	{
822	if (f->per_char[N].width > width)	919	if (f->per_char[N].width > width)
823	width = f->per_char[N].width;	920	width = f->per_char[N].width;
824		921
…		…
827	}	924	}
828	#endif	925	#endif
829		926
830	width = 1;	927	width = 1;
831		928
832	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	929	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
833	{	930	{
834	if (FROM_UNICODE (cs, *t) == NOCHAR)	931	if (FROM_UNICODE (cs, *t) == NOCHAR)
835	continue;	932	continue;
836		933
837	// ignore characters we wouldn't use anyways	934	// ignore characters we wouldn't use anyways
838	bool careful;	935	bool careful;
839	if (!has_char (*t, &prop, careful))	936	if (!has_char (*t, &prop, careful))
840	continue;	937	continue;
841		938
842	XChar2b ch = { t >> 8, t };	939	// the casts are needed in C++11 (see 8.5.1)
		940	XChar2b ch = { (unsigned char)(t >> 8), (unsigned char)t };
843		941
844	XCharStruct g;	942	XCharStruct g;
845	int dir_ret, asc_ret, des_ret;	943	int dir_ret, asc_ret, des_ret;
846	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	944	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
847		945
…		…
849	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	947	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
850		948
851	if (width < g.width) width = g.width;	949	if (width < g.width) width = g.width;
852	}	950	}
853		951
854	if (cs == CS_UNKNOWN)	952	#if 0 // do it per-character
		953	if (prop && width > prop->width)
855	{	954	{
856	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
857
858	clear ();	955	clear ();
859	return false;	956	return false;
860	}	957	}
861
862	#if 0 // do it per-character
863	if (prop && width > prop->width)
864	{
865	clear ();
866	return false;
867	}
868	#endif	958	#endif
869		959
870	return true;	960	return true;
871	}	961	}
872		962
…		…
881	}	971	}
882		972
883	bool	973	bool
884	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	974	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
885	{	975	{
		976	careful = false;
		977
886	uint32_t ch = FROM_UNICODE (cs, unicode);	978	uint32_t ch = FROM_UNICODE (cs, unicode);
887		979
888	if (ch == NOCHAR)	980	if (ch == NOCHAR)
889	return false;	981	return false;
890		982
891	/* check wether the character exists in _this_ font. horrible. */	983	/* check whether the character exists in _this_ font. horrible. */
892	XCharStruct *xcs;	984	XCharStruct *xcs;
893		985
894	if (encm)	986	if (encm)
895	{	987	{
896	unsigned char byte1 = ch >> 8;	988	unsigned char byte1 = ch >> 8;
…		…
926	return false;	1018	return false;
927		1019
928	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1020	if (!prop \|\| prop->width == rxvt_fontprop::unset)
929	return true;	1021	return true;
930		1022
931	// check wether character overlaps previous/next character	1023	// check whether character overlaps previous/next character
932	int w = xcs->rbearing - xcs->lbearing;	1024	int w = xcs->rbearing - xcs->lbearing;
933	int wcw = max (WCWIDTH (unicode), 1);	1025	int wcw = max (WCWIDTH (unicode), 1);
934		1026
935	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1027	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
936		1028
…		…
953	dTermDisplay;	1045	dTermDisplay;
954	dTermGC;	1046	dTermGC;
955		1047
956	bool slow = this->slow	1048	bool slow = this->slow
957	\|\| width != term->fwidth	1049	\|\| width != term->fwidth
958	\|\| height != term->fheight;	1050	\|\| height != term->fheight
		1051	\|\| ascent != f->ascent;
959		1052
960	int base = ascent; // sorry, incorrect: term->fbase;	1053	int base = ascent; // sorry, incorrect: term->fbase;
961		1054
962	XGCValues v;	1055	XGCValues v;
963	v.foreground = term->pix_colors[fg];	1056	v.foreground = term->pix_colors[fg];
…		…
976	else	1069	else
977	{	1070	{
978	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1071	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
979		1072
980	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1073	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
981		1074
982	if (slow)	1075	if (slow)
983	{	1076	{
984	do	1077	do
985	{	1078	{
986	if (xc->byte1 \|\| xc->byte2)	1079	if (xc->byte1 \|\| xc->byte2)
…		…
1008	else	1101	else
1009	{	1102	{
1010	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1103	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1011		1104
1012	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1105	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1013		1106
1014	if (slow)	1107	if (slow)
1015	{	1108	{
1016	do	1109	do
1017	{	1110	{
1018	if (*xc)	1111	if (*xc)
…		…
1044		1137
1045	void draw (rxvt_drawable &d, int x, int y,	1138	void draw (rxvt_drawable &d, int x, int y,
1046	const text_t *text, int len,	1139	const text_t *text, int len,
1047	int fg, int bg);	1140	int fg, int bg);
1048		1141
1049	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1142	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1050		1143
1051	protected:	1144	protected:
1052	XftFont *f;	1145	XftFont *f;
1053	};	1146	};
1054		1147
…		…
1110	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1203	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1111		1204
1112	#if 0 // clipping unfortunately destroys our precious double-width-characters	1205	#if 0 // clipping unfortunately destroys our precious double-width-characters
1113	// clip width, we can't do better, or can we?	1206	// clip width, we can't do better, or can we?
1114	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1207	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1115	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1208	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1116	#endif	1209	#endif
1117		1210
1118	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1211	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1119	FcPatternAddBool (p, FC_MINSPACE, 1);	1212	FcPatternAddBool (p, FC_MINSPACE, 1);
1120		1213
…		…
1132	int ftheight = 0;	1225	int ftheight = 0;
1133	bool success = true;	1226	bool success = true;
1134		1227
1135	for (;;)	1228	for (;;)
1136	{	1229	{
		1230	p = FcPatternDuplicate (match);
1137	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));	1231	f = XftFontOpenPattern (disp, p);
1138		1232
1139	if (!f)	1233	if (!f)
1140	{	1234	{
		1235	FcPatternDestroy (p);
1141	success = false;	1236	success = false;
1142	break;	1237	break;
1143	}	1238	}
1144		1239
1145	FT_Face face = XftLockFace (f);	1240	FT_Face face = XftLockFace (f);
…		…
1153		1248
1154	XftUnlockFace (f);	1249	XftUnlockFace (f);
1155		1250
1156	int glheight = height;	1251	int glheight = height;
1157		1252
1158	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1253	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1159	{	1254	{
1160	FcChar16 ch = *t;	1255	FcChar16 ch = *t;
1161		1256
1162	if (cs != CS_UNICODE	1257	if (cs != CS_UNICODE
1163	&& ch > 0x100	1258	&& ch > 0x100
…		…
1264	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1359	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265	const text_t *text, int len,	1360	const text_t *text, int len,
1266	int fg, int bg)	1361	int fg, int bg)
1267	{	1362	{
1268	XGlyphInfo extents;	1363	XGlyphInfo extents;
1269	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1364	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1270	XftGlyphSpec *ep = enc;	1365	XftGlyphSpec *ep = enc;
1271		1366
1272	dTermDisplay;	1367	dTermDisplay;
1273	dTermGC;	1368	dTermGC;
1274		1369
1275	int w = term->fwidth * len;	1370	int w = term->fwidth * len;
1276	int h = term->fheight;	1371	int h = term->fheight;
1277		1372
1278	bool buffered = bg >= 0 // we don't use a transparent bg	1373	bool buffered = bg >= Color_transparent
1279	#ifndef FORCE_UNBUFFERED_XFT	1374	&& term->option (Opt_buffered);
1280	# if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
1281	\|\| !term->am_transparent // we aren't transparent
1282	\|\| term->am_pixmap_trans // we have a pixmap
1283	# endif
1284	#endif
1285	;
1286		1375
1287	// cut trailing spaces	1376	// cut trailing spaces
1288	while (len && text [len - 1] == ' ')	1377	while (len && text [len - 1] == ' ')
1289	len--;	1378	len--;
1290		1379
…		…
1296	int cwidth = term->fwidth;	1385	int cwidth = term->fwidth;
1297	FcChar32 fc = *text++; len--;	1386	FcChar32 fc = *text++; len--;
1298		1387
1299	while (len && *text == NOCHAR)	1388	while (len && *text == NOCHAR)
1300	text++, len--, cwidth += term->fwidth;	1389	text++, len--, cwidth += term->fwidth;
1301		1390
1302	if (fc != ' ') // skip spaces	1391	if (fc != ' ') // skip spaces
1303	{	1392	{
1304	FT_UInt glyph = XftCharIndex (disp, f, fc);	1393	FT_UInt glyph = XftCharIndex (disp, f, fc);
1305	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1394	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1306		1395
…		…
1321	{	1410	{
1322	if (ep != enc)	1411	if (ep != enc)
1323	{	1412	{
1324	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1413	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1325		1414
1326	if (0)	1415	#ifdef HAVE_BG_PIXMAP
1327	;	1416	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1328	#ifdef TRANSPARENT	1417
1329	else if (bg < 0 && term->am_pixmap_trans)	1418	if (term->bg_img
1330	XCopyArea (disp, term->pixmap, d2, gc,	1419	&& (bg == Color_transparent \|\| bg == Color_bg
1331	x + term->window_vt_x, y + term->window_vt_y,	1420	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1332	w, h, 0, 0);
1333	#endif
1334	#ifdef XPM_BACKGROUND
1335	else if (bg < 0 && term->bgPixmap.pixmap)
1336	{	1421	{
		1422	int src_x = x, src_y = y;
		1423
		1424	if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
		1425	{
		1426	src_x += term->window_vt_x;
		1427	src_y += term->window_vt_y;
		1428	}
		1429
		1430	if (term->bg_img->w >= src_x + w
		1431	&& term->bg_img->h >= src_y + h)
		1432	{
		1433	XCopyArea (disp, term->bg_img->pm, d2, gc,
		1434	src_x, src_y, w, h, 0, 0);
		1435	}
		1436	else
		1437	{
1337	XGCValues gcv;	1438	XGCValues gcv;
1338		1439
1339	gcv.fill_style = FillTiled;	1440	gcv.fill_style = FillTiled;
1340	gcv.tile = term->pixmap;	1441	gcv.tile = term->bg_img->pm;
1341	gcv.ts_x_origin = -x;	1442	gcv.ts_x_origin = -src_x;
1342	gcv.ts_y_origin = -y;	1443	gcv.ts_y_origin = -src_y;
1343		1444
1344	GC gc2 = XCreateGC (disp, d2,	1445	XChangeGC (disp, gc,
1345	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1446	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1346	&gcv);	1447	&gcv);
1347		1448
1348	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1449	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1349		1450
1350	XFreeGC (disp, gc2);	1451	gcv.fill_style = FillSolid;
		1452	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1453	}
		1454
		1455	if (dst)
		1456	{
		1457	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1458
		1459	// dst can only be set when bg >= 0
		1460	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1461	}
1351	}	1462	}
1352	#endif
1353	else	1463	else
		1464	#endif
1354	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1465	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1355		1466
1356	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1467	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1468	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358	}	1469	}
1359	else	1470	else
…		…
1387	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1498	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1388	= rxvt_fontprop::unset;	1499	= rxvt_fontprop::unset;
1389	force_prop = false;	1500	force_prop = false;
1390		1501
1391	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1502	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1392	FONT_UNREF (*i);	1503	(*i)->unref ();
1393		1504
1394	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1505	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1395	delete *p;	1506	delete *p;
1396		1507
1397	free (fontdesc); fontdesc = 0;	1508	free (fontdesc); fontdesc = 0;
…		…
1399	fonts.clear ();	1510	fonts.clear ();
1400		1511
1401	fallback = fallback_fonts;	1512	fallback = fallback_fonts;
1402	}	1513	}
1403		1514
		1515	void
		1516	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1517	{
		1518	font->set_term (term);
		1519
		1520	font->cs = cs;
		1521	font->loaded = false;
		1522	}
		1523
1404	rxvt_font *	1524	rxvt_font *
1405	rxvt_fontset::new_font (const char *name, codeset cs)	1525	rxvt_fontset::new_font (const char *name, codeset cs)
1406	{	1526	{
1407	rxvt_font *f;	1527	rxvt_font *f;
1408		1528
1409	if (!name \|\| !*name)	1529	if (!name \|\| !*name)
1410	{	1530	{
1411	name = "";	1531	name = "";
1412	f = new rxvt_font_default (this);	1532	f = new rxvt_font_default (this);
1413	}	1533	}
…		…
1424	f = new rxvt_font_x11;	1544	f = new rxvt_font_x11;
1425	}	1545	}
1426	else	1546	else
1427	f = new rxvt_font_x11;	1547	f = new rxvt_font_x11;
1428		1548
1429	f->set_term (term);
1430	f->set_name (strdup (name));	1549	f->set_name (strdup (name));
1431		1550	prepare_font (f, cs);
1432	f->cs = cs;
1433	f->loaded = false;
1434		1551
1435	return f;	1552	return f;
1436	}	1553	}
1437		1554
1438	/////////////////////////////////////////////////////////////////////////////	1555	/////////////////////////////////////////////////////////////////////////////
		1556
		1557	void
		1558	rxvt_fontset::push_font (rxvt_font *font)
		1559	{
		1560	// the fontCount index is reserved for the overflow font, it is only
		1561	// necessary when we get fontCount or more fonts, as they cannot be
		1562	// represented in the rendition.
		1563	if (fonts.size () == fontCount)
		1564	{
		1565	rxvt_font *f = new rxvt_font_overflow (this);
		1566
		1567	prepare_font (f, CS_UNICODE);
		1568	fonts.push_back (f);
		1569	}
		1570
		1571	fonts.push_back (font);
		1572	}
1439		1573
1440	void	1574	void
1441	rxvt_fontset::add_fonts (const char *desc)	1575	rxvt_fontset::add_fonts (const char *desc)
1442	{	1576	{
1443	if (desc)	1577	if (desc)
…		…
1481	if (!end)	1615	if (!end)
1482	end = desc + strlen (desc);	1616	end = desc + strlen (desc);
1483		1617
1484	if (end - desc < 511)	1618	if (end - desc < 511)
1485	{	1619	{
1486	strncpy (buf, desc, end - desc);	1620	memcpy (buf, desc, end - desc);
1487	buf[end - desc] = 0;	1621	buf[end - desc] = 0;
1488		1622
1489	fonts.push_back (new_font (buf, cs));	1623	push_font (new_font (buf, cs));
1490	}	1624	}
1491	else	1625	else
1492	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1626	rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1493		1627
1494	desc = end + 1;	1628	desc = end + 1;
1495	}	1629	}
1496	while (*end);	1630	while (*end);
1497	}	1631	}
…		…
1522	{	1656	{
1523	clear ();	1657	clear ();
1524		1658
1525	fontdesc = strdup (desc);	1659	fontdesc = strdup (desc);
1526		1660
1527	fonts.push_back (new_font (0, CS_UNICODE));	1661	push_font (new_font (0, CS_UNICODE));
1528	realize_font (0);	1662	realize_font (0);
1529		1663
1530	add_fonts (desc);	1664	add_fonts (desc);
1531		1665
1532	return true;	1666	return true;
…		…
1541		1675
1542	return -1;	1676	return -1;
1543	}	1677	}
1544		1678
1545	int	1679	int
1546	rxvt_fontset::find_font (unicode_t unicode)	1680	rxvt_fontset::find_font_idx (unicode_t unicode)
1547	{	1681	{
1548	if (unicode >= 1<<20)	1682	if (unicode >= 1<<20)
1549	return 0;	1683	return 0;
1550		1684
1551	unicode_t hi = unicode >> 8;	1685	unicode_t hi = unicode >> 8;
…		…
1577	goto next_font;	1711	goto next_font;
1578		1712
1579	bool careful;	1713	bool careful;
1580	if (f->has_char (unicode, &prop, careful))	1714	if (f->has_char (unicode, &prop, careful))
1581	{	1715	{
1582	if (careful)	1716	i = (i << 1) \| careful;
1583	i \|= 128;
1584		1717
1585	goto found;	1718	goto found;
1586	}	1719	}
1587		1720
1588	next_font:	1721	next_font:
1589	if (i == fonts.size () - 1)	1722	if (i == fonts.size () - 1)
1590	{	1723	{
1591	if (fallback->name)	1724	if (fallback->name)
1592	{	1725	{
1593	// search through the fallback list	1726	// search through the fallback list
1594	fonts.push_back (new_font (fallback->name, fallback->cs));	1727	push_font (new_font (fallback->name, fallback->cs));
1595	fallback++;	1728	fallback++;
1596	}	1729	}
1597	else	1730	else
1598	{	1731	{
1599	// try to find a new font.	1732	// try to find a new font.
…		…
1630	FcPatternDestroy (match);	1763	FcPatternDestroy (match);
1631		1764
1632	if (find_font (font) < 0)	1765	if (find_font (font) < 0)
1633	{	1766	{
1634	char fontname[4096];	1767	char fontname[4096];
1635	sprintf (fontname, "xft:%-.4090s", font);	1768	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1636		1769
1637	fonts.push_back (new_font (fontname, CS_UNICODE));	1770	push_font (new_font (fontname, CS_UNICODE));
1638	}	1771	}
1639		1772
1640	free (font);	1773	free (font);
1641	}	1774	}
1642	#endif	1775	#endif
…		…
1654	while (hi >= fmap.size ())	1787	while (hi >= fmap.size ())
1655	fmap.push_back (0);	1788	fmap.push_back (0);
1656		1789
1657	if (!fmap[hi])	1790	if (!fmap[hi])
1658	{	1791	{
1659	fmap[hi] = (pagemap *)new pagemap;	1792	fmap[hi] = new pagemap;
1660	memset (fmap[hi], 0xff, sizeof (pagemap));	1793	memset (fmap[hi], 0xff, sizeof (pagemap));
1661	}	1794	}
1662		1795
1663	(*fmap[hi])[unicode & 0xff] = i;	1796	(*fmap[hi])[unicode & 0xff] = i;
1664	}	1797	}
1665		1798
1666	return i;	1799	return i;
1667	}	1800	}
1668		1801
1669
1670

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.103 by root, Sun Aug 27 10:10:25 2006 UTC vs. Revision 1.194 by root, Fri Nov 14 11:06:49 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.103 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.194 by root, Fri Nov 14 11:06:49 2014 UTC