[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.199 by root, Thu Jun 17 00:08:35 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 < 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_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		266
252	#include "table/linedraw.h"
253
254	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font
		268	{
255	struct rxvt_fontset *fs;	269	struct rxvt_fontset *fs;
256		270
257	rxvt_font_default (rxvt_fontset *fs)	271	rxvt_font_default (rxvt_fontset *fs)
258	: rxvt_font ()	272	: rxvt_font ()
259	{	273	{
…		…
293	return false;	307	return false;
294		308
295	if (unicode <= 0x009f)	309	if (unicode <= 0x009f)
296	return true;	310	return true;
297		311
		312	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	314	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	315	return true;
		316	#endif
301		317
302	if (IS_COMPOSE (unicode))	318	if (IS_COMPOSE (unicode))
303	return true;	319	return true;
304		320
305	switch (unicode)	321	switch (unicode)
…		…
341	;	357	;
342		358
343	int width = text - tp;	359	int width = text - tp;
344	int fwidth = term->fwidth * width;	360	int fwidth = term->fwidth * width;
345		361
		362	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
347	{	364	{
		365	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	366	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	367	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	368	uint32_t *b = a + (offs & 15);
351		369
352	int W = fwidth;	370	int W = fwidth;
…		…
390		408
391	case 1: // rectangle, possibly stippled	409	case 1: // rectangle, possibly stippled
392	if (a)	410	if (a)
393	{	411	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		413
396	gcv.fill_style = FillStippled;	414	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	416	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	417	gcv.ts_y_origin = y;
400		418
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	437	(a - 1) * 9064, (b - 1) 90*64);
420	break;	438	break;
421	}	439	}
422	}	440	}
423	}	441	}
		442	#else
		443	if (0)
		444	;
		445	#endif
424	#if ENABLE_COMBINING	446	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	448	{
427	min_it (width, 2); // we only support wcwidth up to 2	449	min_it (width, 2); // we only support wcwidth up to 2
428		450
429	text_t chrs[2];	451	text_t chrs[2];
430	chrs [1] = NOCHAR;	452	chrs [1] = NOCHAR;
431		453
432	*chrs = cc->c1;	454	*chrs = cc->c1;
433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	455	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
434	f1->draw (d, x, y, chrs, width, fg, bg);	456	f1->draw (d, x, y, chrs, width, fg, bg);
435		457
436	if (cc->c2 != NOCHAR)	458	if (cc->c2 != NOCHAR)
437	{	459	{
438	bool careful;	460	bool careful;
439		461
440	// prefer font of first character, for no good reasons	462	// prefer font of first character, for no good reasons
441	*chrs = cc->c2;	463	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	464	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	465	? f1
444	: (*fs)[fs->find_font (cc->c2)];	466	: (*fs)[fs->find_font_idx (cc->c2)];
445		467
446	f2->draw (d, x, y, chrs, width, fg, -1);	468	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	469	}
448	}	470	}
449	#endif	471	#endif
450	else	472	else
451	switch (t)	473	switch (t)
…		…
453	case '\t':	475	case '\t':
454	case ZERO_WIDTH_CHAR:	476	case ZERO_WIDTH_CHAR:
455	case NOCHAR:	477	case NOCHAR:
456	break;	478	break;
457		479
		480	/*
		481	* If the base font does not support variation selectors, treat them as ZWC.
		482	* a point could be made to do this for all wcwidth == 0 characters, but I
		483	* decided against that until more data is available.
		484	*/
		485	case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
		486	case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
		487	break;
		488
458	default:	489	default:
459	XDrawRectangle (disp, d, gc, x + 2, y + 2,	490	XDrawRectangle (disp, d, gc, x + 2, y + 2,
460	fwidth - 4, term->fheight - 4);	491	fwidth - 4, term->fheight - 4);
461	}	492	}
462		493
463	x += fwidth;	494	x += fwidth;
464	}	495	}
465	}	496	}
466		497
		498	struct rxvt_font_overflow : rxvt_font
		499	{
		500	struct rxvt_fontset *fs;
		501
		502	rxvt_font_overflow (rxvt_fontset *fs)
		503	: rxvt_font ()
		504	{
		505	this->fs = fs;
		506	}
		507
		508	rxvt_fontprop properties ()
		509	{
		510	rxvt_fontprop p;
		511
		512	p.width = p.height = 1;
		513	p.ascent = rxvt_fontprop::unset;
		514	p.weight = rxvt_fontprop::medium;
		515	p.slant = rxvt_fontprop::roman;
		516
		517	return p;
		518	}
		519
		520	bool load (const rxvt_fontprop &prop, bool force_prop)
		521	{
		522	width = 1; height = 1;
		523	ascent = 1; descent = 0;
		524
		525	set_name (strdup ("built-in rendition overflow font"));
		526
		527	return true;
		528	}
		529
		530	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		531	{
		532	return false;
		533	}
		534
		535	void draw (rxvt_drawable &d, int x, int y,
		536	const text_t *text, int len,
		537	int fg, int bg)
		538	{
		539	while (len)
		540	{
		541	int fid = fs->find_font_idx (*text);
		542	int w = 1;
		543	while (w < len && text[w] == NOCHAR)
		544	w++;
		545	(*fs)[fid]->draw (d, x, y, text, w, fg, bg);
		546	text += w;
		547	len -= w;
		548	x += term->fwidth * w;
		549	}
		550	}
		551	};
		552
467	/////////////////////////////////////////////////////////////////////////////	553	/////////////////////////////////////////////////////////////////////////////
468		554
469	struct rxvt_font_x11 : rxvt_font {	555	struct rxvt_font_x11 : rxvt_font
		556	{
470	rxvt_font_x11 () { f = 0; }	557	rxvt_font_x11 () { f = 0; }
471		558
472	void clear ();	559	void clear ();
473		560
474	rxvt_fontprop properties ();	561	rxvt_fontprop properties ();
…		…
479		566
480	void draw (rxvt_drawable &d, int x, int y,	567	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	568	const text_t *text, int len,
482	int fg, int bg);	569	int fg, int bg);
483		570
484	bool slow; // wether this is a proportional font or has other funny characteristics	571	bool slow; // whether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	572	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	573	bool enc2b, encm;
488		574
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	575	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);	576	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);	577	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	584	unsigned long value;
499		585
500	if (XGetFontProperty (f, property, &value))	586	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	587	return XGetAtomName (term->dpy, value);
502	else	588	else
503	return rxvt_strdup (repl);	589	return repl ? strdup (repl) : 0;
504	}	590	}
505		591
506	rxvt_fontprop	592	rxvt_fontprop
507	rxvt_font_x11::properties ()	593	rxvt_font_x11::properties ()
508	{	594	{
…		…
590	return false;	676	return false;
591	}	677	}
592		678
593	// fix the size of scalable fonts	679	// fix the size of scalable fonts
594	static bool	680	static bool
595	replace_field (char buf, const char name, int index, const char old, const char *replace)	681	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
596	{	682	{
597	int slashes = 0;	683	int slashes = 0;
598	const char field, end;	684	const char field, end;
599		685
600	for (const char c = name; c; c++)	686	for (const char c = name; c; c++)
…		…
610	break;	696	break;
611	}	697	}
612		698
613	if (slashes >= 13 && (!old \|\| *field == old))	699	if (slashes >= 13 && (!old \|\| *field == old))
614	{	700	{
615	// TODO: check for overflow in font-name	701	size_t len = field - name;
616	strncpy (buf, name, field - name);	702	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	703	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	704	strcpy (*ptr + len, replace);
619	strcat (buf, end);	705	strcat (*ptr, end);
620		706
621	return true;	707	return true;
622	}	708	}
623	else	709	else
624	{	710	{
625	strcpy (buf, name);	711	*ptr = strdup (name);
626		712
627	return false;	713	return false;
628	}	714	}
629	}	715	}
630		716
…		…
638	char field_str[64]; // enough for 128 bits	724	char field_str[64]; // enough for 128 bits
639		725
640	// first morph the font if required	726	// first morph the font if required
641	if (force_prop)	727	if (force_prop)
642	{	728	{
643	char fname[1024];	729	char *fname;
644		730
645	if (name[0] != '-')	731	if (name[0] != '-')
646	{	732	{
647	f = XLoadQueryFont (disp, name);	733	f = XLoadQueryFont (disp, name);
648		734
649	if (!f)	735	if (!f)
650	return false;	736	return false;
651		737
652	char *new_name = get_property (f, XA_FONT, name);	738	char *new_name = get_property (f, XA_FONT, 0);
653		739
654	if (new_name)	740	if (new_name)
655	set_name (new_name);	741	set_name (new_name);
656	else	742	else
657	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	743	rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
658		744
659	XFreeFont (disp, f);	745	XFreeFont (disp, f);
660	f = 0;	746	f = 0;
661	}	747	}
662		748
663	if (prop.weight != rxvt_fontprop::unset)	749	if (prop.weight != rxvt_fontprop::unset)
664	{	750	{
665	replace_field (fname, name, 2, 0,	751	replace_field (&fname, name, 2, 0,
666	prop.weight < rxvt_fontprop::bold	752	prop.weight < rxvt_fontprop::bold
667	? "medium" : "bold");	753	? "medium" : "bold");
668	set_name (strdup (fname));	754	set_name (fname);
669	}	755	}
670		756
671	if (prop.slant != rxvt_fontprop::unset)	757	if (prop.slant != rxvt_fontprop::unset)
672	{	758	{
673	replace_field (fname, name, 3, 0,	759	replace_field (&fname, name, 3, 0,
674	prop.slant < rxvt_fontprop::italic	760	prop.slant < rxvt_fontprop::italic
675	? "r" : "i"); // TODO: handle "o"blique, too	761	? "r" : "i"); // TODO: handle "o"blique, too
676	set_name (strdup (fname));	762	set_name (fname);
677	}	763	}
678	}	764	}
679		765
680	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	766	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
681	? 0 : prop.height);	767	? 0 : prop.height);
…		…
706	font_weight *fonts = new font_weight[count];	792	font_weight *fonts = new font_weight[count];
707		793
708	for (int i = 0; i < count; i++)	794	for (int i = 0; i < count; i++)
709	{	795	{
710	rxvt_fontprop p;	796	rxvt_fontprop p;
711	char fname[1024];	797	char *fname;
712		798
713	int diff = 0;	799	int diff = 0;
714		800
715	if (replace_field (fname, list[i], 6, '0', field_str))	801	if (replace_field (&fname, list[i], 6, '0', field_str))
716	diff += 10; // slightly penalize scalable fonts	802	diff += 10; // slightly penalize scalable fonts
		803	else
		804	{
		805	free (fname);
717	else if (replace_field (fname, list[i], 11, '0', "0"))	806	if (replace_field (&fname, list[i], 11, '0', "0"))
718	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	807	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		808	}
719		809
720	if (!set_properties (p, fname))	810	if (!set_properties (p, fname)
		811	// also weed out too large fonts
		812	\|\| (prop.height != rxvt_fontprop::unset
		813	&& p.height > prop.height))
		814	{
		815	free (fname);
721	continue;	816	continue;
722		817	}
723	if (prop.height != rxvt_fontprop::unset
724	&& p.height > prop.height) // weed out too large fonts
725	continue;
726		818
727	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	819	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);	820	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);	821	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);	822	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
731		823
732	fonts[i].name = strdup (fname);	824	fonts[i].name = fname;
733	fonts[i].diff = diff;	825	fonts[i].diff = diff;
734	}	826	}
735		827
736	XFreeFontNames (list);	828	XFreeFontNames (list);
737		829
738	// this loop only iterates when the guessed font-size is too small	830	// this loop only iterates when the guessed font-size is too small
739	for (;;)	831	for (;;)
740	{	832	{
741	font_weight *best = fonts + count - 1;	833	font_weight *best = fonts;
742		834
743	for (font_weight *w = best; w-- > fonts; )	835	for (font_weight *w = fonts + 1; w < fonts + count; w++)
744	if (w->diff <= best->diff)	836	if (w->diff < best->diff)
745	best = w;	837	best = w;
746		838
747	if (!best->name	839	if (!best->name
748	\|\| !(f = XLoadQueryFont (disp, best->name)))	840	\|\| !(f = XLoadQueryFont (disp, best->name)))
749	break;	841	break;
…		…
769	return false;	861	return false;
770		862
771	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	863	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
772	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	864	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
773		865
		866	cs = CS_UNKNOWN;
		867
774	if (registry && encoding)	868	if (registry && encoding)
775	{	869	{
776	char charset[64];	870	char charset[64];
777	snprintf (charset, 64, "%s-%s", registry, encoding);	871	snprintf (charset, 64, "%s-%s", registry, encoding);
778		872
779	cs = codeset_from_name (charset);	873	cs = codeset_from_name (charset);
780	}	874
781	else	875	if (cs == CS_UNKNOWN)
		876	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
782	{	877	}
		878
		879	free (registry);
		880	free (encoding);
		881
		882	if (cs == CS_UNKNOWN)
		883	{
783	const char *charset = get_property (f, XA_FONT, 0);	884	char *value = get_property (f, XA_FONT, 0);
		885	const char *charset = value;
784		886
785	if (!charset)	887	if (!charset)
786	charset = name;	888	charset = name;
787		889
788	int count = 13;	890	int count = 13;
789	while (*charset)	891	while (*charset)
790	if (*charset++ == '-' && !--count)	892	if (*charset++ == '-' && !--count)
791	break;	893	break;
792		894
793	cs = codeset_from_name (charset);	895	cs = codeset_from_name (charset);
		896	if (cs == CS_UNKNOWN)
		897	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		898
		899	free (value);
		900	}
		901
		902	if (cs == CS_UNKNOWN)
794	}	903	{
795		904	clear ();
796	free (registry);	905	return false;
797	free (encoding);	906	}
798		907
799	if (cs == CS_UNICODE)	908	if (cs == CS_UNICODE)
800	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	909	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
801		910
802	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	911	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
814	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	923	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
815		924
816	if (encm)	925	if (encm)
817	N += (f->max_byte1 - f->min_byte1)	926	N += (f->max_byte1 - f->min_byte1)
818	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	927	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
819		928
820	while (N)	929	while (N)
821	{	930	{
822	if (f->per_char[N].width > width)	931	if (f->per_char[N].width > width)
823	width = f->per_char[N].width;	932	width = f->per_char[N].width;
824		933
…		…
827	}	936	}
828	#endif	937	#endif
829		938
830	width = 1;	939	width = 1;
831		940
832	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	941	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
833	{	942	{
834	if (FROM_UNICODE (cs, *t) == NOCHAR)	943	if (FROM_UNICODE (cs, *t) == NOCHAR)
835	continue;	944	continue;
836		945
837	// ignore characters we wouldn't use anyways	946	// ignore characters we wouldn't use anyways
838	bool careful;	947	bool careful;
839	if (!has_char (*t, &prop, careful))	948	if (!has_char (*t, &prop, careful))
840	continue;	949	continue;
841		950
842	XChar2b ch = { t >> 8, t };	951	// the casts are needed in C++11 (see 8.5.1)
		952	XChar2b ch = { (unsigned char)(t >> 8), (unsigned char)t };
843		953
844	XCharStruct g;	954	XCharStruct g;
845	int dir_ret, asc_ret, des_ret;	955	int dir_ret, asc_ret, des_ret;
846	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	956	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
847		957
…		…
849	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	959	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
850		960
851	if (width < g.width) width = g.width;	961	if (width < g.width) width = g.width;
852	}	962	}
853		963
854	if (cs == CS_UNKNOWN)	964	#if 0 // do it per-character
		965	if (prop && width > prop->width)
855	{	966	{
856	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
857
858	clear ();	967	clear ();
859	return false;	968	return false;
860	}	969	}
861
862	#if 0 // do it per-character
863	if (prop && width > prop->width)
864	{
865	clear ();
866	return false;
867	}
868	#endif	970	#endif
869		971
870	return true;	972	return true;
871	}	973	}
872		974
…		…
881	}	983	}
882		984
883	bool	985	bool
884	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	986	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
885	{	987	{
		988	careful = false;
		989
886	uint32_t ch = FROM_UNICODE (cs, unicode);	990	uint32_t ch = FROM_UNICODE (cs, unicode);
887		991
888	if (ch == NOCHAR)	992	if (ch == NOCHAR)
889	return false;	993	return false;
890		994
891	/* check wether the character exists in _this_ font. horrible. */	995	/* check whether the character exists in _this_ font. horrible. */
892	XCharStruct *xcs;	996	XCharStruct *xcs;
893		997
894	if (encm)	998	if (encm)
895	{	999	{
896	unsigned char byte1 = ch >> 8;	1000	unsigned char byte1 = ch >> 8;
…		…
926	return false;	1030	return false;
927		1031
928	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1032	if (!prop \|\| prop->width == rxvt_fontprop::unset)
929	return true;	1033	return true;
930		1034
931	// check wether character overlaps previous/next character	1035	// check whether character overlaps previous/next character
932	int w = xcs->rbearing - xcs->lbearing;	1036	int w = xcs->rbearing - xcs->lbearing;
933	int wcw = max (WCWIDTH (unicode), 1);	1037	int wcw = max (WCWIDTH (unicode), 1);
934		1038
935	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1039	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
936		1040
…		…
953	dTermDisplay;	1057	dTermDisplay;
954	dTermGC;	1058	dTermGC;
955		1059
956	bool slow = this->slow	1060	bool slow = this->slow
957	\|\| width != term->fwidth	1061	\|\| width != term->fwidth
958	\|\| height != term->fheight;	1062	\|\| height != term->fheight
		1063	\|\| ascent != f->ascent;
959		1064
960	int base = ascent; // sorry, incorrect: term->fbase;	1065	int base = ascent; // sorry, incorrect: term->fbase;
961		1066
962	XGCValues v;	1067	XGCValues v;
963	v.foreground = term->pix_colors[fg];	1068	v.foreground = term->pix_colors[fg];
…		…
976	else	1081	else
977	{	1082	{
978	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1083	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
979		1084
980	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1085	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
981		1086
982	if (slow)	1087	if (slow)
983	{	1088	{
984	do	1089	do
985	{	1090	{
986	if (xc->byte1 \|\| xc->byte2)	1091	if (xc->byte1 \|\| xc->byte2)
…		…
1008	else	1113	else
1009	{	1114	{
1010	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1115	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1011		1116
1012	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1117	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1013		1118
1014	if (slow)	1119	if (slow)
1015	{	1120	{
1016	do	1121	do
1017	{	1122	{
1018	if (*xc)	1123	if (*xc)
…		…
1031		1136
1032	/////////////////////////////////////////////////////////////////////////////	1137	/////////////////////////////////////////////////////////////////////////////
1033		1138
1034	#if XFT	1139	#if XFT
1035		1140
1036	struct rxvt_font_xft : rxvt_font {	1141	struct rxvt_font_xft : rxvt_font
		1142	{
1037	rxvt_font_xft () { f = 0; }	1143	rxvt_font_xft ()
		1144	{
		1145	f = 0;
		1146	}
1038		1147
1039	void clear ();	1148	void clear ();
1040		1149
1041	rxvt_fontprop properties ();	1150	rxvt_fontprop properties ();
1042		1151
…		…
1044		1153
1045	void draw (rxvt_drawable &d, int x, int y,	1154	void draw (rxvt_drawable &d, int x, int y,
1046	const text_t *text, int len,	1155	const text_t *text, int len,
1047	int fg, int bg);	1156	int fg, int bg);
1048		1157
1049	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1158	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1050		1159
1051	protected:	1160	protected:
1052	XftFont *f;	1161	XftFont *f;
1053	};	1162	};
1054		1163
…		…
1110	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1219	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1111		1220
1112	#if 0 // clipping unfortunately destroys our precious double-width-characters	1221	#if 0 // clipping unfortunately destroys our precious double-width-characters
1113	// clip width, we can't do better, or can we?	1222	// clip width, we can't do better, or can we?
1114	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1223	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1115	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1224	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1116	#endif	1225	#endif
1117		1226
1118	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1227	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1119	FcPatternAddBool (p, FC_MINSPACE, 1);	1228	FcPatternAddBool (p, FC_MINSPACE, 1);
1120		1229
…		…
1132	int ftheight = 0;	1241	int ftheight = 0;
1133	bool success = true;	1242	bool success = true;
1134		1243
1135	for (;;)	1244	for (;;)
1136	{	1245	{
		1246	p = FcPatternDuplicate (match);
1137	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));	1247	f = XftFontOpenPattern (disp, p);
1138		1248
1139	if (!f)	1249	if (!f)
1140	{	1250	{
		1251	FcPatternDestroy (p);
1141	success = false;	1252	success = false;
1142	break;	1253	break;
1143	}	1254	}
1144		1255
1145	FT_Face face = XftLockFace (f);	1256	FT_Face face = XftLockFace (f);
…		…
1153		1264
1154	XftUnlockFace (f);	1265	XftUnlockFace (f);
1155		1266
1156	int glheight = height;	1267	int glheight = height;
1157		1268
1158	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1269	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1159	{	1270	{
1160	FcChar16 ch = *t;	1271	FcChar16 ch = *t;
1161		1272
1162	if (cs != CS_UNICODE	1273	if (cs != CS_UNICODE
1163	&& ch > 0x100	1274	&& ch > 0x100
…		…
1264	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1375	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1265	const text_t *text, int len,	1376	const text_t *text, int len,
1266	int fg, int bg)	1377	int fg, int bg)
1267	{	1378	{
1268	XGlyphInfo extents;	1379	XGlyphInfo extents;
1269	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1380	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1270	XftGlyphSpec *ep = enc;	1381	XftGlyphSpec *ep = enc;
1271		1382
1272	dTermDisplay;	1383	dTermDisplay;
1273	dTermGC;	1384	dTermGC;
1274		1385
1275	int w = term->fwidth * len;	1386	int w = term->fwidth * len;
1276	int h = term->fheight;	1387	int h = term->fheight;
1277		1388
1278	bool buffered = bg >= 0 // we don't use a transparent bg	1389	bool buffered = bg >= Color_transparent
1279	#ifndef FORCE_UNBUFFERED_XFT	1390	&& 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		1391
1287	// cut trailing spaces	1392	// cut trailing spaces
1288	while (len && text [len - 1] == ' ')	1393	while (len && text [len - 1] == ' ')
1289	len--;	1394	len--;
1290		1395
…		…
1296	int cwidth = term->fwidth;	1401	int cwidth = term->fwidth;
1297	FcChar32 fc = *text++; len--;	1402	FcChar32 fc = *text++; len--;
1298		1403
1299	while (len && *text == NOCHAR)	1404	while (len && *text == NOCHAR)
1300	text++, len--, cwidth += term->fwidth;	1405	text++, len--, cwidth += term->fwidth;
1301		1406
1302	if (fc != ' ') // skip spaces	1407	if (fc != ' ') // skip spaces
1303	{	1408	{
1304	FT_UInt glyph = XftCharIndex (disp, f, fc);	1409	FT_UInt glyph = XftCharIndex (disp, f, fc);
1305	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1410	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1306		1411
…		…
1321	{	1426	{
1322	if (ep != enc)	1427	if (ep != enc)
1323	{	1428	{
1324	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1429	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1325		1430
1326	if (0)	1431	#ifdef HAVE_IMG
1327	;	1432	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1328	#ifdef TRANSPARENT	1433
1329	else if (bg < 0 && term->am_pixmap_trans)	1434	if (term->bg_img
1330	XCopyArea (disp, term->pixmap, d2, gc,	1435	&& (bg == Color_transparent \|\| bg == Color_bg
1331	x + term->window_vt_x, y + term->window_vt_y,	1436	\|\| (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	{	1437	{
		1438	int src_x = x, src_y = y;
		1439
		1440	if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
		1441	{
		1442	src_x += term->window_vt_x;
		1443	src_y += term->window_vt_y;
		1444	}
		1445
		1446	if (term->bg_img->w >= src_x + w
		1447	&& term->bg_img->h >= src_y + h)
		1448	{
		1449	XCopyArea (disp, term->bg_img->pm, d2, gc,
		1450	src_x, src_y, w, h, 0, 0);
		1451	}
		1452	else
		1453	{
1337	XGCValues gcv;	1454	XGCValues gcv;
1338		1455
1339	gcv.fill_style = FillTiled;	1456	gcv.fill_style = FillTiled;
1340	gcv.tile = term->pixmap;	1457	gcv.tile = term->bg_img->pm;
1341	gcv.ts_x_origin = -x;	1458	gcv.ts_x_origin = -src_x;
1342	gcv.ts_y_origin = -y;	1459	gcv.ts_y_origin = -src_y;
1343		1460
1344	GC gc2 = XCreateGC (disp, d2,	1461	XChangeGC (disp, gc,
1345	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1462	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1346	&gcv);	1463	&gcv);
1347		1464
1348	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1465	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1349		1466
1350	XFreeGC (disp, gc2);	1467	gcv.fill_style = FillSolid;
		1468	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1469	}
		1470
		1471	if (dst)
		1472	{
		1473	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1474
		1475	// dst can only be set when bg >= 0
		1476	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1477	}
1351	}	1478	}
1352	#endif
1353	else	1479	else
		1480	#endif
1354	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1481	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1355		1482
1356	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1483	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1357	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1484	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1358	}	1485	}
1359	else	1486	else
…		…
1387	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1514	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1388	= rxvt_fontprop::unset;	1515	= rxvt_fontprop::unset;
1389	force_prop = false;	1516	force_prop = false;
1390		1517
1391	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1518	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1392	FONT_UNREF (*i);	1519	(*i)->unref ();
1393		1520
1394	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1521	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1395	delete *p;	1522	delete *p;
1396		1523
1397	free (fontdesc); fontdesc = 0;	1524	free (fontdesc); fontdesc = 0;
…		…
1399	fonts.clear ();	1526	fonts.clear ();
1400		1527
1401	fallback = fallback_fonts;	1528	fallback = fallback_fonts;
1402	}	1529	}
1403		1530
		1531	void
		1532	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1533	{
		1534	font->set_term (term);
		1535
		1536	font->cs = cs;
		1537	font->loaded = false;
		1538	}
		1539
1404	rxvt_font *	1540	rxvt_font *
1405	rxvt_fontset::new_font (const char *name, codeset cs)	1541	rxvt_fontset::new_font (const char *name, codeset cs)
1406	{	1542	{
1407	rxvt_font *f;	1543	rxvt_font *f;
1408		1544
1409	if (!name \|\| !*name)	1545	if (!name \|\| !*name)
1410	{	1546	{
1411	name = "";	1547	name = "";
1412	f = new rxvt_font_default (this);	1548	f = new rxvt_font_default (this);
1413	}	1549	}
…		…
1424	f = new rxvt_font_x11;	1560	f = new rxvt_font_x11;
1425	}	1561	}
1426	else	1562	else
1427	f = new rxvt_font_x11;	1563	f = new rxvt_font_x11;
1428		1564
1429	f->set_term (term);
1430	f->set_name (strdup (name));	1565	f->set_name (strdup (name));
1431		1566	prepare_font (f, cs);
1432	f->cs = cs;
1433	f->loaded = false;
1434		1567
1435	return f;	1568	return f;
1436	}	1569	}
1437		1570
1438	/////////////////////////////////////////////////////////////////////////////	1571	/////////////////////////////////////////////////////////////////////////////
		1572
		1573	void
		1574	rxvt_fontset::push_font (rxvt_font *font)
		1575	{
		1576	// the fontCount index is reserved for the overflow font, it is only
		1577	// necessary when we get fontCount or more fonts, as they cannot be
		1578	// represented in the rendition.
		1579	if (fonts.size () == fontCount)
		1580	{
		1581	rxvt_font *f = new rxvt_font_overflow (this);
		1582
		1583	prepare_font (f, CS_UNICODE);
		1584	fonts.push_back (f);
		1585	}
		1586
		1587	fonts.push_back (font);
		1588	}
1439		1589
1440	void	1590	void
1441	rxvt_fontset::add_fonts (const char *desc)	1591	rxvt_fontset::add_fonts (const char *desc)
1442	{	1592	{
1443	if (desc)	1593	if (desc)
…		…
1472	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);	1622	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1473	else	1623	else
1474	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);	1624	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1475		1625
1476	desc++;	1626	desc++;
1477	while (*desc <= ' ') desc++;	1627	while (desc <= ' ' && desc) desc++;
1478	}	1628	}
1479		1629
1480	end = strchr (desc, ',');	1630	end = strchr (desc, ',');
1481	if (!end)	1631	if (!end)
1482	end = desc + strlen (desc);	1632	end = desc + strlen (desc);
1483		1633
1484	if (end - desc < 511)	1634	if (end - desc < 511)
1485	{	1635	{
1486	strncpy (buf, desc, end - desc);	1636	memcpy (buf, desc, end - desc);
1487	buf[end - desc] = 0;	1637	buf[end - desc] = 0;
1488		1638
1489	fonts.push_back (new_font (buf, cs));	1639	push_font (new_font (buf, cs));
1490	}	1640	}
1491	else	1641	else
1492	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1642	rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1493		1643
1494	desc = end + 1;	1644	desc = end + 1;
1495	}	1645	}
1496	while (*end);	1646	while (*end);
1497	}	1647	}
…		…
1522	{	1672	{
1523	clear ();	1673	clear ();
1524		1674
1525	fontdesc = strdup (desc);	1675	fontdesc = strdup (desc);
1526		1676
1527	fonts.push_back (new_font (0, CS_UNICODE));	1677	push_font (new_font (0, CS_UNICODE));
1528	realize_font (0);	1678	realize_font (0);
1529		1679
1530	add_fonts (desc);	1680	add_fonts (desc);
1531		1681
1532	return true;	1682	return true;
…		…
1541		1691
1542	return -1;	1692	return -1;
1543	}	1693	}
1544		1694
1545	int	1695	int
1546	rxvt_fontset::find_font (unicode_t unicode)	1696	rxvt_fontset::find_font_idx (unicode_t unicode)
1547	{	1697	{
1548	if (unicode >= 1<<20)	1698	if (unicode >= 1<<20)
1549	return 0;	1699	return 0;
1550		1700
1551	unicode_t hi = unicode >> 8;	1701	unicode_t hi = unicode >> 8;
…		…
1577	goto next_font;	1727	goto next_font;
1578		1728
1579	bool careful;	1729	bool careful;
1580	if (f->has_char (unicode, &prop, careful))	1730	if (f->has_char (unicode, &prop, careful))
1581	{	1731	{
1582	if (careful)	1732	i = (i << 1) \| careful;
1583	i \|= 128;
1584		1733
1585	goto found;	1734	goto found;
1586	}	1735	}
1587		1736
1588	next_font:	1737	next_font:
1589	if (i == fonts.size () - 1)	1738	if (i == fonts.size () - 1)
1590	{	1739	{
1591	if (fallback->name)	1740	if (fallback->name)
1592	{	1741	{
1593	// search through the fallback list	1742	// search through the fallback list
1594	fonts.push_back (new_font (fallback->name, fallback->cs));	1743	push_font (new_font (fallback->name, fallback->cs));
1595	fallback++;	1744	fallback++;
1596	}	1745	}
1597	else	1746	else
1598	{	1747	{
1599	// try to find a new font.	1748	// try to find a new font.
…		…
1601	// way to configure this and xft is easier to hack in,	1750	// way to configure this and xft is easier to hack in,
1602	// while x11 has more framework in place already.	1751	// while x11 has more framework in place already.
1603	// TODO: this is a real resource hog, xft takes ages(?)	1752	// TODO: this is a real resource hog, xft takes ages(?)
1604	#if XFT && USE_SLOW_LOOKUP	1753	#if XFT && USE_SLOW_LOOKUP
1605	// grab the first xft font that seems suitable	1754	// grab the first xft font that seems suitable
		1755	// TOOD: should go first for cellchar (spacing 110) then mono, then else
1606	FcPattern *p = FcPatternCreate ();	1756	FcPattern *p = FcPatternCreate ();
1607		1757
1608	FcCharSet *s = FcCharSetCreate ();	1758	FcCharSet *s = FcCharSetCreate ();
1609	FcCharSetAddChar (s, unicode);	1759	FcCharSetAddChar (s, unicode);
1610	FcPatternAddCharSet (p, FC_CHARSET, s);	1760	FcPatternAddCharSet (p, FC_CHARSET, s);
…		…
1630	FcPatternDestroy (match);	1780	FcPatternDestroy (match);
1631		1781
1632	if (find_font (font) < 0)	1782	if (find_font (font) < 0)
1633	{	1783	{
1634	char fontname[4096];	1784	char fontname[4096];
1635	sprintf (fontname, "xft:%-.4090s", font);	1785	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1636		1786
1637	fonts.push_back (new_font (fontname, CS_UNICODE));	1787	push_font (new_font (fontname, CS_UNICODE));
1638	}	1788	}
1639		1789
1640	free (font);	1790	free (font);
1641	}	1791	}
1642	#endif	1792	#endif
…		…
1654	while (hi >= fmap.size ())	1804	while (hi >= fmap.size ())
1655	fmap.push_back (0);	1805	fmap.push_back (0);
1656		1806
1657	if (!fmap[hi])	1807	if (!fmap[hi])
1658	{	1808	{
1659	fmap[hi] = (pagemap *)new pagemap;	1809	fmap[hi] = new pagemap;
1660	memset (fmap[hi], 0xff, sizeof (pagemap));	1810	memset (fmap[hi], 0xff, sizeof (pagemap));
1661	}	1811	}
1662		1812
1663	(*fmap[hi])[unicode & 0xff] = i;	1813	(*fmap[hi])[unicode & 0xff] = i;
1664	}	1814	}
1665		1815
1666	return i;	1816	return i;
1667	}	1817	}
1668		1818
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.199 by root, Thu Jun 17 00:08:35 2021 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.199 by root, Thu Jun 17 00:08:35 2021 UTC