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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.105 by root, Tue Oct 3 12:50:31 2006 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 2021 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 == 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 if (color >= 0)	239	else if (color >= 0)
240	{	240	{
241	#if XFT	241	#if XFT
		242	Picture dst;
		243
		244	# ifdef HAVE_IMG
		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)
…		…
453	case '\t':	474	case '\t':
454	case ZERO_WIDTH_CHAR:	475	case ZERO_WIDTH_CHAR:
455	case NOCHAR:	476	case NOCHAR:
456	break;	477	break;
457		478
		479	/*
		480	* If the base font does not support variation selectors, treat them as ZWC.
		481	* a point could be made to do this for all wcwidth == 0 characters, but I
		482	* decided against that until more data is available.
		483	*/
		484	case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
		485	case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
		486	break;
		487
458	default:	488	default:
459	XDrawRectangle (disp, d, gc, x + 2, y + 2,	489	XDrawRectangle (disp, d, gc, x + 2, y + 2,
460	fwidth - 4, term->fheight - 4);	490	fwidth - 4, term->fheight - 4);
461	}	491	}
462		492
463	x += fwidth;	493	x += fwidth;
464	}	494	}
465	}	495	}
466		496
		497	struct rxvt_font_overflow : rxvt_font {
		498	struct rxvt_fontset *fs;
		499
		500	rxvt_font_overflow (rxvt_fontset *fs)
		501	: rxvt_font ()
		502	{
		503	this->fs = fs;
		504	}
		505
		506	rxvt_fontprop properties ()
		507	{
		508	rxvt_fontprop p;
		509
		510	p.width = p.height = 1;
		511	p.ascent = rxvt_fontprop::unset;
		512	p.weight = rxvt_fontprop::medium;
		513	p.slant = rxvt_fontprop::roman;
		514
		515	return p;
		516	}
		517
		518	bool load (const rxvt_fontprop &prop, bool force_prop)
		519	{
		520	width = 1; height = 1;
		521	ascent = 1; descent = 0;
		522
		523	set_name (strdup ("built-in rendition overflow font"));
		524
		525	return true;
		526	}
		527
		528	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		529	{
		530	return false;
		531	}
		532
		533	void draw (rxvt_drawable &d, int x, int y,
		534	const text_t *text, int len,
		535	int fg, int bg)
		536	{
		537	while (len)
		538	{
		539	int fid = fs->find_font_idx (*text);
		540	int w = 1;
		541	while (w < len && text[w] == NOCHAR)
		542	w++;
		543	(*fs)[fid]->draw (d, x, y, text, w, fg, bg);
		544	text += w;
		545	len -= w;
		546	x += term->fwidth * w;
		547	}
		548	}
		549	};
		550
467	/////////////////////////////////////////////////////////////////////////////	551	/////////////////////////////////////////////////////////////////////////////
468		552
469	struct rxvt_font_x11 : rxvt_font {	553	struct rxvt_font_x11 : rxvt_font {
470	rxvt_font_x11 () { f = 0; }	554	rxvt_font_x11 () { f = 0; }
471		555
…		…
479		563
480	void draw (rxvt_drawable &d, int x, int y,	564	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	565	const text_t *text, int len,
482	int fg, int bg);	566	int fg, int bg);
483		567
484	bool slow; // wether this is a proportional font or has other funny characteristics	568	bool slow; // whether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	569	XFontStruct *f;
486	bool enc2b, encm;	570	bool enc2b, encm;
487		571
488	char get_property (XFontStruct f, Atom property, const char *repl) const;	572	char get_property (XFontStruct f, Atom property, const char *repl) const;
489	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	573	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
…		…
497	unsigned long value;	581	unsigned long value;
498		582
499	if (XGetFontProperty (f, property, &value))	583	if (XGetFontProperty (f, property, &value))
500	return XGetAtomName (term->dpy, value);	584	return XGetAtomName (term->dpy, value);
501	else	585	else
502	return rxvt_strdup (repl);	586	return repl ? strdup (repl) : 0;
503	}	587	}
504		588
505	rxvt_fontprop	589	rxvt_fontprop
506	rxvt_font_x11::properties ()	590	rxvt_font_x11::properties ()
507	{	591	{
…		…
589	return false;	673	return false;
590	}	674	}
591		675
592	// fix the size of scalable fonts	676	// fix the size of scalable fonts
593	static bool	677	static bool
594	replace_field (char buf, const char name, int index, const char old, const char *replace)	678	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
595	{	679	{
596	int slashes = 0;	680	int slashes = 0;
597	const char field, end;	681	const char field, end;
598		682
599	for (const char c = name; c; c++)	683	for (const char c = name; c; c++)
…		…
609	break;	693	break;
610	}	694	}
611		695
612	if (slashes >= 13 && (!old \|\| *field == old))	696	if (slashes >= 13 && (!old \|\| *field == old))
613	{	697	{
614	// TODO: check for overflow in font-name	698	size_t len = field - name;
615	strncpy (buf, name, field - name);	699	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
616	buf += field - name;	700	memcpy (*ptr, name, len);
617	strcpy (buf, replace);	701	strcpy (*ptr + len, replace);
618	strcat (buf, end);	702	strcat (*ptr, end);
619		703
620	return true;	704	return true;
621	}	705	}
622	else	706	else
623	{	707	{
624	strcpy (buf, name);	708	*ptr = strdup (name);
625		709
626	return false;	710	return false;
627	}	711	}
628	}	712	}
629		713
…		…
637	char field_str[64]; // enough for 128 bits	721	char field_str[64]; // enough for 128 bits
638		722
639	// first morph the font if required	723	// first morph the font if required
640	if (force_prop)	724	if (force_prop)
641	{	725	{
642	char fname[1024];	726	char *fname;
643		727
644	if (name[0] != '-')	728	if (name[0] != '-')
645	{	729	{
646	f = XLoadQueryFont (disp, name);	730	f = XLoadQueryFont (disp, name);
647		731
648	if (!f)	732	if (!f)
649	return false;	733	return false;
650		734
651	char *new_name = get_property (f, XA_FONT, name);	735	char *new_name = get_property (f, XA_FONT, 0);
652		736
653	if (new_name)	737	if (new_name)
654	set_name (new_name);	738	set_name (new_name);
655	else	739	else
656	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	740	rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
657		741
658	XFreeFont (disp, f);	742	XFreeFont (disp, f);
659	f = 0;	743	f = 0;
660	}	744	}
661		745
662	if (prop.weight != rxvt_fontprop::unset)	746	if (prop.weight != rxvt_fontprop::unset)
663	{	747	{
664	replace_field (fname, name, 2, 0,	748	replace_field (&fname, name, 2, 0,
665	prop.weight < rxvt_fontprop::bold	749	prop.weight < rxvt_fontprop::bold
666	? "medium" : "bold");	750	? "medium" : "bold");
667	set_name (strdup (fname));	751	set_name (fname);
668	}	752	}
669		753
670	if (prop.slant != rxvt_fontprop::unset)	754	if (prop.slant != rxvt_fontprop::unset)
671	{	755	{
672	replace_field (fname, name, 3, 0,	756	replace_field (&fname, name, 3, 0,
673	prop.slant < rxvt_fontprop::italic	757	prop.slant < rxvt_fontprop::italic
674	? "r" : "i"); // TODO: handle "o"blique, too	758	? "r" : "i"); // TODO: handle "o"blique, too
675	set_name (strdup (fname));	759	set_name (fname);
676	}	760	}
677	}	761	}
678		762
679	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	763	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680	? 0 : prop.height);	764	? 0 : prop.height);
…		…
705	font_weight *fonts = new font_weight[count];	789	font_weight *fonts = new font_weight[count];
706		790
707	for (int i = 0; i < count; i++)	791	for (int i = 0; i < count; i++)
708	{	792	{
709	rxvt_fontprop p;	793	rxvt_fontprop p;
710	char fname[1024];	794	char *fname;
711		795
712	int diff = 0;	796	int diff = 0;
713		797
714	if (replace_field (fname, list[i], 6, '0', field_str))	798	if (replace_field (&fname, list[i], 6, '0', field_str))
715	diff += 10; // slightly penalize scalable fonts	799	diff += 10; // slightly penalize scalable fonts
		800	else
		801	{
		802	free (fname);
716	else if (replace_field (fname, list[i], 11, '0', "0"))	803	if (replace_field (&fname, list[i], 11, '0', "0"))
717	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	804	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		805	}
718		806
719	if (!set_properties (p, fname))	807	if (!set_properties (p, fname)
		808	// also weed out too large fonts
		809	\|\| (prop.height != rxvt_fontprop::unset
		810	&& p.height > prop.height))
		811	{
		812	free (fname);
720	continue;	813	continue;
721		814	}
722	if (prop.height != rxvt_fontprop::unset
723	&& p.height > prop.height) // weed out too large fonts
724	continue;
725		815
726	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	816	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
727	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	817	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
728	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	818	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
729	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	819	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
730		820
731	fonts[i].name = strdup (fname);	821	fonts[i].name = fname;
732	fonts[i].diff = diff;	822	fonts[i].diff = diff;
733	}	823	}
734		824
735	XFreeFontNames (list);	825	XFreeFontNames (list);
736		826
737	// this loop only iterates when the guessed font-size is too small	827	// this loop only iterates when the guessed font-size is too small
738	for (;;)	828	for (;;)
739	{	829	{
740	font_weight *best = fonts + count - 1;	830	font_weight *best = fonts;
741		831
742	for (font_weight *w = best; w-- > fonts; )	832	for (font_weight *w = fonts + 1; w < fonts + count; w++)
743	if (w->diff <= best->diff)	833	if (w->diff < best->diff)
744	best = w;	834	best = w;
745		835
746	if (!best->name	836	if (!best->name
747	\|\| !(f = XLoadQueryFont (disp, best->name)))	837	\|\| !(f = XLoadQueryFont (disp, best->name)))
748	break;	838	break;
…		…
768	return false;	858	return false;
769		859
770	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	860	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	861	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772		862
		863	cs = CS_UNKNOWN;
		864
773	if (registry && encoding)	865	if (registry && encoding)
774	{	866	{
775	char charset[64];	867	char charset[64];
776	snprintf (charset, 64, "%s-%s", registry, encoding);	868	snprintf (charset, 64, "%s-%s", registry, encoding);
777		869
778	cs = codeset_from_name (charset);	870	cs = codeset_from_name (charset);
779	}	871
780	else	872	if (cs == CS_UNKNOWN)
		873	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781	{	874	}
		875
		876	free (registry);
		877	free (encoding);
		878
		879	if (cs == CS_UNKNOWN)
		880	{
782	const char *charset = get_property (f, XA_FONT, 0);	881	char *value = get_property (f, XA_FONT, 0);
		882	const char *charset = value;
783		883
784	if (!charset)	884	if (!charset)
785	charset = name;	885	charset = name;
786		886
787	int count = 13;	887	int count = 13;
788	while (*charset)	888	while (*charset)
789	if (*charset++ == '-' && !--count)	889	if (*charset++ == '-' && !--count)
790	break;	890	break;
791		891
792	cs = codeset_from_name (charset);	892	cs = codeset_from_name (charset);
		893	if (cs == CS_UNKNOWN)
		894	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		895
		896	free (value);
		897	}
		898
		899	if (cs == CS_UNKNOWN)
793	}	900	{
794		901	clear ();
795	free (registry);	902	return false;
796	free (encoding);	903	}
797		904
798	if (cs == CS_UNICODE)	905	if (cs == CS_UNICODE)
799	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	906	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
800		907
801	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	908	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
813	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	920	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814		921
815	if (encm)	922	if (encm)
816	N += (f->max_byte1 - f->min_byte1)	923	N += (f->max_byte1 - f->min_byte1)
817	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	924	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818		925
819	while (N)	926	while (N)
820	{	927	{
821	if (f->per_char[N].width > width)	928	if (f->per_char[N].width > width)
822	width = f->per_char[N].width;	929	width = f->per_char[N].width;
823		930
…		…
826	}	933	}
827	#endif	934	#endif
828		935
829	width = 1;	936	width = 1;
830		937
831	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	938	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
832	{	939	{
833	if (FROM_UNICODE (cs, *t) == NOCHAR)	940	if (FROM_UNICODE (cs, *t) == NOCHAR)
834	continue;	941	continue;
835		942
836	// ignore characters we wouldn't use anyways	943	// ignore characters we wouldn't use anyways
837	bool careful;	944	bool careful;
838	if (!has_char (*t, &prop, careful))	945	if (!has_char (*t, &prop, careful))
839	continue;	946	continue;
840		947
841	XChar2b ch = { t >> 8, t };	948	// the casts are needed in C++11 (see 8.5.1)
		949	XChar2b ch = { (unsigned char)(t >> 8), (unsigned char)t };
842		950
843	XCharStruct g;	951	XCharStruct g;
844	int dir_ret, asc_ret, des_ret;	952	int dir_ret, asc_ret, des_ret;
845	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	953	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
846		954
…		…
848	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	956	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849		957
850	if (width < g.width) width = g.width;	958	if (width < g.width) width = g.width;
851	}	959	}
852		960
853	if (cs == CS_UNKNOWN)	961	#if 0 // do it per-character
		962	if (prop && width > prop->width)
854	{	963	{
855	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857	clear ();	964	clear ();
858	return false;	965	return false;
859	}	966	}
860
861	#if 0 // do it per-character
862	if (prop && width > prop->width)
863	{
864	clear ();
865	return false;
866	}
867	#endif	967	#endif
868		968
869	return true;	969	return true;
870	}	970	}
871		971
…		…
880	}	980	}
881		981
882	bool	982	bool
883	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	983	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
884	{	984	{
		985	careful = false;
		986
885	uint32_t ch = FROM_UNICODE (cs, unicode);	987	uint32_t ch = FROM_UNICODE (cs, unicode);
886		988
887	if (ch == NOCHAR)	989	if (ch == NOCHAR)
888	return false;	990	return false;
889		991
890	/* check wether the character exists in _this_ font. horrible. */	992	/* check whether the character exists in _this_ font. horrible. */
891	XCharStruct *xcs;	993	XCharStruct *xcs;
892		994
893	if (encm)	995	if (encm)
894	{	996	{
895	unsigned char byte1 = ch >> 8;	997	unsigned char byte1 = ch >> 8;
…		…
925	return false;	1027	return false;
926		1028
927	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1029	if (!prop \|\| prop->width == rxvt_fontprop::unset)
928	return true;	1030	return true;
929		1031
930	// check wether character overlaps previous/next character	1032	// check whether character overlaps previous/next character
931	int w = xcs->rbearing - xcs->lbearing;	1033	int w = xcs->rbearing - xcs->lbearing;
932	int wcw = max (WCWIDTH (unicode), 1);	1034	int wcw = max (WCWIDTH (unicode), 1);
933		1035
934	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1036	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
935		1037
…		…
952	dTermDisplay;	1054	dTermDisplay;
953	dTermGC;	1055	dTermGC;
954		1056
955	bool slow = this->slow	1057	bool slow = this->slow
956	\|\| width != term->fwidth	1058	\|\| width != term->fwidth
957	\|\| height != term->fheight;	1059	\|\| height != term->fheight
		1060	\|\| ascent != f->ascent;
958		1061
959	int base = ascent; // sorry, incorrect: term->fbase;	1062	int base = ascent; // sorry, incorrect: term->fbase;
960		1063
961	XGCValues v;	1064	XGCValues v;
962	v.foreground = term->pix_colors[fg];	1065	v.foreground = term->pix_colors[fg];
…		…
975	else	1078	else
976	{	1079	{
977	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1080	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978		1081
979	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1082	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
980		1083
981	if (slow)	1084	if (slow)
982	{	1085	{
983	do	1086	do
984	{	1087	{
985	if (xc->byte1 \|\| xc->byte2)	1088	if (xc->byte1 \|\| xc->byte2)
…		…
1007	else	1110	else
1008	{	1111	{
1009	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1112	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010		1113
1011	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1114	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1012		1115
1013	if (slow)	1116	if (slow)
1014	{	1117	{
1015	do	1118	do
1016	{	1119	{
1017	if (*xc)	1120	if (*xc)
…		…
1043		1146
1044	void draw (rxvt_drawable &d, int x, int y,	1147	void draw (rxvt_drawable &d, int x, int y,
1045	const text_t *text, int len,	1148	const text_t *text, int len,
1046	int fg, int bg);	1149	int fg, int bg);
1047		1150
1048	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1151	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049		1152
1050	protected:	1153	protected:
1051	XftFont *f;	1154	XftFont *f;
1052	};	1155	};
1053		1156
…		…
1109	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1212	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110		1213
1111	#if 0 // clipping unfortunately destroys our precious double-width-characters	1214	#if 0 // clipping unfortunately destroys our precious double-width-characters
1112	// clip width, we can't do better, or can we?	1215	// clip width, we can't do better, or can we?
1113	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1216	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1217	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115	#endif	1218	#endif
1116		1219
1117	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1220	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118	FcPatternAddBool (p, FC_MINSPACE, 1);	1221	FcPatternAddBool (p, FC_MINSPACE, 1);
1119		1222
…		…
1131	int ftheight = 0;	1234	int ftheight = 0;
1132	bool success = true;	1235	bool success = true;
1133		1236
1134	for (;;)	1237	for (;;)
1135	{	1238	{
		1239	p = FcPatternDuplicate (match);
1136	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));	1240	f = XftFontOpenPattern (disp, p);
1137		1241
1138	if (!f)	1242	if (!f)
1139	{	1243	{
		1244	FcPatternDestroy (p);
1140	success = false;	1245	success = false;
1141	break;	1246	break;
1142	}	1247	}
1143		1248
1144	FT_Face face = XftLockFace (f);	1249	FT_Face face = XftLockFace (f);
…		…
1152		1257
1153	XftUnlockFace (f);	1258	XftUnlockFace (f);
1154		1259
1155	int glheight = height;	1260	int glheight = height;
1156		1261
1157	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1262	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1158	{	1263	{
1159	FcChar16 ch = *t;	1264	FcChar16 ch = *t;
1160		1265
1161	if (cs != CS_UNICODE	1266	if (cs != CS_UNICODE
1162	&& ch > 0x100	1267	&& ch > 0x100
…		…
1263	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1368	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264	const text_t *text, int len,	1369	const text_t *text, int len,
1265	int fg, int bg)	1370	int fg, int bg)
1266	{	1371	{
1267	XGlyphInfo extents;	1372	XGlyphInfo extents;
1268	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1373	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1269	XftGlyphSpec *ep = enc;	1374	XftGlyphSpec *ep = enc;
1270		1375
1271	dTermDisplay;	1376	dTermDisplay;
1272	dTermGC;	1377	dTermGC;
1273		1378
1274	int w = term->fwidth * len;	1379	int w = term->fwidth * len;
1275	int h = term->fheight;	1380	int h = term->fheight;
1276		1381
1277	bool buffered = bg >= 0 // we don't use a transparent bg	1382	bool buffered = bg >= Color_transparent
1278	#ifndef FORCE_UNBUFFERED_XFT	1383	&& term->option (Opt_buffered);
1279	# if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
1280	\|\| !term->am_transparent // we aren't transparent
1281	\|\| term->am_pixmap_trans // we have a pixmap
1282	# endif
1283	#endif
1284	;
1285		1384
1286	// cut trailing spaces	1385	// cut trailing spaces
1287	while (len && text [len - 1] == ' ')	1386	while (len && text [len - 1] == ' ')
1288	len--;	1387	len--;
1289		1388
…		…
1295	int cwidth = term->fwidth;	1394	int cwidth = term->fwidth;
1296	FcChar32 fc = *text++; len--;	1395	FcChar32 fc = *text++; len--;
1297		1396
1298	while (len && *text == NOCHAR)	1397	while (len && *text == NOCHAR)
1299	text++, len--, cwidth += term->fwidth;	1398	text++, len--, cwidth += term->fwidth;
1300		1399
1301	if (fc != ' ') // skip spaces	1400	if (fc != ' ') // skip spaces
1302	{	1401	{
1303	FT_UInt glyph = XftCharIndex (disp, f, fc);	1402	FT_UInt glyph = XftCharIndex (disp, f, fc);
1304	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1403	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305		1404
…		…
1320	{	1419	{
1321	if (ep != enc)	1420	if (ep != enc)
1322	{	1421	{
1323	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1422	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324		1423
1325	if (0)	1424	#ifdef HAVE_IMG
1326	;	1425	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1327	#ifdef TRANSPARENT	1426
1328	else if (bg < 0 && term->am_pixmap_trans)	1427	if (term->bg_img
1329	XCopyArea (disp, term->pixmap, d2, gc,	1428	&& (bg == Color_transparent \|\| bg == Color_bg
1330	x + term->window_vt_x, y + term->window_vt_y,	1429	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1331	w, h, 0, 0);
1332	#endif
1333	#ifdef XPM_BACKGROUND
1334	else if (bg < 0 && term->bgPixmap.pixmap)
1335	{	1430	{
		1431	int src_x = x, src_y = y;
		1432
		1433	if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
		1434	{
		1435	src_x += term->window_vt_x;
		1436	src_y += term->window_vt_y;
		1437	}
		1438
		1439	if (term->bg_img->w >= src_x + w
		1440	&& term->bg_img->h >= src_y + h)
		1441	{
		1442	XCopyArea (disp, term->bg_img->pm, d2, gc,
		1443	src_x, src_y, w, h, 0, 0);
		1444	}
		1445	else
		1446	{
1336	XGCValues gcv;	1447	XGCValues gcv;
1337		1448
1338	gcv.fill_style = FillTiled;	1449	gcv.fill_style = FillTiled;
1339	gcv.tile = term->pixmap;	1450	gcv.tile = term->bg_img->pm;
1340	gcv.ts_x_origin = -x;	1451	gcv.ts_x_origin = -src_x;
1341	gcv.ts_y_origin = -y;	1452	gcv.ts_y_origin = -src_y;
1342		1453
1343	GC gc2 = XCreateGC (disp, d2,	1454	XChangeGC (disp, gc,
1344	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1455	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1345	&gcv);	1456	&gcv);
1346		1457
1347	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1458	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1348		1459
1349	XFreeGC (disp, gc2);	1460	gcv.fill_style = FillSolid;
		1461	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1462	}
		1463
		1464	if (dst)
		1465	{
		1466	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1467
		1468	// dst can only be set when bg >= 0
		1469	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1470	}
1350	}	1471	}
1351	#endif
1352	else	1472	else
		1473	#endif
1353	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1474	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1354		1475
1355	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1476	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1356	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1477	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1357	}	1478	}
1358	else	1479	else
…		…
1386	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1507	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1387	= rxvt_fontprop::unset;	1508	= rxvt_fontprop::unset;
1388	force_prop = false;	1509	force_prop = false;
1389		1510
1390	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1511	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1391	FONT_UNREF (*i);	1512	(*i)->unref ();
1392		1513
1393	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1514	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1394	delete *p;	1515	delete *p;
1395		1516
1396	free (fontdesc); fontdesc = 0;	1517	free (fontdesc); fontdesc = 0;
…		…
1398	fonts.clear ();	1519	fonts.clear ();
1399		1520
1400	fallback = fallback_fonts;	1521	fallback = fallback_fonts;
1401	}	1522	}
1402		1523
		1524	void
		1525	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1526	{
		1527	font->set_term (term);
		1528
		1529	font->cs = cs;
		1530	font->loaded = false;
		1531	}
		1532
1403	rxvt_font *	1533	rxvt_font *
1404	rxvt_fontset::new_font (const char *name, codeset cs)	1534	rxvt_fontset::new_font (const char *name, codeset cs)
1405	{	1535	{
1406	rxvt_font *f;	1536	rxvt_font *f;
1407		1537
1408	if (!name \|\| !*name)	1538	if (!name \|\| !*name)
1409	{	1539	{
1410	name = "";	1540	name = "";
1411	f = new rxvt_font_default (this);	1541	f = new rxvt_font_default (this);
1412	}	1542	}
…		…
1423	f = new rxvt_font_x11;	1553	f = new rxvt_font_x11;
1424	}	1554	}
1425	else	1555	else
1426	f = new rxvt_font_x11;	1556	f = new rxvt_font_x11;
1427		1557
1428	f->set_term (term);
1429	f->set_name (strdup (name));	1558	f->set_name (strdup (name));
1430		1559	prepare_font (f, cs);
1431	f->cs = cs;
1432	f->loaded = false;
1433		1560
1434	return f;	1561	return f;
1435	}	1562	}
1436		1563
1437	/////////////////////////////////////////////////////////////////////////////	1564	/////////////////////////////////////////////////////////////////////////////
		1565
		1566	void
		1567	rxvt_fontset::push_font (rxvt_font *font)
		1568	{
		1569	// the fontCount index is reserved for the overflow font, it is only
		1570	// necessary when we get fontCount or more fonts, as they cannot be
		1571	// represented in the rendition.
		1572	if (fonts.size () == fontCount)
		1573	{
		1574	rxvt_font *f = new rxvt_font_overflow (this);
		1575
		1576	prepare_font (f, CS_UNICODE);
		1577	fonts.push_back (f);
		1578	}
		1579
		1580	fonts.push_back (font);
		1581	}
1438		1582
1439	void	1583	void
1440	rxvt_fontset::add_fonts (const char *desc)	1584	rxvt_fontset::add_fonts (const char *desc)
1441	{	1585	{
1442	if (desc)	1586	if (desc)
…		…
1471	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);	1615	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1472	else	1616	else
1473	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);	1617	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1474		1618
1475	desc++;	1619	desc++;
1476	while (*desc <= ' ') desc++;	1620	while (desc <= ' ' && desc) desc++;
1477	}	1621	}
1478		1622
1479	end = strchr (desc, ',');	1623	end = strchr (desc, ',');
1480	if (!end)	1624	if (!end)
1481	end = desc + strlen (desc);	1625	end = desc + strlen (desc);
1482		1626
1483	if (end - desc < 511)	1627	if (end - desc < 511)
1484	{	1628	{
1485	strncpy (buf, desc, end - desc);	1629	memcpy (buf, desc, end - desc);
1486	buf[end - desc] = 0;	1630	buf[end - desc] = 0;
1487		1631
1488	fonts.push_back (new_font (buf, cs));	1632	push_font (new_font (buf, cs));
1489	}	1633	}
1490	else	1634	else
1491	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1635	rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1492		1636
1493	desc = end + 1;	1637	desc = end + 1;
1494	}	1638	}
1495	while (*end);	1639	while (*end);
1496	}	1640	}
…		…
1521	{	1665	{
1522	clear ();	1666	clear ();
1523		1667
1524	fontdesc = strdup (desc);	1668	fontdesc = strdup (desc);
1525		1669
1526	fonts.push_back (new_font (0, CS_UNICODE));	1670	push_font (new_font (0, CS_UNICODE));
1527	realize_font (0);	1671	realize_font (0);
1528		1672
1529	add_fonts (desc);	1673	add_fonts (desc);
1530		1674
1531	return true;	1675	return true;
…		…
1540		1684
1541	return -1;	1685	return -1;
1542	}	1686	}
1543		1687
1544	int	1688	int
1545	rxvt_fontset::find_font (unicode_t unicode)	1689	rxvt_fontset::find_font_idx (unicode_t unicode)
1546	{	1690	{
1547	if (unicode >= 1<<20)	1691	if (unicode >= 1<<20)
1548	return 0;	1692	return 0;
1549		1693
1550	unicode_t hi = unicode >> 8;	1694	unicode_t hi = unicode >> 8;
…		…
1576	goto next_font;	1720	goto next_font;
1577		1721
1578	bool careful;	1722	bool careful;
1579	if (f->has_char (unicode, &prop, careful))	1723	if (f->has_char (unicode, &prop, careful))
1580	{	1724	{
1581	if (careful)	1725	i = (i << 1) \| careful;
1582	i \|= 128;
1583		1726
1584	goto found;	1727	goto found;
1585	}	1728	}
1586		1729
1587	next_font:	1730	next_font:
1588	if (i == fonts.size () - 1)	1731	if (i == fonts.size () - 1)
1589	{	1732	{
1590	if (fallback->name)	1733	if (fallback->name)
1591	{	1734	{
1592	// search through the fallback list	1735	// search through the fallback list
1593	fonts.push_back (new_font (fallback->name, fallback->cs));	1736	push_font (new_font (fallback->name, fallback->cs));
1594	fallback++;	1737	fallback++;
1595	}	1738	}
1596	else	1739	else
1597	{	1740	{
1598	// try to find a new font.	1741	// try to find a new font.
…		…
1600	// way to configure this and xft is easier to hack in,	1743	// way to configure this and xft is easier to hack in,
1601	// while x11 has more framework in place already.	1744	// while x11 has more framework in place already.
1602	// TODO: this is a real resource hog, xft takes ages(?)	1745	// TODO: this is a real resource hog, xft takes ages(?)
1603	#if XFT && USE_SLOW_LOOKUP	1746	#if XFT && USE_SLOW_LOOKUP
1604	// grab the first xft font that seems suitable	1747	// grab the first xft font that seems suitable
		1748	// TOOD: should go first for cellchar (spacing 110) then mono, then else
1605	FcPattern *p = FcPatternCreate ();	1749	FcPattern *p = FcPatternCreate ();
1606		1750
1607	FcCharSet *s = FcCharSetCreate ();	1751	FcCharSet *s = FcCharSetCreate ();
1608	FcCharSetAddChar (s, unicode);	1752	FcCharSetAddChar (s, unicode);
1609	FcPatternAddCharSet (p, FC_CHARSET, s);	1753	FcPatternAddCharSet (p, FC_CHARSET, s);
…		…
1629	FcPatternDestroy (match);	1773	FcPatternDestroy (match);
1630		1774
1631	if (find_font (font) < 0)	1775	if (find_font (font) < 0)
1632	{	1776	{
1633	char fontname[4096];	1777	char fontname[4096];
1634	sprintf (fontname, "xft:%-.4090s", font);	1778	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1635		1779
1636	fonts.push_back (new_font (fontname, CS_UNICODE));	1780	push_font (new_font (fontname, CS_UNICODE));
1637	}	1781	}
1638		1782
1639	free (font);	1783	free (font);
1640	}	1784	}
1641	#endif	1785	#endif
…		…
1653	while (hi >= fmap.size ())	1797	while (hi >= fmap.size ())
1654	fmap.push_back (0);	1798	fmap.push_back (0);
1655		1799
1656	if (!fmap[hi])	1800	if (!fmap[hi])
1657	{	1801	{
1658	fmap[hi] = (pagemap *)new pagemap;	1802	fmap[hi] = new pagemap;
1659	memset (fmap[hi], 0xff, sizeof (pagemap));	1803	memset (fmap[hi], 0xff, sizeof (pagemap));
1660	}	1804	}
1661		1805
1662	(*fmap[hi])[unicode & 0xff] = i;	1806	(*fmap[hi])[unicode & 0xff] = i;
1663	}	1807	}
1664		1808
1665	return i;	1809	return i;
1666	}	1810	}
1667		1811
1668
1669

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.105 by root, Tue Oct 3 12:50:31 2006 UTC vs. Revision 1.198 by root, Wed Jun 16 22:51:55 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.105 by root, Tue Oct 3 12:50:31 2006 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 2021 UTC