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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC vs. Revision 1.195 by root, Mon Sep 7 14:50:56 2015 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.195 by root, Mon Sep 7 14:50:56 2015 UTC