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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.94 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 2021 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2008 Marc Lehmann <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
166	/////////////////////////////////////////////////////////////////////////////
167
168	#if XFT
169	rxvt_drawable::~rxvt_drawable ()
170	{
171	if (xftdrawable)
172	XftDrawDestroy (xftdrawable);
173	}
174
175	rxvt_drawable::operator XftDraw *()
176	{
177	if (!xftdrawable)
178	xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
179
180	return xftdrawable;
181	}
182	#endif
183		165
184	/////////////////////////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////////////////////////
185		167
186	static const char *	168	static const char *
187	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	169	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
…		…
235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236	{	218	{
237	}	219	}
238		220
239	void	221	void
240	rxvt_font::set_name (char *name)	222	rxvt_font::set_name (char *name_)
241	{	223	{
242	if (this->name == name)	224	if (name == name_)
243	return;	225	return;
244		226
245	if (this->name) free (this->name); // let the compiler optimize	227	if (name) free (name); // let the compiler optimize
246	this->name = name;	228	name = name_;
247	}	229	}
248		230
249	void	231	void
250	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
251	{	233	{
252	dTermDisplay;	234	dTermDisplay;
253	dTermGC;	235	dTermGC;
254		236
255	if (color == Color_bg)	237	if (color == Color_bg \|\| color == Color_transparent)
256	XClearArea (disp, d, x, y, w, h, false);	238	XClearArea (disp, d, x, y, w, h, false);
257	else if (color >= 0)	239	else if (color >= 0)
258	{	240	{
259	#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
260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	256	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		257
261	#else	258	#else
262	XSetForeground (disp, gc, term->pix_colors[color]);	259	XSetForeground (disp, gc, term->pix_colors[color]);
263	XFillRectangle (disp, d, gc, x, y, w, h);	260	XFillRectangle (disp, d, gc, x, y, w, h);
264	#endif	261	#endif
265	}	262	}
266	}	263	}
267		264
268	/////////////////////////////////////////////////////////////////////////////	265	/////////////////////////////////////////////////////////////////////////////
269		266
270	#include "table/linedraw.h"
271
272	struct rxvt_font_default : rxvt_font {	267	struct rxvt_font_default : rxvt_font
		268	{
273	struct rxvt_fontset *fs;	269	struct rxvt_fontset *fs;
274		270
275	rxvt_font_default (rxvt_fontset *fs)	271	rxvt_font_default (rxvt_fontset *fs)
276	: rxvt_font ()	272	: rxvt_font ()
277	{	273	{
…		…
288	p.slant = rxvt_fontprop::roman;	284	p.slant = rxvt_fontprop::roman;
289		285
290	return p;	286	return p;
291	}	287	}
292		288
293	bool load (const rxvt_fontprop &prop)	289	bool load (const rxvt_fontprop &prop, bool force_prop)
294	{	290	{
295	width = 1; height = 1;	291	width = 1; height = 1;
296	ascent = 1; descent = 0;	292	ascent = 1; descent = 0;
297		293
298	set_name (strdup ("built-in support font"));	294	set_name (strdup ("built-in support font"));
…		…
311	return false;	307	return false;
312		308
313	if (unicode <= 0x009f)	309	if (unicode <= 0x009f)
314	return true;	310	return true;
315		311
		312	#ifdef BUILTIN_GLYPHS
316	if (unicode >= 0x2500 && unicode <= 0x259f &&	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
317	!term->option (Opt_skipBuiltinGlyphs))	314	!term->option (Opt_skipBuiltinGlyphs))
318	return true;	315	return true;
		316	#endif
319		317
320	if (IS_COMPOSE (unicode))	318	// we do not check for IS_COMPOSE here, as this would
321	return true;	319	// rob other fonts from taking over.
322		320
323	switch (unicode)	321	switch (unicode)
324	{	322	{
325	case ZERO_WIDTH_CHAR:	323	case ZERO_WIDTH_CHAR:
326	case NOCHAR:	324	case NOCHAR:
…		…
347		345
348	XSetForeground (disp, gc, term->pix_colors[fg]);	346	XSetForeground (disp, gc, term->pix_colors[fg]);
349		347
350	while (len)	348	while (len)
351	{	349	{
		350	const text_t *tp = text;
		351	text_t t = *tp;
		352
		353	while (++text, --len && *text == NOCHAR)
		354	;
		355
352	#if ENABLE_COMBINING	356	#if ENABLE_COMBINING
353	compose_char *cc;	357	compose_char *cc;
354	#endif	358	#endif
355	const text_t *tp = text;
356	text_t t = *tp;
357
358	while (++text, --len && *text == NOCHAR)
359	;
360
361	int width = text - tp;	359	int width = text - tp;
362	int fwidth = term->fwidth * width;	360	int fwidth = term->fwidth * width;
363		361
		362	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
365	{	364	{
		365	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	366	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	367	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	368	uint32_t *b = a + (offs & 15);
369		369
370	int W = fwidth;	370	int W = fwidth;
…		…
408		408
409	case 1: // rectangle, possibly stippled	409	case 1: // rectangle, possibly stippled
410	if (a)	410	if (a)
411	{	411	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		413
414	gcv.fill_style = FillStippled;	414	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	416	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	417	gcv.ts_y_origin = y;
418		418
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	437	(a - 1) * 9064, (b - 1) 90*64);
438	break;	438	break;
439	}	439	}
440	}	440	}
441	}	441	}
		442	#else
		443	if (0)
		444	;
		445	#endif
442	#if ENABLE_COMBINING	446	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	448	{
445	min_it (width, 2); // we only support wcwidth up to 2	449	min_it (width, 2); // we only support wcwidth up to 2
446
447	text_t chrs[2];	450	text_t chrs[2];
448	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
449		452
450	*chrs = cc->c1;	453	*chrs = cc->c1;
451	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
452	f1->draw (d, x, y, chrs, width, fg, bg);	455	f1->draw (d, x, y, chrs, width, fg, bg);
453		456
454	if (cc->c2 != NOCHAR)	457	if (cc->c2 != NOCHAR)
455	{	458	{
456	bool careful;	459	bool careful;
457		460
458	// prefer font of first character, for no good reasons	461	// prefer font of first character, for no good reasons
459	*chrs = cc->c2;	462	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	463	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	464	? f1
462	: (*fs)[fs->find_font (cc->c2)];	465	: (*fs)[fs->find_font_idx (cc->c2)];
463		466
464	f2->draw (d, x, y, chrs, width, fg, -1);	467	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	468	}
466	}	469	}
467	#endif	470	#endif
468	else	471	else
469	switch (t)	472	switch (t)
…		…
471	case '\t':	474	case '\t':
472	case ZERO_WIDTH_CHAR:	475	case ZERO_WIDTH_CHAR:
473	case NOCHAR:	476	case NOCHAR:
474	break;	477	break;
475		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
476	default:	488	default:
477	XDrawRectangle (disp, d, gc, x + 2, y + 2,	489	XDrawRectangle (disp, d, gc, x + 2, y + 2,
478	fwidth - 4, term->fheight - 4);	490	fwidth - 4, term->fheight - 4);
479	}	491	}
480		492
481	x += fwidth;	493	x += fwidth;
482	}	494	}
483	}	495	}
484		496
		497	struct rxvt_font_overflow : rxvt_font
		498	{
		499	struct rxvt_fontset *fs;
		500
		501	rxvt_font_overflow (rxvt_fontset *fs)
		502	: rxvt_font ()
		503	{
		504	this->fs = fs;
		505	}
		506
		507	rxvt_fontprop properties ()
		508	{
		509	rxvt_fontprop p;
		510
		511	p.width = p.height = 1;
		512	p.ascent = rxvt_fontprop::unset;
		513	p.weight = rxvt_fontprop::medium;
		514	p.slant = rxvt_fontprop::roman;
		515
		516	return p;
		517	}
		518
		519	bool load (const rxvt_fontprop &prop, bool force_prop)
		520	{
		521	width = 1; height = 1;
		522	ascent = 1; descent = 0;
		523
		524	set_name (strdup ("built-in rendition overflow font"));
		525
		526	return true;
		527	}
		528
		529	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		530	{
		531	return false;
		532	}
		533
		534	void draw (rxvt_drawable &d, int x, int y,
		535	const text_t *text, int len,
		536	int fg, int bg)
		537	{
		538	while (len)
		539	{
		540	int fid = fs->find_font_idx (*text);
		541	int w = 1;
		542	while (w < len && text[w] == NOCHAR)
		543	w++;
		544	(*fs)[fid]->draw (d, x, y, text, w, fg, bg);
		545	text += w;
		546	len -= w;
		547	x += term->fwidth * w;
		548	}
		549	}
		550	};
		551
485	/////////////////////////////////////////////////////////////////////////////	552	/////////////////////////////////////////////////////////////////////////////
486		553
487	struct rxvt_font_x11 : rxvt_font {	554	struct rxvt_font_x11 : rxvt_font
		555	{
488	rxvt_font_x11 () { f = 0; }	556	rxvt_font_x11 () { f = 0; }
489		557
490	void clear ();	558	void clear ();
491		559
492	rxvt_fontprop properties ();	560	rxvt_fontprop properties ();
493		561
494	bool load (const rxvt_fontprop &prop);	562	bool load (const rxvt_fontprop &prop, bool force_prop);
495		563
496	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	564	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497		565
498	void draw (rxvt_drawable &d, int x, int y,	566	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	567	const text_t *text, int len,
500	int fg, int bg);	568	int fg, int bg);
501		569
502	bool slow; // wether this is a proportional font or has other funny characteristics	570	bool slow; // whether this is a proportional font or has other funny characteristics
503	XFontStruct *f;	571	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	572	bool enc2b, encm;
506		573
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	574	char get_property (XFontStruct f, Atom property, const char *repl) const;
508	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	575	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
509	bool set_properties (rxvt_fontprop &p, XFontStruct *f);	576	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
516	unsigned long value;	583	unsigned long value;
517		584
518	if (XGetFontProperty (f, property, &value))	585	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->dpy, value);	586	return XGetAtomName (term->dpy, value);
520	else	587	else
521	return rxvt_strdup (repl);	588	return repl ? strdup (repl) : 0;
522	}	589	}
523		590
524	rxvt_fontprop	591	rxvt_fontprop
525	rxvt_font_x11::properties ()	592	rxvt_font_x11::properties ()
526	{	593	{
…		…
608	return false;	675	return false;
609	}	676	}
610		677
611	// fix the size of scalable fonts	678	// fix the size of scalable fonts
612	static bool	679	static bool
613	replace_field (char buf, const char name, int index, const char old, const char *replace)	680	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
614	{	681	{
615	int slashes = 0;	682	int slashes = 0;
616	const char field, end;	683	const char field, end;
617		684
618	for (const char c = name; c; c++)	685	for (const char c = name; c; c++)
…		…
628	break;	695	break;
629	}	696	}
630		697
631	if (slashes >= 13 && (!old \|\| *field == old))	698	if (slashes >= 13 && (!old \|\| *field == old))
632	{	699	{
633	// TODO: check for overflow in font-name	700	size_t len = field - name;
634	strncpy (buf, name, field - name);	701	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	702	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	703	strcpy (*ptr + len, replace);
637	strcat (buf, end);	704	strcat (*ptr, end);
638		705
639	return true;	706	return true;
640	}	707	}
641	else	708	else
642	{	709	{
643	strcpy (buf, name);	710	*ptr = strdup (name);
644		711
645	return false;	712	return false;
646	}	713	}
647	}	714	}
648		715
649	bool	716	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	717	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	718	{
652	dTermDisplay;	719	dTermDisplay;
653		720
654	clear ();	721	clear ();
655		722
656	char field_str[64]; // enough for 128 bits	723	char field_str[64]; // enough for 128 bits
657		724
658	// first morph the font if required	725	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	726	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	727	{
662	char fname[1024];	728	char *fname;
663		729
664	if (name[0] != '-')	730	if (name[0] != '-')
665	{	731	{
666	f = XLoadQueryFont (disp, name);	732	f = XLoadQueryFont (disp, name);
667		733
668	if (!f)	734	if (!f)
669	return false;	735	return false;
670		736
671	char *new_name = get_property (f, XA_FONT, name);	737	char *new_name = get_property (f, XA_FONT, 0);
672		738
673	if (new_name)	739	if (new_name)
674	set_name (new_name);	740	set_name (new_name);
675	else	741	else
676	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	742	rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677		743
678	XFreeFont (disp, f);	744	XFreeFont (disp, f);
679	f = 0;	745	f = 0;
680	}	746	}
681		747
682	if (prop.weight != rxvt_fontprop::unset)	748	if (prop.weight != rxvt_fontprop::unset)
683	{	749	{
684	replace_field (fname, name, 2, 0,	750	replace_field (&fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	751	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	752	? "medium" : "bold");
687	set_name (strdup (fname));	753	set_name (fname);
688	}	754	}
689		755
690	if (prop.slant != rxvt_fontprop::unset)	756	if (prop.slant != rxvt_fontprop::unset)
691	{	757	{
692	replace_field (fname, name, 3, 0,	758	replace_field (&fname, name, 3, 0,
693	prop.slant < rxvt_fontprop::italic	759	prop.slant < rxvt_fontprop::italic
694	? "r" : "i"); // TODO: handle "o"blique, too	760	? "r" : "i"); // TODO: handle "o"blique, too
695	set_name (strdup (fname));	761	set_name (fname);
696	}	762	}
697	}	763	}
698		764
699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	765	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700	? 0 : prop.height);	766	? 0 : prop.height);
…		…
725	font_weight *fonts = new font_weight[count];	791	font_weight *fonts = new font_weight[count];
726		792
727	for (int i = 0; i < count; i++)	793	for (int i = 0; i < count; i++)
728	{	794	{
729	rxvt_fontprop p;	795	rxvt_fontprop p;
730	char fname[1024];	796	char *fname;
731		797
732	int diff = 0;	798	int diff = 0;
733		799
734	if (replace_field (fname, list[i], 6, '0', field_str))	800	if (replace_field (&fname, list[i], 6, '0', field_str))
735	diff += 10; // slightly penalize scalable fonts	801	diff += 10; // slightly penalize scalable fonts
		802	else
		803	{
		804	free (fname);
736	else if (replace_field (fname, list[i], 11, '0', "0"))	805	if (replace_field (&fname, list[i], 11, '0', "0"))
737	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	806	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		807	}
738		808
739	if (!set_properties (p, fname))	809	if (!set_properties (p, fname)
		810	// also weed out too large fonts
		811	\|\| (prop.height != rxvt_fontprop::unset
		812	&& p.height > prop.height))
		813	{
		814	free (fname);
740	continue;	815	continue;
741		816	}
742	if (prop.height != rxvt_fontprop::unset
743	&& p.height > prop.height) // weed out too large fonts
744	continue;
745		817
746	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	818	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
747	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	819	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
748	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	820	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
749	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	821	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
750		822
751	fonts[i].name = strdup (fname);	823	fonts[i].name = fname;
752	fonts[i].diff = diff;	824	fonts[i].diff = diff;
753	}	825	}
754		826
755	XFreeFontNames (list);	827	XFreeFontNames (list);
756		828
757	// this loop only iterates when the guessed font-size is too small	829	// this loop only iterates when the guessed font-size is too small
758	for (;;)	830	for (;;)
759	{	831	{
760	font_weight *best = fonts + count - 1;	832	font_weight *best = fonts;
761		833
762	for (font_weight *w = best; w-- > fonts; )	834	for (font_weight *w = fonts + 1; w < fonts + count; w++)
763	if (w->diff <= best->diff)	835	if (w->diff < best->diff)
764	best = w;	836	best = w;
765		837
766	if (!best->name	838	if (!best->name
767	\|\| !(f = XLoadQueryFont (disp, best->name)))	839	\|\| !(f = XLoadQueryFont (disp, best->name)))
768	break;	840	break;
…		…
788	return false;	860	return false;
789		861
790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	862	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	863	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792		864
		865	cs = CS_UNKNOWN;
		866
793	if (registry && encoding)	867	if (registry && encoding)
794	{	868	{
795	char charset[64];	869	char charset[64];
796	snprintf (charset, 64, "%s-%s", registry, encoding);	870	snprintf (charset, 64, "%s-%s", registry, encoding);
797		871
798	cs = codeset_from_name (charset);	872	cs = codeset_from_name (charset);
799	}	873
800	else	874	if (cs == CS_UNKNOWN)
		875	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
801	{	876	}
		877
		878	free (registry);
		879	free (encoding);
		880
		881	if (cs == CS_UNKNOWN)
		882	{
802	const char *charset = get_property (f, XA_FONT, 0);	883	char *value = get_property (f, XA_FONT, 0);
		884	const char *charset = value;
803		885
804	if (!charset)	886	if (!charset)
805	charset = name;	887	charset = name;
806		888
807	int count = 13;	889	int count = 13;
808	while (*charset)	890	while (*charset)
809	if (*charset++ == '-' && !--count)	891	if (*charset++ == '-' && !--count)
810	break;	892	break;
811		893
812	cs = codeset_from_name (charset);	894	cs = codeset_from_name (charset);
		895	if (cs == CS_UNKNOWN)
		896	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		897
		898	free (value);
		899	}
		900
		901	if (cs == CS_UNKNOWN)
813	}	902	{
814		903	clear ();
815	free (registry);	904	return false;
816	free (encoding);	905	}
817		906
818	if (cs == CS_UNICODE)	907	if (cs == CS_UNICODE)
819	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	908	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
820		909
821	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	910	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
833	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	922	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
834		923
835	if (encm)	924	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	925	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	926	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		927
839	while (N)	928	while (N)
840	{	929	{
841	if (f->per_char[N].width > width)	930	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	931	width = f->per_char[N].width;
843		932
…		…
846	}	935	}
847	#endif	936	#endif
848		937
849	width = 1;	938	width = 1;
850		939
851	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	940	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
852	{	941	{
853	if (FROM_UNICODE (cs, *t) == NOCHAR)	942	if (FROM_UNICODE (cs, *t) == NOCHAR)
854	continue;	943	continue;
855		944
856	// ignore characters we wouldn't use anyways	945	// ignore characters we wouldn't use anyways
857	bool careful;	946	bool careful;
858	if (!has_char (*t, &prop, careful))	947	if (!has_char (*t, &prop, careful))
859	continue;	948	continue;
860		949
861	XChar2b ch = { t >> 8, t };	950	// the casts are needed in C++11 (see 8.5.1)
		951	XChar2b ch = { (unsigned char)(t >> 8), (unsigned char)t };
862		952
863	XCharStruct g;	953	XCharStruct g;
864	int dir_ret, asc_ret, des_ret;	954	int dir_ret, asc_ret, des_ret;
865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	955	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866		956
…		…
868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	958	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869		959
870	if (width < g.width) width = g.width;	960	if (width < g.width) width = g.width;
871	}	961	}
872		962
873	if (cs == CS_UNKNOWN)	963	#if 0 // do it per-character
		964	if (prop && width > prop->width)
874	{	965	{
875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877	clear ();	966	clear ();
878	return false;	967	return false;
879	}	968	}
880
881	#if 0 // do it per-character
882	if (prop && width > prop->width)
883	{
884	clear ();
885	return false;
886	}
887	#endif	969	#endif
888		970
889	return true;	971	return true;
890	}	972	}
891		973
…		…
900	}	982	}
901		983
902	bool	984	bool
903	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	985	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
904	{	986	{
		987	careful = false;
		988
905	uint32_t ch = FROM_UNICODE (cs, unicode);	989	uint32_t ch = FROM_UNICODE (cs, unicode);
906		990
907	if (ch == NOCHAR)	991	if (ch == NOCHAR)
908	return false;	992	return false;
909		993
910	/* check wether the character exists in _this_ font. horrible. */	994	/* check whether the character exists in _this_ font. horrible. */
911	XCharStruct *xcs;	995	XCharStruct *xcs;
912		996
913	if (encm)	997	if (encm)
914	{	998	{
915	unsigned char byte1 = ch >> 8;	999	unsigned char byte1 = ch >> 8;
…		…
945	return false;	1029	return false;
946		1030
947	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1031	if (!prop \|\| prop->width == rxvt_fontprop::unset)
948	return true;	1032	return true;
949		1033
950	// check wether character overlaps previous/next character	1034	// check whether character overlaps previous/next character
951	int w = xcs->rbearing - xcs->lbearing;	1035	int w = xcs->rbearing - xcs->lbearing;
952	int wcw = max (WCWIDTH (unicode), 1);	1036	int wcw = max (WCWIDTH (unicode), 1);
953		1037
954	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1038	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955		1039
…		…
972	dTermDisplay;	1056	dTermDisplay;
973	dTermGC;	1057	dTermGC;
974		1058
975	bool slow = this->slow	1059	bool slow = this->slow
976	\|\| width != term->fwidth	1060	\|\| width != term->fwidth
977	\|\| height != term->fheight;	1061	\|\| height != term->fheight
		1062	\|\| ascent != f->ascent;
978		1063
979	int base = ascent; // sorry, incorrect: term->fbase;	1064	int base = ascent; // sorry, incorrect: term->fbase;
980		1065
981	XGCValues v;	1066	XGCValues v;
982	v.foreground = term->pix_colors[fg];	1067	v.foreground = term->pix_colors[fg];
…		…
995	else	1080	else
996	{	1081	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1082	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		1083
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1084	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		1085
1001	if (slow)	1086	if (slow)
1002	{	1087	{
1003	do	1088	do
1004	{	1089	{
1005	if (xc->byte1 \|\| xc->byte2)	1090	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1112	else
1028	{	1113	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1114	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1115
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1116	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1117
1033	if (slow)	1118	if (slow)
1034	{	1119	{
1035	do	1120	do
1036	{	1121	{
1037	if (*xc)	1122	if (*xc)
…		…
1050		1135
1051	/////////////////////////////////////////////////////////////////////////////	1136	/////////////////////////////////////////////////////////////////////////////
1052		1137
1053	#if XFT	1138	#if XFT
1054		1139
1055	struct rxvt_font_xft : rxvt_font {	1140	struct rxvt_font_xft : rxvt_font
		1141	{
1056	rxvt_font_xft () { f = 0; }	1142	rxvt_font_xft ()
		1143	{
		1144	f = 0;
		1145	}
1057		1146
1058	void clear ();	1147	void clear ();
1059		1148
1060	rxvt_fontprop properties ();	1149	rxvt_fontprop properties ();
1061		1150
1062	bool load (const rxvt_fontprop &prop);	1151	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1152
1064	void draw (rxvt_drawable &d, int x, int y,	1153	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1154	const text_t *text, int len,
1066	int fg, int bg);	1155	int fg, int bg);
1067		1156
1068	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1157	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069		1158
1070	protected:	1159	protected:
1071	XftFont *f;	1160	XftFont *f;
1072	};	1161	};
1073		1162
…		…
1100		1189
1101	return p;	1190	return p;
1102	}	1191	}
1103		1192
1104	bool	1193	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1194	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1195	{
1107	dTermDisplay;	1196	dTermDisplay;
1108		1197
1109	clear ();	1198	clear ();
1110		1199
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1208	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1209	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1210	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1211
1123	if (prop.weight != rxvt_fontprop::unset	1212	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1213	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1214	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1215
1127	if (prop.slant != rxvt_fontprop::unset	1216	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1217	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1218	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1219
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1220	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1221	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1222	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1223	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135	#endif	1224	#endif
1136		1225
1137	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1226	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138	FcPatternAddBool (p, FC_MINSPACE, 1);	1227	FcPatternAddBool (p, FC_MINSPACE, 1);
1139		1228
…		…
1151	int ftheight = 0;	1240	int ftheight = 0;
1152	bool success = true;	1241	bool success = true;
1153		1242
1154	for (;;)	1243	for (;;)
1155	{	1244	{
		1245	p = FcPatternDuplicate (match);
1156	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));	1246	f = XftFontOpenPattern (disp, p);
1157		1247
1158	if (!f)	1248	if (!f)
1159	{	1249	{
		1250	FcPatternDestroy (p);
1160	success = false;	1251	success = false;
1161	break;	1252	break;
1162	}	1253	}
1163		1254
1164	FT_Face face = XftLockFace (f);	1255	FT_Face face = XftLockFace (f);
…		…
1172		1263
1173	XftUnlockFace (f);	1264	XftUnlockFace (f);
1174		1265
1175	int glheight = height;	1266	int glheight = height;
1176		1267
1177	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1268	for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1178	{	1269	{
1179	FcChar16 ch = *t;	1270	FcChar16 ch = *t;
1180		1271
1181	if (cs != CS_UNICODE	1272	if (cs != CS_UNICODE
1182	&& ch > 0x100	1273	&& ch > 0x100
…		…
1201	if (glheight < g.height - g.y) glheight = g.height - g.y;	1292	if (glheight < g.height - g.y) glheight = g.height - g.y;
1202	}	1293	}
1203		1294
1204	if (!width)	1295	if (!width)
1205	{	1296	{
1206	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);	1297	rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1207		1298	width = f->max_advance_width;
1208	XftFontClose (disp, f);
1209	f = 0;
1210
1211	success = false;
1212	break;	1299	break;
1213	}	1300	}
1214		1301
1215	if (prop.height == rxvt_fontprop::unset	1302	if (prop.height == rxvt_fontprop::unset
1216	\|\| (height <= prop.height && glheight <= prop.height)	1303	\|\| (height <= prop.height && glheight <= prop.height)
…		…
1251	bool	1338	bool
1252	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1339	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1253	{	1340	{
1254	careful = false;	1341	careful = false;
1255		1342
		1343	rxvt_compose_expand_static<FcChar32> exp;
		1344	FcChar32 *chrs = exp (unicode);
		1345	int nchrs = exp.length (chrs);
		1346
		1347	// allm chars in sequence must be available
		1348	for (int i = 0; i < nchrs; ++i)
1256	if (!XftCharExists (term->dpy, f, unicode))	1349	if (!XftCharExists (term->dpy, f, chrs [i]))
1257	return false;	1350	return false;
1258		1351
1259	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1352	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1260	return true;	1353	return true;
1261		1354
1262	// check character against base font bounding box	1355	int wcw = max (WCWIDTH (chrs [0]), 1);
1263	FcChar32 ch = unicode;	1356
		1357	// we check against all glyph sizes. this is probably wrong,
		1358	// due to the way ->draw positions these glyphs.
		1359	for (int i = 0; i < nchrs; ++i)
		1360	{
1264	XGlyphInfo g;	1361	XGlyphInfo g;
1265	XftTextExtents32 (term->dpy, f, &ch, 1, &g);	1362	XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1266		1363
1267	int w = g.width - g.x;	1364	int w = g.width - g.x;
1268	int wcw = max (WCWIDTH (unicode), 1);
1269		1365
1270	careful = g.x > 0 \|\| w > prop->width * wcw;	1366	careful = g.x > 0 \|\| w > prop->width * wcw;
1271		1367
1272	if (careful && !OVERLAP_OK (w, wcw, prop))	1368	if (careful && !OVERLAP_OK (w, wcw, prop))
1273	return false;	1369	return false;
1274		1370
1275	// this weeds out _totally_ broken fonts, or glyphs	1371	// this weeds out _totally_ broken fonts, or glyphs
1276	if (!OVERLAP_OK (g.xOff, wcw, prop))	1372	if (!OVERLAP_OK (g.xOff, wcw, prop))
1277	return false;	1373	return false;
		1374	}
1278		1375
1279	return true;	1376	return true;
1280	}	1377	}
1281		1378
1282	void	1379	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1380	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1381	const text_t *text, int len,
1285	int fg, int bg)	1382	int fg, int bg)
1286	{	1383	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1384	//XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1288
1289	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1291	XftGlyphSpec *ep = enc;	1385	//XftGlyphSpec *ep = enc;//D
		1386	static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1292		1387
1293	dTermDisplay;	1388	dTermDisplay;
1294	dTermGC;	1389	dTermGC;
		1390
		1391	int w = term->fwidth * len;
		1392	int h = term->fheight;
		1393
		1394	bool buffered = bg >= Color_transparent
		1395	&& term->option (Opt_buffered);
1295		1396
1296	// cut trailing spaces	1397	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1398	while (len && text [len - 1] == ' ')
1298	len--;	1399	len--;
1299		1400
		1401	int x_ = buffered ? 0 : x;
		1402	int y_ = buffered ? 0 : y;
		1403
1300	while (len)	1404	while (len)
1301	{	1405	{
1302	int cwidth = term->fwidth;	1406	int cwidth = term->fwidth;
		1407
		1408	rxvt_compose_expand_static<FcChar32> exp;
1303	FcChar32 fc = *text++; len--;	1409	FcChar32 chrs = exp (text++); len--;
		1410	int nchrs = exp.length (chrs);
1304		1411
1305	while (len && *text == NOCHAR)	1412	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1413	text++, len--, cwidth += term->fwidth;
1307		1414
1308	if (fc != ' ') // skip spaces	1415	if (chrs [0] != ' ') // skip spaces
		1416	{
		1417	#if 1
		1418	FT_UInt glyphs [decltype (exp)::max_size];
		1419
		1420	for (int i = 0; i < nchrs; ++i)
		1421	glyphs [i] = XftCharIndex (disp, f, chrs [i]);
		1422
		1423	for (int i = 0; i < nchrs; ++i)
1309	{	1424	{
		1425	XGlyphInfo ep;
		1426	XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
		1427	printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
		1428	}
		1429	#endif
		1430
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1431	FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
		1432	XGlyphInfo extents0;
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1433	XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1312		1434
		1435	int cx = x_ + (cwidth - extents0.xOff >> 1);
		1436	int cy = y_ + ascent;
		1437
		1438	XftGlyphSpec ep;
1313	ep->glyph = glyph;	1439	ep.glyph = glyph;
1314	ep->x = x + (cwidth - extents.xOff >> 1);	1440	ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1315	ep->y = y + ascent;	1441	ep.y = cy;
1316		1442
1317	if (extents.xOff == 0)	1443	enc.push_back (ep);
1318	ep->x = x + cwidth;
1319		1444
1320	ep++;	1445	for (int i = 1; ecb_expect_false (i < nchrs); ++i)
		1446	{
		1447	FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
		1448	XGlyphInfo extents;
		1449	XftGlyphExtents (disp, f, &glyph, 1, &extents);
		1450
		1451	ep.glyph = glyph;
		1452	ep.x = cx + (extents.xOff ? 0 : extents0.xOff);
		1453
		1454	enc.push_back (ep);
1321	}	1455	}
		1456	}
1322		1457
1323	x += cwidth;	1458	x_ += cwidth;
		1459	}
		1460
		1461	if (buffered)
1324	}	1462	{
		1463	if (!enc.empty ())
		1464	{
		1465	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1325		1466
1326	if (ep != enc)	1467	#ifdef HAVE_IMG
		1468	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1469
		1470	if (term->bg_img
		1471	&& (bg == Color_transparent \|\| bg == Color_bg
		1472	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1473	{
		1474	int src_x = x, src_y = y;
		1475
		1476	if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
		1477	{
		1478	src_x += term->window_vt_x;
		1479	src_y += term->window_vt_y;
		1480	}
		1481
		1482	if (term->bg_img->w >= src_x + w
		1483	&& term->bg_img->h >= src_y + h)
		1484	{
		1485	XCopyArea (disp, term->bg_img->pm, d2, gc,
		1486	src_x, src_y, w, h, 0, 0);
		1487	}
		1488	else
		1489	{
		1490	XGCValues gcv;
		1491
		1492	gcv.fill_style = FillTiled;
		1493	gcv.tile = term->bg_img->pm;
		1494	gcv.ts_x_origin = -src_x;
		1495	gcv.ts_y_origin = -src_y;
		1496
		1497	XChangeGC (disp, gc,
		1498	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1499	&gcv);
		1500
		1501	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1502
		1503	gcv.fill_style = FillSolid;
		1504	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1505	}
		1506
		1507	if (dst)
		1508	{
		1509	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1510
		1511	// dst can only be set when bg >= 0
		1512	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1513	}
		1514	}
		1515	else
		1516	#endif
		1517	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
		1518
		1519	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
		1520	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1521	}
		1522	else
		1523	clear_rect (d, x, y, w, h, bg);
		1524	}
		1525	else
		1526	{
		1527	clear_rect (d, x, y, w, h, bg);
1327	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1528	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
		1529	}
1328	}	1530	}
		1531
1329	#endif	1532	#endif
1330		1533
1331	/////////////////////////////////////////////////////////////////////////////	1534	/////////////////////////////////////////////////////////////////////////////
1332		1535
1333	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1536	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1344	void	1547	void
1345	rxvt_fontset::clear ()	1548	rxvt_fontset::clear ()
1346	{	1549	{
1347	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1550	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348	= rxvt_fontprop::unset;	1551	= rxvt_fontprop::unset;
		1552	force_prop = false;
1349		1553
1350	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1554	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351	FONT_UNREF (*i);	1555	(*i)->unref ();
1352		1556
1353	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1557	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1354	delete *p;	1558	delete *p;
1355		1559
1356	free (fontdesc); fontdesc = 0;	1560	free (fontdesc); fontdesc = 0;
…		…
1358	fonts.clear ();	1562	fonts.clear ();
1359		1563
1360	fallback = fallback_fonts;	1564	fallback = fallback_fonts;
1361	}	1565	}
1362		1566
		1567	void
		1568	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1569	{
		1570	font->set_term (term);
		1571
		1572	font->cs = cs;
		1573	font->loaded = false;
		1574	}
		1575
1363	rxvt_font *	1576	rxvt_font *
1364	rxvt_fontset::new_font (const char *name, codeset cs)	1577	rxvt_fontset::new_font (const char *name, codeset cs)
1365	{	1578	{
1366	rxvt_font *f;	1579	rxvt_font *f;
1367		1580
1368	if (!name \|\| !*name)	1581	if (!name \|\| !*name)
1369	{	1582	{
1370	name = "";	1583	name = "";
1371	f = new rxvt_font_default (this);	1584	f = new rxvt_font_default (this);
1372	}	1585	}
…		…
1383	f = new rxvt_font_x11;	1596	f = new rxvt_font_x11;
1384	}	1597	}
1385	else	1598	else
1386	f = new rxvt_font_x11;	1599	f = new rxvt_font_x11;
1387		1600
1388	f->set_term (term);
1389	f->set_name (strdup (name));	1601	f->set_name (strdup (name));
1390		1602	prepare_font (f, cs);
1391	f->cs = cs;
1392	f->loaded = false;
1393		1603
1394	return f;	1604	return f;
1395	}	1605	}
1396		1606
1397	/////////////////////////////////////////////////////////////////////////////	1607	/////////////////////////////////////////////////////////////////////////////
		1608
		1609	void
		1610	rxvt_fontset::push_font (rxvt_font *font)
		1611	{
		1612	// the fontCount index is reserved for the overflow font, it is only
		1613	// necessary when we get fontCount or more fonts, as they cannot be
		1614	// represented in the rendition.
		1615	if (fonts.size () == fontCount)
		1616	{
		1617	rxvt_font *f = new rxvt_font_overflow (this);
		1618
		1619	prepare_font (f, CS_UNICODE);
		1620	fonts.push_back (f);
		1621	}
		1622
		1623	fonts.push_back (font);
		1624	}
1398		1625
1399	void	1626	void
1400	rxvt_fontset::add_fonts (const char *desc)	1627	rxvt_fontset::add_fonts (const char *desc)
1401	{	1628	{
1402	if (desc)	1629	if (desc)
…		…
1431	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);	1658	cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1432	else	1659	else
1433	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);	1660	rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1434		1661
1435	desc++;	1662	desc++;
1436	while (*desc <= ' ') desc++;	1663	while (desc <= ' ' && desc) desc++;
1437	}	1664	}
1438		1665
1439	end = strchr (desc, ',');	1666	end = strchr (desc, ',');
1440	if (!end)	1667	if (!end)
1441	end = desc + strlen (desc);	1668	end = desc + strlen (desc);
1442		1669
1443	if (end - desc < 511)	1670	if (end - desc < 511)
1444	{	1671	{
1445	strncpy (buf, desc, end - desc);	1672	memcpy (buf, desc, end - desc);
1446	buf[end - desc] = 0;	1673	buf[end - desc] = 0;
1447		1674
1448	fonts.push_back (new_font (buf, cs));	1675	push_font (new_font (buf, cs));
1449	}	1676	}
1450	else	1677	else
1451	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1678	rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1452		1679
1453	desc = end + 1;	1680	desc = end + 1;
1454	}	1681	}
1455	while (*end);	1682	while (*end);
1456	}	1683	}
…		…
1465	if (fonts[i]->loaded)	1692	if (fonts[i]->loaded)
1466	return true;	1693	return true;
1467		1694
1468	fonts[i]->loaded = true;	1695	fonts[i]->loaded = true;
1469		1696
1470	if (!fonts[i]->load (prop))	1697	if (!fonts[i]->load (prop, force_prop))
1471	{	1698	{
1472	fonts[i]->cs = CS_UNKNOWN;	1699	fonts[i]->cs = CS_UNKNOWN;
1473	return false;	1700	return false;
1474	}	1701	}
1475		1702
…		…
1481	{	1708	{
1482	clear ();	1709	clear ();
1483		1710
1484	fontdesc = strdup (desc);	1711	fontdesc = strdup (desc);
1485		1712
1486	fonts.push_back (new_font (0, CS_UNICODE));	1713	push_font (new_font (0, CS_UNICODE));
1487	realize_font (0);	1714	realize_font (0);
1488		1715
1489	add_fonts (desc);	1716	add_fonts (desc);
1490		1717
1491	return true;	1718	return true;
…		…
1500		1727
1501	return -1;	1728	return -1;
1502	}	1729	}
1503		1730
1504	int	1731	int
1505	rxvt_fontset::find_font (unicode_t unicode)	1732	rxvt_fontset::find_font_idx (unicode_t unicode)
1506	{	1733	{
1507	if (unicode >= 1<<20)	1734	// this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
		1735	if (unicode > 0x1fffff)
1508	return 0;	1736	return 0;
1509		1737
1510	unicode_t hi = unicode >> 8;	1738	unicode_t hi = unicode >> 8;
1511		1739
1512	if (hi < fmap.size ()	1740	if (hi < fmap.size ())
1513	&& fmap[hi]	1741	if (pagemap *pm = fmap[hi])
1514	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1742	if ((*pm)[unicode & 0xff] != 0xff)
1515	return (*fmap[hi])[unicode & 0xff];	1743	return (*pm)[unicode & 0xff];
1516		1744
1517	unsigned int i;	1745	unsigned int i;
1518		1746
1519	for (i = 0; i < fonts.size (); i++)	1747	for (i = 0; i < fonts.size (); i++)
1520	{	1748	{
…		…
1536	goto next_font;	1764	goto next_font;
1537		1765
1538	bool careful;	1766	bool careful;
1539	if (f->has_char (unicode, &prop, careful))	1767	if (f->has_char (unicode, &prop, careful))
1540	{	1768	{
1541	if (careful)	1769	i = (i << 1) \| careful;
1542	i \|= 128;
1543		1770
1544	goto found;	1771	goto found;
1545	}	1772	}
1546		1773
1547	next_font:	1774	next_font:
1548	if (i == fonts.size () - 1)	1775	if (i == fonts.size () - 1)
1549	{	1776	{
		1777	// compose characters are handled by the default font, unless another font takes over
		1778	// we do not go via the fallback list for speed reasons.
		1779	if (IS_COMPOSE (unicode))
		1780	return 0;
		1781
1550	if (fallback->name)	1782	if (fallback->name)
1551	{	1783	{
1552	// search through the fallback list	1784	// search through the fallback list
1553	fonts.push_back (new_font (fallback->name, fallback->cs));	1785	push_font (new_font (fallback->name, fallback->cs));
1554	fallback++;	1786	fallback++;
1555	}	1787	}
1556	else	1788	else
1557	{	1789	{
1558	// try to find a new font.	1790	// try to find a new font.
…		…
1560	// way to configure this and xft is easier to hack in,	1792	// way to configure this and xft is easier to hack in,
1561	// while x11 has more framework in place already.	1793	// while x11 has more framework in place already.
1562	// TODO: this is a real resource hog, xft takes ages(?)	1794	// TODO: this is a real resource hog, xft takes ages(?)
1563	#if XFT && USE_SLOW_LOOKUP	1795	#if XFT && USE_SLOW_LOOKUP
1564	// grab the first xft font that seems suitable	1796	// grab the first xft font that seems suitable
		1797	// TOOD: should go first for cellchar (spacing 110) then mono, then else
1565	FcPattern *p = FcPatternCreate ();	1798	FcPattern *p = FcPatternCreate ();
1566		1799
1567	FcCharSet *s = FcCharSetCreate ();	1800	FcCharSet *s = FcCharSetCreate ();
1568	FcCharSetAddChar (s, unicode);	1801	FcCharSetAddChar (s, unicode);
1569	FcPatternAddCharSet (p, FC_CHARSET, s);	1802	FcPatternAddCharSet (p, FC_CHARSET, s);
…		…
1589	FcPatternDestroy (match);	1822	FcPatternDestroy (match);
1590		1823
1591	if (find_font (font) < 0)	1824	if (find_font (font) < 0)
1592	{	1825	{
1593	char fontname[4096];	1826	char fontname[4096];
1594	sprintf (fontname, "xft:%-.4090s", font);	1827	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1595		1828
1596	fonts.push_back (new_font (fontname, CS_UNICODE));	1829	push_font (new_font (fontname, CS_UNICODE));
1597	}	1830	}
1598		1831
1599	free (font);	1832	free (font);
1600	}	1833	}
1601	#endif	1834	#endif
…		…
1613	while (hi >= fmap.size ())	1846	while (hi >= fmap.size ())
1614	fmap.push_back (0);	1847	fmap.push_back (0);
1615		1848
1616	if (!fmap[hi])	1849	if (!fmap[hi])
1617	{	1850	{
1618	fmap[hi] = (pagemap *)new pagemap;	1851	fmap[hi] = new pagemap;
1619	memset (fmap[hi], 0xff, sizeof (pagemap));	1852	memset (fmap[hi], 0xff, sizeof (pagemap));
1620	}	1853	}
1621		1854
1622	(*fmap[hi])[unicode & 0xff] = i;	1855	(*fmap[hi])[unicode & 0xff] = i;
1623	}	1856	}
1624		1857
1625	return i;	1858	return i;
1626	}	1859	}
1627		1860
1628
1629

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.94 by root, Thu Feb 2 18:04:46 2006 UTC vs. Revision 1.209 by root, Fri Jun 18 21:58:03 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.94 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 2021 UTC